Merge pull request #12 from InseeFrLab/test-double-images

Create 2 images both API and streamlit

Author: ThomasFaria

.github/workflows/build-image.yaml renamed to .github/workflows/build-images.yaml

@@ -1,17 +1,29 @@
-name: Image Build
+name: Build Images
 
 on:
   push:
     branches:
-      - main
-      
+      - "main"
     tags:
       - "*"
+    paths:
+      - "pyproject.toml"
+      - "Dockerfiles/**"
+      - "src/**"
+      - ".github/workflows/**"
   workflow_dispatch:
 
 jobs:
   image-build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - dockerfile: ./Dockerfiles/Dockerfile-streamlit
+            image: meilametayebjee/codification-ape-graph-rag-streamlit
+          - dockerfile: ./Dockerfiles/Dockerfile-api
+            image: meilametayebjee/codification-ape-graph-rag-api
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -22,7 +34,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: meilametayebjee/codification-ape-graph-rag-api
+          images: ${{ matrix.image }}
           tags: |
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
@@ -45,6 +57,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          file: ${{ matrix.dockerfile }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -0,0 +1 @@
+.venv

Dockerfiles/.dockerignore

@@ -0,0 +1,20 @@
+FROM inseefrlab/onyxia-vscode-python:py3.12.9
+
+ENV TIMEOUT=3600
+
+# Set working directory
+WORKDIR /app
+
+# copy the code in api/
+ADD . /app
+
+# Sync dependencies
+RUN uv sync --locked
+
+# Expose port 5000
+EXPOSE 5000
+
+# Set working directory to run api
+WORKDIR /app/src
+
+CMD ["uv", "run", "uvicorn", "api.main:app", "--proxy-headers", "--host", "0.0.0.0", "--port", "5000", "--timeout-graceful-shutdown", "3600"]

Dockerfiles/Dockerfile-api

@@ -0,0 +1,18 @@
+FROM inseefrlab/onyxia-vscode-python:py3.12.9
+
+# Set working directory
+WORKDIR /app
+
+# copy the code in streamlit/
+ADD . /app
+
+# Sync dependencies
+RUN uv sync --locked
+
+# Expose port 8501
+EXPOSE 8501
+
+# Set working directory to run streamlit
+WORKDIR /app/src
+
+CMD ["uv", "run", "streamlit", "run", "streamlit/main.py"]

Dockerfiles/Dockerfile-streamlit

@@ -17,7 +17,7 @@ class ClassificationResponse(BaseModel):
         code_ape: str
 
         class Config:
-            json_schema_extra = {"example": {"code_ape": "1071C"}}
+            json_schema_extra = {"example": {"code_ape": "10.71C"}}
 
     @router.get(
         "/classify",

src/api/routes/common.py

@@ -1,7 +1,6 @@
 import httpx
-import streamlit as st
 
-from constants import API_LOCAL_URL
+import streamlit as st
 
 st.set_page_config(page_title="Codif APE Classifier", layout="centered")
 
@@ -26,7 +25,11 @@
     else:
         with st.spinner("Classifying..."):
             try:
-                response = httpx.get(f"{API_LOCAL_URL}/{classifier}/classify", params={"query": query}, timeout=30)
+                response = httpx.get(
+                    f"https://codification-ape-graph-rag.lab.sspcloud.fr/{classifier}/classify",
+                    params={"query": query},
+                    timeout=30,
+                )
                 response.raise_for_status()
                 result = response.json()
                 st.success(f"✅ APE Code: `{result['code_ape']}`")
@@ -45,7 +48,9 @@
     else:
         with st.spinner("Classifying batch..."):
             try:
-                response = httpx.post(f"{API_LOCAL_URL}/{classifier}/batch", json={"queries": lines}, timeout=60)
+                response = httpx.post(
+                    f"https://codification-ape-graph-rag.lab.sspcloud.fr/{classifier}/batch", json={"queries": lines}, timeout=60
+                )
                 response.raise_for_status()
                 results = response.json()
                 st.table(results)