Add deploy action (#72)

* Add deploy action

* Fix typo

* Fix can not get pkg from git

* Delete old files before cp

* Increase command timeout

* Updating ollama for gemma3n

* Fix docker build command

* Add OLLAMA_HOST for embedding

* Revert "Add OLLAMA_HOST for embedding"

This reverts commit 4ac9c1c.

* Fix embedding ollama url

* Fix config key ollama embed

* Add missing key

* Only run on main

Author: otjamin

.github/workflows/deploy-server.yml

@@ -0,0 +1,47 @@
+name: Deploy Server
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Copy repo to server
+        uses: appleboy/scp-action@v1
+        with:
+          host: ${{ vars.SERVER_HOST }}
+          username: ${{ vars.SERVER_USER }}
+          key: ${{ secrets.PRIVATE_KEY }}
+          source: "."
+          target: "/home/${{ vars.SERVER_USER }}/repo"
+
+      - name: Execute on server
+        uses: appleboy/ssh-action@v1
+        with:
+          host: ${{ vars.SERVER_HOST }}
+          username: ${{ vars.SERVER_USER }}
+          key: ${{ secrets.PRIVATE_KEY }}
+          script: |
+            # create dir if not exists
+            mkdir GetDressed
+            # move to the repo directory
+            cd GetDressed
+            # Stop compose if running
+            docker compose -f compose.yaml -f compose.ollama.yaml down
+            # Delete old repo
+            rm -rf *
+            # Copy new repo
+            cp -r ../repo/* .
+            # Remove copied repo
+            rm -rf ../repo
+            # Build containers
+            docker compose -f compose.yaml -f compose.ollama.yaml build
+            # Start containers
+            docker compose -f compose.yaml -f compose.ollama.yaml up -d
+          command_timeout: 60m

compose.ollama.yaml

@@ -0,0 +1,19 @@
+services:
+  api:
+    environment:
+      - API_BASE=http://ollama:11434
+
+  ollama:
+    build:
+      context: .
+      dockerfile: ollama.Dockerfile
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: 1
+              capabilities: [gpu]
+    ports:
+      - "11434:11434"
+    restart: always

compose.yaml

@@ -1,30 +1,12 @@
 name: getdressed
 
 services:
-  ollama:
-    build:
-      context: .
-      dockerfile: ollama.Dockerfile
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: all
-              capabilities: [gpu]
-    ports:
-      - "11434:11434"
-    volumes:
-      - ollama:/root/.ollama
-    restart: always
-
   api:
     build: ./server
     environment:
-      - MODEL=ollama/gemma3n:e4b
-      - API_BASE=http://ollama:11434
+      - MODEL=ollama/gemma3n
     ports:
-      - "8080:80"
+      - "8000:80"
     restart: always
 
   pb:
@@ -36,5 +18,4 @@ services:
     restart: always
 
 volumes:
-  ollama:
   pb:

ollama.Dockerfile

@@ -1,4 +1,4 @@
-FROM ollama/ollama:0.9.1
-ARG MODELS="llama3.1 nomic-embed-text"
+FROM ollama/ollama:0.9.4
+ARG MODELS="gemma3n nomic-embed-text"
 ENV OLLAMA_KEEP_ALIVE=24h
 RUN ollama serve & server=$! ; sleep 5 ; for m in $MODELS ; do ollama pull $m ; done ; kill $server

server/.env.example

@@ -1,2 +1,2 @@
-MODEL=ollama/gemma3n:e4b
+MODEL=ollama/gemma3n
 API_BASE=http://localhost:11434

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-slim
+FROM python:3.13
 
 # Install uv.
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/

server/agents/trend_crew/src/trend_crew/crew.py

@@ -1,3 +1,5 @@
+import os
+
 from crewai import Agent, Crew, Process, Task
 from crewai.project import CrewBase, agent, crew, task
 from crewai.agents.agent_builder.base_agent import BaseAgent
@@ -49,6 +51,7 @@ def trend_alchemist(self) -> Agent:
     # https://docs.crewai.com/concepts/tasks#overview-of-a-task
     @task
     def find_sources_task(self) -> Task:
+        print("API_BASE:", os.getenv("API_BASE"))
         return Task(
             config=self.tasks_config['find_sources'], # type: ignore[index]
             tools=[
@@ -58,6 +61,7 @@ def find_sources_task(self) -> Task:
                             provider="ollama",
                             config=dict(
                                 model="nomic-embed-text",
+                                base_url=os.getenv("API_BASE"),
                             )
                         ),
                     )
@@ -76,6 +80,7 @@ def collect_trend_data_task(self) -> Task:
                             provider="ollama",
                             config=dict(
                                 model="nomic-embed-text",
+                                base_url=os.getenv("API_BASE"),
                             )
                         ),
                     )