Fix frontend connection: use relative API path

Dockerfile

@@ -1,37 +1,87 @@
-FROM python:3.10.9-slim
+# FROM python:3.10.9-slim
+
+# RUN useradd -m -u 1000 appuser
+# WORKDIR /app
+
+# RUN apt-get update && apt-get install -y \
+#     gcc \
+#     libmagic-dev \
+#     && rm -rf /var/lib/apt/lists/*
+
+# RUN pip install --no-cache-dir "pydantic>=2.9.0" \
+#     torch torchvision torchaudio \
+#     --extra-index-url https://download.pytorch.org/whl/cpu
+
+
+# COPY requirements.txt .
+# RUN pip install --no-cache-dir -r requirements.txt
+
+# COPY --chown=appuser:appuser . .
+
+# EXPOSE 7860
+
+# USER appuser
+# COPY ./data /app/data
+
+# HEALTHCHECK --interval=30s --timeout=3s \
+#     CMD curl --fail http://localhost:7860/health || exit 1
+
+# # Ensure uvicorn runs on 7860
+# CMD ["python", "-m", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
+
+
+
 
-# Hugging Face requires UID 1000
-RUN useradd -m -u 1000 appuser
-WORKDIR /app
 
-# Install system dependencies (gcc for chromadb, libmagic for file processing)
+
+
+
+
+FROM python:3.10.9-slim
+
+# Install system dependencies + Monitoring tools
 RUN apt-get update && apt-get install -y \
     gcc \
     libmagic-dev \
+    curl \
+    prometheus \
+    grafana-server \
     && rm -rf /var/lib/apt/lists/*
 
-# Optimize builds by pre-installing heavy libraries
-RUN pip install --no-cache-dir "pydantic>=2.9.0" \
-    torch torchvision torchaudio \
-    --extra-index-url https://download.pytorch.org/whl/cpu
-
+RUN useradd -m -u 1000 appuser
+WORKDIR /app
 
+# RAG dependencies (Same as before)
+RUN pip install --no-cache-dir "pydantic>=2.9.0" \
+    torch torchvision torchaudio --extra-index-url download.pytorch.org
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy all project files
+# Copy all project files (including monitoring folder)
 COPY --chown=appuser:appuser . .
 
-# Hugging Face default port
-EXPOSE 7860
+# Setup Grafana Provisioning
+RUN mkdir -p /etc/grafana/provisioning/datasources /etc/grafana/provisioning/dashboards
+COPY monitoring/grafana/datasources/prometheus.yml /etc/grafana/provisioning/datasources/
+COPY monitoring/grafana/dashboards/dashboard_provider.yml /etc/grafana/provisioning/dashboards/
+COPY monitoring/grafana/dashboards/agent_dashboard.json /etc/grafana/provisioning/dashboards/
 
-USER appuser
-# RUN chmod -R 777 /app/data && chmod -R 777 /app/chroma_db
-COPY ./data /app/data
+# Ensure write permissions for DBs and Logs
+RUN mkdir -p /tmp/prometheus /tmp/grafana && \
+    chmod -R 777 /tmp/prometheus /tmp/grafana ./data ./chroma_db
+
+# Expose main HF port
+EXPOSE 7860
 
-# Update Healthcheck in Dockerfile
-HEALTHCHECK --interval=30s --timeout=3s \
-    CMD curl --fail http://localhost:7860/health || exit 1
+# --- STARTUP SCRIPT ---
+# We create a script to run Prometheus, Grafana, and your App together
+RUN echo '#!/bin/bash\n\
+prometheus --config.file=monitoring/prometheus.yml --storage.tsdb.path=/tmp/prometheus &\n\
+/usr/sbin/grafana-server --homepath /usr/share/grafana --config /etc/grafana/grafana.ini \
+  cfg:default.paths.data=/tmp/grafana \
+  cfg:default.paths.logs=/tmp/grafana \
+  cfg:server.http_port=3000 &\n\
+python -m uvicorn main:app --host 0.0.0.0 --port 7860' > /app/start.sh && chmod +x /app/start.sh
 
-# Ensure uvicorn runs on 7860
-CMD ["python", "-m", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
+USER appuser
+CMD ["/app/start.sh"]

main.py

@@ -8,6 +8,9 @@ from prometheus_client import generate_latest, CONTENT_TYPE_LATEST
 import os
 from schemas import ChatRequest, ChatResponse
 from agent import SupportAgent
+import httpx
+from fastapi import Request
+from starlette.responses import StreamingResponse
 
 os.environ["ANONYMIZED_TELEMETRY"] = "False"
 
@@ -30,6 +33,30 @@ async def lifespan(app: FastAPI):
 
 app = FastAPI(title="SmartCoffee AI 2026", lifespan=lifespan)
 
+
+
+
+"""
+    Adding the dashaboard for monitoring
+"""
+@app.api_route("/grafana/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
+async def grafana_proxy(request: Request, path: str):
+    # Proxy requests from HF_URL/grafana to internal port 3000
+    client = httpx.AsyncClient(base_url="http://localhost:3000")
+    url = httpx.URL(path=path, query=request.query_params.raw)
+    
+    # Forward the request to internal Grafana
+    rp_req = client.build_request(
+        request.method, url, headers=request.headers.raw, content=await request.body()
+    )
+    rp_resp = await client.send(rp_req, stream=True)
+    return StreamingResponse(
+        rp_resp.aiter_raw(),
+        status_code=rp_resp.status_code,
+        headers=rp_resp.headers
+    )
+
+
 # Replaces Nginx Security Headers & CORS
 app.add_middleware(
     CORSMiddleware,

monitoring/grafana/datasources/prometheus.yml

@@ -4,6 +4,6 @@ datasources:
   - name: Prometheus
     type: prometheus
     access: proxy
-    url: http://prometheus:9090
+    url: http://localhost:9090
     isDefault: true
     editable: true

monitoring/prometheus.yml

@@ -3,23 +3,13 @@ global:
   evaluation_interval: 15s
 
 scrape_configs:
-  # Job 1: Collects User Feedback metrics from FastAPI
-  - job_name: 'fastapi-gateway'
+  # Job 1: Collects all metrics from your combined FastAPI app
+  - job_name: 'smartcoffee-agent'
     metrics_path: '/metrics'
     static_configs:
-      - targets: ['fastapi-gateway:8000', 'host.docker.internal:8000']
-
-  # Job 2: Collects LLM Latency & Token metrics from the Worker
-  - job_name: 'agent-worker'
-    static_configs:
-      - targets: ['agent-worker:8001']
-    metrics_path: '/'
-
-  # Job 3: Infrastructure and Health
-  - job_name: 'cadvisor'
-    static_configs:
-      - targets: ['cadvisor:8080']
+      - targets: ['localhost:7860']
 
+  # Job 2: Self-monitoring for Prometheus
   - job_name: 'prometheus'
     static_configs:
       - targets: ['localhost:9090']