update workflow

.github/workflows/main.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -20,38 +21,28 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build Docker images
-      run: |
-        docker-compose -f docker-compose.yml build
+    - name: Build Docker image for app
+      run: docker build -t macrdel/sentiment-summarize-youtube-comments-backend:latest .
+
+    - name: Build Docker image for tests
+      run: docker build -t macrdel/sentiment-summarize-youtube-comments-backend-tests:latest .
 
   test:
     runs-on: ubuntu-latest
     needs: build
-    services:
-      docker:
-        image: docker:19.03.12
-        options: --privileged
-        ports:
-          - 8000:8000
-          #- 8002:8000
-          - 9090:9090
-          - 3000:3000
-          #- 8080:8080
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
 
-    - name: Set up Docker Compose
-      run: |
-        docker-compose -f docker-compose.yml up -d
-
     - name: Run tests
       run: |
-        docker-compose -f docker-compose.yml run tests
+        docker run --rm macrdel/sentiment-summarize-youtube-comments-backend-tests:latest pytest tests
 
   push:
     runs-on: ubuntu-latest
     needs: test
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -62,9 +53,18 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Push Docker images
+    - name: Push application
+      run: |
+        docker run -d --name app --network example-network --ip 172.16.238.10 -p 8000:8000 macrdel/sentiment-summarize-youtube-comments-backend:latest uvicorn app.api:app --host 0.0.0.0 --port 8000
+
+    - name: Push Prometheus
       run: |
-        docker-compose -f docker-compose.yml push
+        docker run -d --name prometheus --network example-network --ip 172.16.238.11 -p 9090:9090 -v $(pwd)/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml prom/prometheus:latest
+
+    - name: Push Grafana
+      run: |
+        docker run -d --name grafana --network example-network --ip 172.16.238.12 -p 3000:3000 -v $(pwd)/grafana/provisioning:/etc/grafana/provisioning --env-file $(pwd)/grafana/config.monitoring grafana/grafana
+
 
   deploy:
     runs-on: ubuntu-latest

Dockerfile

@@ -2,9 +2,9 @@ FROM python:3.10.5
 
 WORKDIR /code
 
-COPY requirements.txt .
+COPY ./requirements.txt /code/requirements.txt
 
-RUN pip install --no-cache-dir --upgrade -r requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
 RUN useradd -m -u 1000 user
 USER user
@@ -13,7 +13,7 @@ ENV HOME=/home/user \
 
 WORKDIR $HOME/app
 
-COPY --chown=user . .
+COPY --chown=user . $HOME/app
 
 ENV PYTHONPATH=/home/user/app
 

Dockerfile.Test

@@ -1,20 +0,0 @@
-FROM python:3.10.5
-
-WORKDIR /code
-
-COPY requirements.txt .
-
-RUN pip install --no-cache-dir --upgrade -r requirements.txt
-
-RUN useradd -m -u 1000 user
-USER user
-ENV HOME=/home/user \
-	PATH=/home/user/.local/bin:$PATH
-
-WORKDIR $HOME/app
-
-COPY --chown=user . .
-
-ENV PYTHONPATH=/home/user/app
-
-# CMD ["pytest", "tests"]

app/api.py

@@ -2,10 +2,11 @@ from config import config
 from app.src.src import pipeline_sentiment, pipeline_stats, pipeline_summarize
 
 from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+from prometheus_fastapi_instrumentator import Instrumentator
 from pydantic import BaseModel
 # from transformers import pipeline
 # import uvicorn
-from prometheus_client import start_http_server, Summary
 import pandas as pd
 import os
 
@@ -16,7 +17,6 @@ SENT_API_URL = f"https://api-inference.huggingface.co/models/{config.sentiment_m
 SUM_API_URL = f"https://api-inference.huggingface.co/models/{config.sum_model}"
 
 app = FastAPI()
-REQUEST_TIME = Summary('request_processing_seconds', 'Time spent processing request')
 
 class YouTubeUrl(BaseModel):
     url_video: str
@@ -43,9 +43,15 @@ def get_summarize():
         data = pd.read_csv(f"{config.DATA_FILE}")
         return pipeline_summarize(data['text_comment'], headers, SUM_API_URL)
     
-@app.on_event("startup")
-def startup_event():
-    start_http_server(8000)
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+Instrumentator().instrument(app).expose(app)
 
 
 #if __name__ == '__main__':

docker-compose.yml

@@ -1,18 +1,20 @@
-version: '3.7'
+version: "3.10.5"
 
 services:
   app:
     build: .
-    command: uvicorn app.api:app --host 0.0.0.0 --port 8000 # --reload
-    container_name: "sentiment-summarize-youtube-comments"
+    restart: unless-stopped
+    command: uvicorn app.api:app --host 0.0.0.0 --port 8000
+    container_name: app
     ports:
-      - "8000:8000"
+      - 8000:8000
     volumes:
       - .:/home/user/app
     environment:
       - PYTHONPATH=/home/user/app
-    depends_on:
-      - prometheus
+    networks:
+      example-network:
+        ipv4_address: 172.16.238.10
 
   # app2:
   #   build: .
@@ -39,27 +41,35 @@ services:
   #     - app2
 
   prometheus:
-    image: prom/prometheus
+    image: prom/prometheus:latest
+    restart: unless-stopped
     container_name: prometheus
+    ports:
+      - 9090:9090
     volumes:
       - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-    ports:
-      - "9090:9090"
+    networks:
+      example-network:
+        ipv4_address: 172.16.238.11
 
   grafana:
     image: grafana/grafana
     container_name: grafana
-    ports:
-      - "3000:3000"
-    environment:
-      - GF_SECURITY_ADMIN_PASSWORD=admin
+    restart: unless-stopped
     depends_on:
       - prometheus
+    ports:
+      - 3000:3000
+    volumes:
+      - ./grafana/provisioning:/etc/grafana/provisioning
+    env_file:
+      - ./grafana/config.monitoring
+    networks:
+      example-network:
+        ipv4_address: 172.16.238.12
 
   tests:
-    build:
-      context: .
-      dockerfile: Dockerfile.Test
+    build: .
     volumes:
       - .:/home/user/app
     environment:
@@ -67,3 +77,12 @@ services:
     depends_on:
       - app
     command: pytest tests
+
+networks:
+  example-network:
+    name: example-network
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.16.238.0/24

grafana/provisioning/config.monitoring

@@ -0,0 +1,2 @@
+GF_SECURITY_ADMIN_PASSWORD=admin
+GF_USERS_ALLOW_SIGN_UP=false

prometheus/prometheus.yml

@@ -2,6 +2,12 @@ global:
   scrape_interval: 15s
 
 scrape_configs:
-  - job_name: 'sentiment-summarize-youtube-comments'
+  - job_name: 'prometheus'
+    scrape_interval: 15s
+    metrics_path: /prometheus/metrics
+    static_configs:
+      - targets: ['localhost:9090']
+  - job_name: 'app'
+    scrape_interval: 5s
     static_configs:
       - targets: ['app:8000']