fix: remove middle from the app workflows (#52)

* fix: remove middle from the app workflows

* feat(docker): add docker compose and docker files

backend/Dockerfile

@@ -0,0 +1,29 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Poetry
+RUN pip install poetry
+
+# Copy application code
+COPY . .
+
+# Configure poetry to not create a virtual environment
+RUN poetry config virtualenvs.create false
+
+# Install dependencies
+RUN poetry install
+
+# run migrations
+RUN make migrate
+
+# Expose the port the app runs on
+EXPOSE 8000
+
+# Command to run the application
+CMD ["poetry", "run", "uvicorn", "app.main:app", "--workers", "2", "--host", "0.0.0.0", "--port", "8000"]

backend/app/api/v1/processes.py

@@ -61,7 +61,7 @@ def get_process(process_id: int, db: Session = Depends(get_db)):
     }
 
 
-@process_router.get("/")
+@process_router.get("")
 def get_processes(db: Session = Depends(get_db)):
     processes = process_repository.get_processes(db=db)
 
@@ -530,4 +530,4 @@ def get_process_suggestion(
 
     except Exception as e:
         logger.error(f"Error retrieving file: {str(e)}\n{traceback.format_exc()}")
-        raise HTTPException(status_code=500, detail="Failed to retrieve file")
+        raise HTTPException(status_code=500, detail="Failed to retrieve file")

backend/app/api/v1/projects.py

@@ -23,7 +23,7 @@
 logger = Logger()
 
 
-@project_router.post("/", status_code=201)
+@project_router.post("", status_code=201)
 def create_project(project: ProjectCreate, db: Session = Depends(get_db)):
     if not project.name.strip():
         raise HTTPException(
@@ -38,7 +38,7 @@ def create_project(project: ProjectCreate, db: Session = Depends(get_db)):
     }
 
 
-@project_router.get("/")
+@project_router.get("")
 def get_projects(
     page: int = Query(1, ge=1),
     page_size: int = Query(100, ge=1, le=100),

backend/app/api/v1/user.py

@@ -42,7 +42,6 @@ def save_user_api_key(
         raise HTTPException(
             status_code=400, detail="Invalid API Key"
         )
-
     user_repository.update_user_api_key(db, users[0].id, api_key_request.api_key)
 
     return {

docker-compose.yml

@@ -0,0 +1,34 @@
+version: "3.8"
+
+services:
+  backend:
+    build:
+      context: ./backend
+      dockerfile: Dockerfile
+    container_name: panda-etl-backend
+    ports:
+      - "5328:5328"
+    volumes:
+      - ./instance:/app/instance
+      - ./uploads:/app/uploads
+      - ./processed:/app/processed
+    environment:
+      - ENV=production
+    restart: unless-stopped
+    command: >
+      sh -c "poetry run alembic upgrade head && poetry run uvicorn app.main:app --host 0.0.0.0 --port 5328"
+
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    container_name: panda-etl-frontend
+    ports:
+      - "3000:3000"
+    environment:
+      - NODE_ENV=production
+    depends_on:
+      - backend
+    restart: unless-stopped
+    extra_hosts:
+      - "host.docker.internal:host-gateway"

frontend/Dockerfile

@@ -0,0 +1,29 @@
+# Use Node.js as the base image
+FROM node:18-alpine AS builder
+
+# Set working directory
+WORKDIR /app
+
+# Copy package.json and install dependencies
+COPY package.json package-lock.json ./
+RUN npm install --frozen-lockfile
+
+# Copy the entire frontend code
+COPY . .
+
+# Build Next.js application
+RUN npm run build
+
+# Use a minimal base image for production
+FROM node:18-alpine
+
+WORKDIR /app
+
+# Copy built files from builder
+COPY --from=builder /app ./
+
+# Expose frontend port
+EXPOSE 3000
+
+# Start Next.js
+CMD ["npm", "run", "start"]

frontend/next.config.mjs

@@ -2,13 +2,13 @@ const nextConfig = {
   swcMinify: false, // TODO - track and remove this later: https://github.com/wojtekmaj/react-pdf/issues/1822
   async rewrites() {
     return [
-      {
-        source: "/api/:path*",
-        destination: "http://127.0.0.1:5328/:path*",
-      },
+      // {
+      //   source: "/api/:path*",
+      //   destination: "http://localhost:5328/:path*",
+      // },
       {
         source: "/assets/:path*",
-        destination: "http://127.0.0.1:5328/assets/:path*",
+        destination: "http://localhost:5328/assets/:path*",
       },
     ];
   },

frontend/src/app/(editor)/projects/[projectId]/processes/[processId]/csv/page.tsx

@@ -35,7 +35,7 @@ const ProcessPage = () => {
     setIsLoading(true);
     try {
       const response = await fetch(
-        `${BASE_API_URL}/${processApiUrl}/${processId}/get-csv`
+        `${BASE_API_URL}${processApiUrl}/${processId}/get-csv`
       );
       const {
         data: { csv },

frontend/src/middleware.ts

@@ -8,10 +8,12 @@ export async function middleware(request: NextRequest) {
   try {
     apiKey = await GetAPIKey();
   } catch (error) {
+    console.error("Error fetching API key:", error);
     return NextResponse.redirect(new URL("/api-key-setup", request.url));
   }
 
   if (!apiKey && !request.nextUrl.pathname.startsWith("/api-key-setup")) {
+    console.log("No API key found. Redirecting to /api-key-setup");
     return NextResponse.redirect(new URL("/api-key-setup", request.url));
   }