From 920ec3cc3228ec495b8ff6267e2637acc15d9231 Mon Sep 17 00:00:00 2001 From: Abram Date: Tue, 24 Sep 2024 16:06:48 +0100 Subject: [PATCH] refactor (backend): make use of project_id from app_variant when setting deployment uri path for docker container --- agenta-backend/agenta_backend/services/app_manager.py | 1 + .../agenta_backend/services/deployment_manager.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/agenta-backend/agenta_backend/services/app_manager.py b/agenta-backend/agenta_backend/services/app_manager.py index 274bbdd49..e59a78e56 100644 --- 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 index 5bfbdc4c0..9ec391ba5 100644 --- 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(