Merge branch 'dev' into chore/remove-mongodb

README.md

@@ -119,7 +119,9 @@ mkdir agenta && cd agenta
 curl -L https://raw.githubusercontent.com/agenta-ai/agenta/main/docker-compose.gh.yml -o docker-compose.gh.yml
 docker compose -f docker-compose.gh.yml up -d
 ```
-
+- Agenta uses port 80, to use a different port set the env var AGENTA_PORT. For instance `export AGENTA_PORT=90`
+- Add `--pull always` to the last command to upgrade your version of Agenta.
+
 # Disabling Anonymized Tracking
 
 By default, Agenta automatically reports anonymized basic usage statistics. This helps us understand how Agenta is used and track its overall usage and growth. This data does not include any sensitive information. To disable anonymized telemetry, follow these steps:

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

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(

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,
                 )

agenta-backend/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta_backend"
-version = "0.29.0"
+version = "0.31.0"
 description = ""
 authors = ["Mahmoud Mabrouk <[email protected]>"]
 readme = "README.md"

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