Merge pull request #2459 from Agenta-AI/fix/gh-for-shared-services

[Fix] `.gh` for shared services
Agenta-AI · Feb 10, 2025 · 53a1f14 · 53a1f14
2 parents 7f836dd + 212dc64
commit 53a1f14
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 10 deletions.
diff --git a/.github/workflows/push-to-ghcr.yml b/.github/workflows/push-to-ghcr.yml
@@ -9,6 +9,8 @@ on:
 env:
   BACKEND_IMAGE_NAME: agenta-backend
   WEB_IMAGE_NAME: agenta-web
+  CHAT_IMAGE_NAME: agenta-chat
+  COMPLETION_IMAGE_NAME: agenta-completion
   IMAGE_OWNER_NAME: agenta-ai
   REPOSITORY_USERNAME: ${{ github.actor }}
 
@@ -38,14 +40,32 @@ jobs:
       - name: Build, tag and push Backend image to Github Container Registry
         id: build-backend-image
         run: |
+          set -e
           cd agenta-backend
           docker build -t ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.BACKEND_IMAGE_NAME }} -f Dockerfile.gh .
-          docker push ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.BACKEND_IMAGE_NAME }}
+          docker push ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.BACKEND_IMAGE_NAME }} || echo "Push (backend) failed"
 
       - name: Build, tag and push Web image to Github Container Registry
         id: build-web-image
         run: |
+          set -e
           cd agenta-web
           docker build --no-cache -t ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.WEB_IMAGE_NAME }} -f prod.gh.Dockerfile .
-          docker push ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.WEB_IMAGE_NAME }}
+          docker push ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.WEB_IMAGE_NAME }} || echo "Push (web) failed"
+
+      - name: Build, tag and push Chat image to Github Container Registry
+        id: build-chat-image
+        run: |
+          set -e
+          cd services/chat
+          docker build --no-cache -t ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.CHAT_IMAGE_NAME }} -f Dockerfile.gh .
+          docker push ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.CHAT_IMAGE_NAME }} || echo "Push (chat) failed"
+
+      - name: Build, tag and push Completion image to Github Container Registry
+        id: build-completion-image
+        run: |
+          set -e
+          cd services/completion
+          docker build --no-cache -t ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.COMPLETION_IMAGE_NAME }} -f Dockerfile.gh .
+          docker push ghcr.io/${{ env.IMAGE_OWNER_NAME }}/${{ env.COMPLETION_IMAGE_NAME }} || echo "Push (completion) failed"
 
diff --git a/agenta-backend/Dockerfile b/agenta-backend/Dockerfile
@@ -3,14 +3,14 @@ FROM python:3.9-slim-buster
 
 WORKDIR /app
 
-# Install git and clone the necessary repository
-RUN apt-get update -y \
-    && apt-get install -y git
-
 # Ensure pip and poetry are up to date
 RUN pip install --upgrade pip \
     && pip install poetry
 
+# Install git and clone the necessary repository
+RUN apt-get update -y \
+    && apt-get install -y git
+
 # Copy only requirements and alembic configuration file
 # to cache them in docker layer
 COPY pyproject.toml poetry.lock* alembic.* README.md /app/

diff --git a/agenta-cli/agenta/sdk/agenta_init.py b/agenta-cli/agenta/sdk/agenta_init.py
@@ -74,7 +74,7 @@ def init(
             or "https://cloud.agenta.ai"
         )
 
-        log.info("Agenta - host: %s", self.host)
+        log.info("Agenta - Host: %s", self.host)
 
         self.app_id = app_id or config.get("app_id") or getenv("AGENTA_APP_ID")
         # if not self.app_id:

diff --git a/agenta-cli/agenta/sdk/decorators/routing.py b/agenta-cli/agenta/sdk/decorators/routing.py
@@ -49,7 +49,7 @@
 
 app.include_router(router, prefix=AGENTA_RUNTIME_PREFIX)
 
-log.error("Agenta - Runtime Prefix:" + AGENTA_RUNTIME_PREFIX)
+log.info("Agenta - Runtime Prefix:" + (AGENTA_RUNTIME_PREFIX or None))
 
 
 class PathValidator(BaseModel):
@@ -645,8 +645,6 @@ def openapi(self):
             # ✅ Add Agenta SDK version info
             openapi_schema["agenta_sdk"] = {"version": get_current_version()}
 
-            print(openapi_schema)
-
         return openapi_schema
 
     def override_config_in_schema(

diff --git a/docker-compose.gh.yml b/docker-compose.gh.yml
@@ -190,6 +190,22 @@ services:
             postgres:
                 condition: service_healthy
 
+    completion:
+        image: ghcr.io/agenta-ai/agenta-completion
+        extends:
+            file: ./services/completion/docker-compose.gh.yml
+            service: completion
+        environment:
+            - AGENTA_HOST=${DOMAIN_NAME:-http://host.docker.internal}:${AGENTA_PORT:-80}
+
+    chat:
+        image: ghcr.io/agenta-ai/agenta-chat
+        extends:
+            file: ./services/chat/docker-compose.gh.yml
+            service: chat
+        environment:
+            - AGENTA_HOST=${DOMAIN_NAME:-http://host.docker.internal}:${AGENTA_PORT:-80}
+
 networks:
     agenta-network:
         name: agenta-network

diff --git a/services/chat/Dockerfile.gh b/services/chat/Dockerfile.gh
@@ -0,0 +1,15 @@
+FROM python:3.10-slim
+
+ARG ROOT_PATH=/
+ENV ROOT_PATH=${ROOT_PATH}
+
+WORKDIR /app
+
+COPY . .
+
+RUN pip install --upgrade pip \
+    && pip install --no-cache-dir agenta openai python-dotenv uvicorn "litellm>=1.0,<2.0" google-generativeai
+
+EXPOSE 80
+
+CMD ["python", "main.py"]
diff --git a/services/chat/docker-compose.gh.yml b/services/chat/docker-compose.gh.yml
@@ -0,0 +1,34 @@
+services:
+  chat:
+    build:
+      context: .
+      dockerfile: Dockerfile.gh
+    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}
+    networks:
+      - agenta-network
+    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:
+    external: true
diff --git a/services/completion/Dockerfile.gh b/services/completion/Dockerfile.gh
@@ -0,0 +1,15 @@
+FROM python:3.10-slim
+
+ARG ROOT_PATH=/
+ENV ROOT_PATH=${ROOT_PATH}
+
+WORKDIR /app
+
+COPY . .
+
+RUN pip install --upgrade pip \
+    && pip install --no-cache-dir agenta openai python-dotenv uvicorn "litellm>=1.0,<2.0" google-generativeai
+
+EXPOSE 80
+
+CMD ["python", "main.py"]
diff --git a/services/completion/docker-compose.gh.yml b/services/completion/docker-compose.gh.yml
@@ -0,0 +1,34 @@
+services:
+  completion:
+    build:
+      context: .
+      dockerfile: Dockerfile.gh
+    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}
+    networks:
+      - agenta-network
+    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:
+    external: true