Merge pull request #2469 from Agenta-AI/fix/gh-single-file

[Fix] `.gh` as single file
Agenta-AI · Feb 10, 2025 · 68a83da · 68a83da
2 parents 27c177a + 92b7226
commit 68a83da
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 113 deletions.
diff --git a/agenta-cli/agenta/sdk/middleware/auth.py b/agenta-cli/agenta/sdk/middleware/auth.py
@@ -57,44 +57,6 @@ def __init__(self, app: FastAPI):
         self.resource_id = ag.DEFAULT_AGENTA_SINGLETON_INSTANCE.service_id
 
     async def dispatch(self, request: Request, call_next: Callable):
-        # Extract request details
-        host = request.client.host if request.client else "unknown"
-        path = request.url.path
-        query = dict(request.query_params)
-        headers = dict(request.headers)
-
-        import logging
-        import json
-
-        # Log the request details
-        logging.error(
-            json.dumps(
-                {
-                    "host": host,
-                    "method": request.method,
-                    "path": path,
-                    "query_params": query,
-                    "headers": headers,
-                },
-                indent=2,
-                ensure_ascii=False,
-            )
-        )
-
-        print(
-            json.dumps(
-                {
-                    "host": host,
-                    "method": request.method,
-                    "path": path,
-                    "query_params": query,
-                    "headers": headers,
-                },
-                indent=2,
-                ensure_ascii=False,
-            )
-        )
-
         try:
             if request.url.path in _ALWAYS_ALLOW_LIST:
                 request.state.auth = {}

diff --git a/docker-compose.gh.yml b/docker-compose.gh.yml
@@ -191,20 +191,70 @@ services:
                 condition: service_healthy
 
     completion:
+        container_name: agenta-completion-1
         image: ghcr.io/agenta-ai/agenta-completion
-        extends:
-            file: ./services/completion/docker-compose.gh.yml
-            service: completion
         environment:
+            #
+            - OPENAI_API_KEY=${OPENAI_API_KEY}
+            - MISTRAL_API_KEY=${MISTRAL_API_KEY}
+            - COHERE_API_KEY=${COHERE_API_KEY}
+            - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
+            - ANYSCALE_API_KEY=${ANYSCALE_API_KEY}
+            - PERPLEXITYAI_API_KEY=${PERPLEXITYAI_API_KEY}
+            - DEEPINFRA_API_KEY=${DEEPINFRA_API_KEY}
+            - TOGETHERAI_API_KEY=${TOGETHERAI_API_KEY}
+            - ALEPHALPHA_API_KEY=${ALEPHALPHA_API_KEY}
+            - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
+            - GROQ_API_KEY=${GROQ_API_KEY}
+            - GEMINI_API_KEY=${GEMINI_API_KEY}
+            #
             - AGENTA_HOST=${DOMAIN_NAME:-http://host.docker.internal}:${AGENTA_PORT:-80}
-
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
+        labels:
+            - "traefik.http.routers.completion.rule=PathPrefix(`/services/completion/`)"
+            - "traefik.http.routers.completion.entrypoints=web"
+            - "traefik.http.middlewares.completion-strip.stripprefix.prefixes=/services/completion"
+            - "traefik.http.middlewares.completion-strip.stripprefix.forceslash=true"
+            - "traefik.http.routers.completion.middlewares=completion-strip"
+            - "traefik.http.services.completion.loadbalancer.server.port=80"
+            - "traefik.http.routers.completion.service=completion"
+        networks:
+            - agenta-network
+        restart: always
+
     chat:
+        container_name: agenta-chat-1
         image: ghcr.io/agenta-ai/agenta-chat
-        extends:
-            file: ./services/chat/docker-compose.gh.yml
-            service: chat
         environment:
+            #
+            - OPENAI_API_KEY=${OPENAI_API_KEY}
+            - MISTRAL_API_KEY=${MISTRAL_API_KEY}
+            - COHERE_API_KEY=${COHERE_API_KEY}
+            - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
+            - ANYSCALE_API_KEY=${ANYSCALE_API_KEY}
+            - PERPLEXITYAI_API_KEY=${PERPLEXITYAI_API_KEY}
+            - DEEPINFRA_API_KEY=${DEEPINFRA_API_KEY}
+            - TOGETHERAI_API_KEY=${TOGETHERAI_API_KEY}
+            - ALEPHALPHA_API_KEY=${ALEPHALPHA_API_KEY}
+            - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
+            - GROQ_API_KEY=${GROQ_API_KEY}
+            - GEMINI_API_KEY=${GEMINI_API_KEY}
+            #
             - AGENTA_HOST=${DOMAIN_NAME:-http://host.docker.internal}:${AGENTA_PORT:-80}
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
+        labels:
+            - "traefik.http.routers.chat.rule=PathPrefix(`/services/chat/`)"
+            - "traefik.http.routers.chat.entrypoints=web"
+            - "traefik.http.middlewares.chat-strip.stripprefix.prefixes=/services/chat"
+            - "traefik.http.middlewares.chat-strip.stripprefix.forceslash=true"
+            - "traefik.http.routers.chat.middlewares=chat-strip"
+            - "traefik.http.services.chat.loadbalancer.server.port=80"
+            - "traefik.http.routers.chat.service=chat"
+        networks:
+            - agenta-network
+        restart: always
 
 networks:
     agenta-network:

diff --git a/services/chat/docker-compose.gh.yml b/services/chat/docker-compose.gh.yml
diff --git a/services/completion/docker-compose.gh.yml b/services/completion/docker-compose.gh.yml