Merge branch 'dev' into feature/age-1495-testing-backend-api-checkpoi…

…nt-1
Agenta-AI · Jan 7, 2025 · 15f737e · 15f737e
2 parents c1e14bd + 65bf10b
commit 15f737e
Show file tree

Hide file tree

Showing 36 changed files with 1,962 additions and 5 deletions.
diff --git a/agenta-backend/agenta_backend/models/api/api_models.py b/agenta-backend/agenta_backend/models/api/api_models.py
@@ -116,6 +116,7 @@ class AppVariantResponse(BaseModel):
 
 
 class AppVariantRevision(BaseModel):
+    id: Optional[str] = None
     revision: int
     modified_by: str
     config: ConfigDB

diff --git a/agenta-backend/agenta_backend/models/converters.py b/agenta-backend/agenta_backend/models/converters.py
@@ -318,6 +318,7 @@ async def app_variant_db_revisions_to_output(
     for app_variant_revision_db in app_variant_revisions_db:
         app_variant_revisions.append(
             AppVariantRevision(
+                id=str(app_variant_revision_db.id) or None,
                 revision=app_variant_revision_db.revision,
                 modified_by=app_variant_revision_db.modified_by.username,
                 config={
@@ -334,6 +335,7 @@ async def app_variant_db_revision_to_output(
     app_variant_revision_db: AppVariantRevisionsDB,
 ) -> AppVariantRevision:
     return AppVariantRevision(
+        id=str(app_variant_revision_db.id) or None,
         revision=app_variant_revision_db.revision,
         modified_by=app_variant_revision_db.modified_by.username,
         config=ConfigDB(

diff --git a/agenta-backend/agenta_backend/routers/app_router.py b/agenta-backend/agenta_backend/routers/app_router.py
@@ -210,10 +210,13 @@ async def create_app(
     """
     try:
         if isCloudEE():
-            api_key_from_headers = request.headers.get("Authorization")
+            api_key_from_headers = request.headers.get("Authorization", None)
             if api_key_from_headers is not None:
+                api_key = api_key_from_headers.split(" ")[
+                    -1
+                ]  # ["ApiKey", "xxxxx.xxxxxx"]
                 await check_apikey_action_access(
-                    api_key_from_headers,
+                    api_key,
                     request.state.user_id,
                     Permission.CREATE_APPLICATION,
                 )

diff --git a/agenta-cli/.env.example b/agenta-cli/.env.example
@@ -0,0 +1,5 @@
+# rename [environ] to the environment you're working/testing on
+# for local, rename it to local --- .env.local
+_SECRET_KEY=xxxxxxx
+AWS_PROFILE_NAME=xxxxxxxxxx
+AGENTA_AUTH_KEY_SECRET_ARN=xxxxxxxxxxxxx
diff --git a/agenta-cli/poetry.lock b/agenta-cli/poetry.lock
diff --git a/agenta-cli/pyproject.toml b/agenta-cli/pyproject.toml
@@ -45,6 +45,12 @@ setuptools = "^71.1.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest-asyncio = "^0.24.0"
+mypy = "^1.13.0"
+pytest-xdist = "^3.6.1"
+uvicorn = "^0.34.0"
+requests = "^2.32.3"
+pexpect = "^4.9.0"
+boto3 = "^1.35.87"
 
 [tool.pytest.ini_options]
 asyncio_default_fixture_loop_scope = "function"

diff --git a/agenta-cli/tests/__init__.py b/agenta-cli/tests/__init__.py
diff --git a/agenta-cli/tests/cli/__init__.py b/agenta-cli/tests/cli/__init__.py
diff --git a/agenta-cli/tests/cli/assets/__init__.py b/agenta-cli/tests/cli/assets/__init__.py
diff --git a/agenta-cli/tests/cli/assets/greetings/.env.example b/agenta-cli/tests/cli/assets/greetings/.env.example