Release [16 Oct 2025]

.env.example

@@ -1,4 +1,4 @@
-PORT=300
+PORT=3000
 
 # Postgres Credentials
 DATABASE_NAME=druling
@@ -9,24 +9,13 @@ DATABASE_PORT=5432
 
 INTERNAL_SECRET=drulinghere
 
-OPENAI_API_KEY="openai key here"
-ANTHROPIC_API_KEY="anthropic key here"
-GOOGLE_API_KEY="google key here"
+OPENAI_API_KEY=key_here
+ANTHROPIC_API_KEY=key_here
+GOOGLE_API_KEY=key_here
 
-BACKEND_URL=http://localhost:8000/internal/v1
-
-# Environment-specific configuration (.env)
-# Development
-LOG_LEVEL=DEBUG
+LOG_LEVEL=INFO
 LOG_FORMAT=standard
 
-# Production
-# LOG_LEVEL=INFO
-# LOG_FORMAT=json
-# SENTRY_DSN=your_sentry_dsn_here
-
-# Staging
-# LOG_LEVEL=DEBUG
-# LOG_FORMAT=json
+BACKEND_URL=http://localhost:8000/internal/v1
 
-SECRET_ENCRYPTION_KEY=secret_key_here
+SECRET_ENCRYPTION_KEY=secure_key_here

.github/workflows/build.yml

