Adding continuous integration

.github/workflows/build.yml

@@ -0,0 +1,58 @@
+name: Build and test
+
+on:
+  pull_request:
+  workflow_call:
+    inputs:
+      environment:
+        type: string
+        description: "Environment to deploy to"
+        required: false
+      version:
+        type: string
+        description: Version to build
+        required: true
+      push:
+        type: boolean
+        description: Whether to push the image or not
+        required: false
+        default: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Python
+        uses: actions/setup-python@v4
+
+      - name: Install poetry
+        uses: abatilo/actions-poetry@v4
+
+      - name: Setup a local virtual environment
+        run: |
+          poetry config virtualenvs.create true --local
+          poetry config virtualenvs.in-project true --local
+
+      - uses: actions/cache@v3
+        name: Define a cache for the virtual environment based on the dependencies lock file
+        with:
+          path: ./.venv
+          key: venv-${{ hashFiles('poetry.lock') }}
+
+      - name: Install the project dependencies
+        run: poetry install
+
+      - name: Run the automated tests (for example)
+        run: poetry run pytest -v
+
+  build:
+    uses: ./.github/workflows/docker.yml
+    needs: [test]
+    with:
+      environment: ${{ inputs.environment }}
+      image: europe-west1-docker.pkg.dev/marble-infra/marble/marble-ner:${{ inputs.version || 'dev' }}
+      push: ${{ inputs.push || false }}
+

.github/workflows/docker.yml

@@ -0,0 +1,53 @@
+name: Build container image
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        type: string
+        description: "Environment to deploy to"
+        required: false
+      image:
+        type: string
+        description: "Version to build"
+        required: true
+      push:
+        type: boolean
+        description: "Whether to push the container image or not"
+        default: false
+
+jobs:
+  build_container_image:
+    name: Build container image
+    environment: ${{ inputs.environment }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Docker
+        uses: docker/setup-buildx-action@v3
+
+      - name: Authenticate to GCP
+        id: auth
+        uses: google-github-actions/auth@v2
+        if: ${{ inputs.push }}
+        with:
+          token_format: access_token
+          project_id: ${{ vars.GCP_PROJECT_ID }}
+          workload_identity_provider: ${{ vars.WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ vars.SERVICE_ACCOUNT_EMAIL }}
+
+      - name: Authenticate to Artifact Registry
+        uses: docker/login-action@v3
+        if: ${{ inputs.push }}
+        with:
+          registry: europe-west1-docker.pkg.dev
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
+
+      - name: Build container image
+        uses: docker/build-push-action@v5
+        with:
+          push: ${{ inputs.push }}
+          tags: ${{ inputs.image }}

.github/workflows/staging.yml

@@ -0,0 +1,18 @@
+name: Deploy to staging
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+    with:
+      environment: staging
+      version: latest
+
+  deploy:
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo Deploying...

Dockerfile

@@ -17,7 +17,8 @@ COPY pyproject.toml poetry.lock /app/
 RUN \
   poetry install && \
   poetry run python -c 'import os, gliner; gliner.GLiNER.from_pretrained(os.getenv("GLINER_MODEL"))' && \
-  poetry cache clear --all ''
+  poetry cache clear -n --all '' && \
+  rm -rf /root/.cache/pypoetry/artifacts
 
 COPY . /app
 

main.py

@@ -17,6 +17,10 @@ class Match(BaseModel):
 model = GLiNER.from_pretrained(MODEL)
 app = FastAPI()
 
+@app.get("/-/health")
+def healthcheck():
+  pass
+
 @app.post("/detect")
 def detect(query: Query):
   labels = LABELS

pyproject.toml

@@ -12,20 +12,15 @@ dependencies = [
     "uvicorn[default] (>=0.34.0,<0.35.0)",
     "gunicorn (>=23.0.0,<24.0.0)",
     "torch (>=2.6.0,<3.0.0)",
-    "gliner (>=0.2.16,<0.3.0)"
+    "gliner (>=0.2.16,<0.3.0)",
+    "httpx (>=0.28.1,<0.29.0)",
 ]
 
 [tool.poetry]
 package-mode = false
 
-[[tool.poetry.source]]
-name = "pytorch"
-url = "https://download.pytorch.org/whl/cpu"
-priority = "explicit"
-
-[tool.poetry.dependencies]
-torch = { source = "pytorch" }
-torchvision = { source = "pytorch" }
+[tool.poetry.group.dev.dependencies]
+pytest = "^8.3.4"
 
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]

test_main.py

@@ -0,0 +1,20 @@
+from fastapi.testclient import TestClient
+from main import app
+
+client = TestClient(app)
+
+def test_healthcheck():
+  response = client.get('/-/health')
+
+  assert response.status_code == 200
+
+def test_detection():
+  response = client.post('/detect', json={"text": "dinner with joe finnigan"})
+
+  assert response.status_code == 200
+
+  json = response.json()
+
+  assert len(json) == 1
+  assert json[0]['type'] == "Person"
+  assert json[0]['text'] == "joe finnigan"