refactor (backend): make use of project_id from app_variant when sett…

…ing deployment uri path for docker container
Agenta-AI · Sep 24, 2024 · 920ec3c · 920ec3c
1 parent 2704959
commit 920ec3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/agenta-backend/agenta_backend/services/app_manager.py b/agenta-backend/agenta_backend/services/app_manager.py
@@ -95,6 +95,7 @@ async def start_variant(
                 "http://host.docker.internal"  # unclear why this stopped working
             )
             # domain_name = "http://localhost"
+
         env_vars = {} if env_vars is None else env_vars  # type: ignore
         env_vars.update(
             {

diff --git a/agenta-backend/agenta_backend/services/deployment_manager.py b/agenta-backend/agenta_backend/services/deployment_manager.py
@@ -31,8 +31,8 @@ async def start_service(
     """
 
     if isCloudEE():
-        uri_path = f"{app_variant_db.organization.id}/{app_variant_db.app.app_name}/{app_variant_db.base_name}"
-        container_name = f"{app_variant_db.app.app_name}-{app_variant_db.base_name}-{app_variant_db.organization.id}"
+        uri_path = f"{app_variant_db.project_id}/{app_variant_db.app.app_name}/{app_variant_db.base_name}"
+        container_name = f"{app_variant_db.app.app_name}-{app_variant_db.base_name}-{app_variant_db.project_id}"
     else:
         uri_path = f"{app_variant_db.project_id}/{app_variant_db.app.app_name}/{app_variant_db.base_name}"
         container_name = f"{app_variant_db.app.app_name}-{app_variant_db.base_name}-{app_variant_db.project_id}"
@@ -137,7 +137,7 @@ async def validate_image(image: Image) -> bool:
         raise ValueError(msg)
 
     if isCloudEE():
-        image = Image(**image.model_dump(exclude={"workspace", "organization"}))
+        image = Image(**image.model_dump())
 
     if not image.tags.startswith(agenta_registry_repo):
         raise ValueError(