@@ -0,0 +1,85 @@
+name: Build, Push, and Deploy
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+
+jobs:
+  build-and-push:
+    name: Build and Push
+    runs-on: ubuntu-latest
+    environment: ${{ github.ref == 'refs/heads/master' && 'prod' || (github.ref == 'refs/heads/dev' && 'dev' || 'staging') }}
+
+    permissions:
+      id-token: write
+      contents: read
+
+    env:
+      AWS_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+      ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+      IMAGE_TAG: ${{ github.sha }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Build, tag, and push image to Amazon ECR
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        run: |
+          docker build \
+            -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG \
+            -t $ECR_REGISTRY/$ECR_REPOSITORY:latest \
+            -f build/docker/Dockerfile .
+
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
+
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+  update-ecs-service:
+    name: Update ECS Service
+    runs-on: ubuntu-latest
+    needs: build-and-push
+    environment: ${{ github.ref == 'refs/heads/master' && 'prod' || (github.ref == 'refs/heads/dev' && 'dev' || 'staging') }}
+
+    permissions:
+      id-token: write
+      contents: read
+
+    env:
+      AWS_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+      ECS_CLUSTER: ${{ secrets.ECS_NAME }}
+      ECS_SERVICE: ${{ secrets.ECS_NAME }}
+      IMAGE: ${{ needs.build-and-push.outputs.image }}
+
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+
+      - name: Update ECS service
+        run: |
+          aws ecs update-service \
+            --cluster $ECS_CLUSTER \
+            --service ${ECS_SERVICE}-web \
+            --force-new-deployment \
+            --region $AWS_REGION \
+            --no-cli-pager \
+            > /dev/null 2>&1
+
+          echo "Started Deployment"

.gitignore

@@ -4,7 +4,6 @@ __pycache__/
 *$py.class
 *.so
 .Python
-build/
 develop-eggs/
 dist/
 downloads/

build/docker/Dockerfile

@@ -0,0 +1,34 @@
+# Use an official Python runtime as a base image
+FROM python:3.10-slim
+
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1  # Prevent Python from writing .pyc files
+ENV PYTHONUNBUFFERED 1        # Force the stdout and stderr streams to be unbuffered
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl \
+    postgresql-client && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+# Install dependencies
+COPY ../../../requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the entire project structure
+COPY ../../.. .
+
+# Copy and make entrypoint script executable
+COPY build/docker/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# Add the current directory to Python path
+ENV PYTHONPATH=/app
+
+# Expose the port FastAPI runs on
+EXPOSE 8000
+
+# Use entrypoint script for proper signal handling
+ENTRYPOINT ["/entrypoint.sh"]

build/docker/entrypoint.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Enable exit on error
+set -e
+
+# Function to handle shutdown signals
+shutdown() {
+    echo "Received shutdown signal, gracefully stopping uvicorn..."
+    if [ ! -z "$UVICORN_PID" ]; then
+        kill -TERM "$UVICORN_PID"
+        wait "$UVICORN_PID"
+    fi
+    echo "Application stopped gracefully"
+    exit 0
+}
+
+# Trap SIGTERM and SIGINT signals
+trap shutdown SIGTERM SIGINT
+
+# Start the FastAPI application
+echo "Starting FastAPI application..."
+uvicorn src.main:app --host 0.0.0.0 --port 8000 &
+
+# Store the PID of uvicorn process
+UVICORN_PID=$!
+
+# Wait for the process to complete
+wait "$UVICORN_PID"

Dockerfile → build/stack/web/Dockerfile

@@ -4,11 +4,14 @@ FROM python:3.11-slim
 WORKDIR /app
 
 # Install dependencies
-COPY requirements.txt .
+COPY ../../../requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy the project files
-COPY src/ src/
+# Copy the entire project structure
+COPY ../../.. .
+
+# Add the current directory to Python path
+ENV PYTHONPATH=/app
 
 # Expose the port FastAPI runs on
 EXPOSE 8000

docker-compose.yml

@@ -1,64 +1,31 @@
+version: '3.9'
+
 services:
   api:
     build: 
       context: .
-      dockerfile: Dockerfile
+      dockerfile: build/stack/web/Dockerfile
     ports:
       - "8000:8000"
+    env_file:
+      - .env
     environment:
-      - DATABASE_URL=postgresql://postgres:postgres@db:5432/cleanfastapi
+      DATABASE_NAME: druling
+      DATABASE_USER: druling
+      DATABASE_PASSWORD: password
+      DATABASE_HOST: db
+      DATABASE_PORT: 5432
     depends_on:
       - db
     volumes:
-      - ./src:/src/src
-    command: uvicorn src.main:src --host 0.0.0.0 --port 8000 --reload
+      - ./src:/app/src
 
   db:
     image: postgres:17
-    environment:
-      - POSTGRES_DB=cleanfastapi
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
     ports:
       - "5432:5432"
-
-volumes:
-  postgres_data:
-
-#    version: '3.8'
-#    services:
-#      app:
-#        build: .
-#        ports:
-#          - "8000:8000"
-#        environment:
-#          - LOG_LEVEL=INFO
-#          - LOG_FORMAT=json
-#        volumes:
-#          - ./logs:/app/logs
-#        depends_on:
-#          - elasticsearch
-#
-#      elasticsearch:
-#        image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
-#        environment:
-#          - discovery.type=single-node
-#          - xpack.security.enabled=false
-#        ports:
-#          - "9200:9200"
-#        volumes:
-#          - elasticsearch_data:/usr/share/elasticsearch/data
-#
-#      filebeat:
-#        image: docker.elastic.co/beats/filebeat:8.11.0
-#        user: root
-#        volumes:
-#          - ./logs:/app/logs:ro
-#          - ./filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
-#        depends_on:
-#          - elasticsearch
-#
-#    volumes:
-#      elasticsearch_data:
+    environment:
+      POSTGRES_PASSWORD: password
+      POSTGRES_USER: druling
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: druling

requirements.txt

@@ -33,7 +33,7 @@ frozenlist==1.6.0
 fsspec==2025.7.0
 functions==0.7.0
 generativeai==0.0.1
-google-ai-generativelanguage==0.7.0
+google-ai-generativelanguage==0.6.18
 google-api-core==2.25.1
 google-api-python-client==2.181.0
 google-auth==2.40.3
@@ -60,7 +60,7 @@ jsonpointer==3.0.0
 langchain==0.3.25
 langchain-anthropic==0.3.12
 langchain-community==0.3.23
-langchain-core==0.3.58
+langchain-core==0.3.62
 langchain-deepseek==0.1.3
 langchain-google-genai==2.1.5
 langchain-openai==0.3.16
@@ -118,7 +118,7 @@ stack-data==0.6.3
 starlette==0.46.2
 tabulate==0.9.0
 tenacity==9.1.2
-tiktoken==0.3.3
+tiktoken==0.8.0
 tomli==2.2.1
 tqdm==4.67.1
 traitlets==5.14.3

src/app/asset_conversation/schemas/response.py

@@ -9,6 +9,7 @@ class AssetChatResponse(BaseModel):
     tokens_used: Optional[int] = None
     confidence_score: Optional[float] = None
     metadata: Optional[Dict[str, Any]] = None
+    credit_used: Optional[int] = None
 
 
 class FileProcessingResponse(BaseModel):
@@ -17,3 +18,4 @@ class FileProcessingResponse(BaseModel):
     extracted_text: Optional[str] = None
     extracted_data: Optional[Dict[str, Any]] = None
     processing_status: Optional[str]
+    credit_used: Optional[int] = None

src/app/asset_conversation/services/asset.py

@@ -1,8 +1,13 @@
+import logging
+
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from src.core.exceptions.internal_service import InternalServer
 from src.services.asset_operation import AssetFactory, AssetOperationService
 from src.services.asset_operation.types import PdfService
 
+logger = logging.getLogger(__name__)
+
 
 class AssetConversationService:
     def __init__(self, db: AsyncSession, **kwargs):
@@ -14,20 +19,22 @@ async def asset_service(self, request) -> AssetOperationService:
             asset_service = await AssetFactory.get_parser_service(self.db, request)
             return asset_service
         except Exception as e:
-            raise Exception(f"Error getting LLM service: {e}")
+            raise InternalServer(f"Error getting LLM service: {e}")
 
     async def analyze_asset(self, request):
         """Analyze an asset using LLM"""
         try:
             asset_service = await self.asset_service(request)
             return await asset_service.analyze()
         except Exception as e:
-            raise Exception(f"Error analyzing asset: {e}")
+            logger.error(f"Error analyzing assert: {e}")
+            raise e
 
     async def generate_asset(self, request):
         """Generate an asset using LLM"""
         try:
             asset_service = await self.asset_service(request)
             return await asset_service.generate()
         except Exception as e:
-            raise Exception(f"Error generating asset: {e}")
+            logger.error(f"Error generating asset: {e}")
+            raise e