changed working directory

Dockerfile

@@ -1,11 +1,13 @@
 # ----------------------------
-# Stage 1: Build the React Frontend
+# Stage 1: Setup - Create Writable Directories and Set Cache Variables
 # ----------------------------
-FROM node:20-alpine AS builder
+FROM node:20-alpine AS setup
 RUN apk add --no-cache libc6-compat
-WORKDIR /app
 
-# Create writable directories for Hugging Face Spaces
+# Set the entire project’s working/root directory as /app/workspace
+WORKDIR /app/workspace
+
+# Create writable directories for Hugging Face Spaces and ensure full permissions
 RUN mkdir -p /tmp/huggingface && \
     chmod -R 777 /tmp/huggingface && \
     mkdir -p /app/workspace && \
@@ -17,55 +19,59 @@ ENV HF_HOME=/tmp/huggingface \
     XDG_CACHE_HOME=/tmp \
     WRITABLE_DIR=/app/workspace
 
-# Copy the 'frontend' folder from the project root into the container
-COPY frontend ./frontend
+# ----------------------------
+# Stage 2: Build the React Frontend
+# ----------------------------
+FROM setup AS frontend
+# Switch to the frontend subdirectory under the project root
+WORKDIR /app/workspace/frontend
 
-# Switch to the frontend directory
-WORKDIR /app/frontend
+# Copy the local 'frontend' folder (its contents) into /app/workspace/frontend
+COPY frontend/ .
 
-# Install dependencies (using yarn, npm, or pnpm)
+# Install dependencies using the appropriate package manager
 RUN if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
     elif [ -f package-lock.json ]; then npm ci; \
     elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
     else echo "No lockfile found. Exiting." && exit 1; \
     fi
 
-# Build the React app (produces a production-ready build in the "build" folder)
+# Build the React app
 RUN npm run build
 
 # ----------------------------
-# Stage 2: Set Up the FastAPI Backend and Serve the React App
+# Stage 3: Set Up the FastAPI Backend
 # ----------------------------
 FROM python:3.12-slim AS backend
-WORKDIR /app
+# Set the entire project’s working/root directory as /app/workspace
+WORKDIR /app/workspace
 
 # Install OS-level dependencies
 RUN apt-get update --fix-missing && \
     apt-get install --no-install-recommends -y git curl && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Install Node.js (if needed for any backend tasks)
+# Install Node.js
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
     apt-get update --fix-missing && \
     apt-get install --no-install-recommends -y nodejs && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Copy requirements.txt and install Python dependencies
-COPY requirements.txt .
+# Copy the entire project source into /app/workspace (includes backend code, requirements, etc.)
+COPY . .
+
+# Copy the built React app from the frontend stage into the appropriate location
+COPY --from=frontend /app/workspace/frontend/build ./frontend/build
+
+# Install Python dependencies from requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Install additional dependencies for torch and spaCy
 RUN pip install --no-cache-dir torch==2.5.1 torchvision==0.20.1 torchaudio==2.5.1 --index-url https://download.pytorch.org/whl/cu124
 RUN python -m spacy download en_core_web_sm
 
-# Copy the rest of your backend code and resources
-COPY . .
-
-# Copy the built React app from the builder stage into the same folder structure as used in your FastAPI code
-COPY --from=builder /app/frontend/build ./frontend/build
-
-# Expose the port
+# Expose the port (using the PORT environment variable if provided, or default to 7860)
 EXPOSE ${PORT:-7860}
 
-# Start the FastAPI backend using Uvicorn, reading the PORT env variable
+# Start the FastAPI backend using Uvicorn
 CMD ["sh", "-c", "uvicorn main:app --host 0.0.0.0 --port ${PORT:-7860}"]

main.py

@@ -17,8 +17,6 @@ from google.api_core.exceptions import ResourceExhausted
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
 
-ENV_FILE_PATH = os.getenv("WRITABLE_DIR", "/tmp") + "/.env"
-
 CONTEXT_LENGTH = 128000
 BUFFER = 10000
 MAX_TOKENS_ALLOWED = CONTEXT_LENGTH - BUFFER
@@ -37,7 +35,7 @@ def format_error_sse(event_type: str, data: str) -> str:
 
 # Initialize the components
 def initialize_components():
-    load_dotenv(ENV_FILE_PATH, override=True)
+    load_dotenv(override=True)
 
     from src.search.search_engine import SearchEngine
     from src.query_processing.query_processor import QueryProcessor

src/helpers/helper.py

@@ -5,7 +5,7 @@ import torch
 import transformers
 from langchain.text_splitter import RecursiveCharacterTextSplitter, TokenTextSplitter
 
-ENV_FILE_PATH = os.path.join(os.getenv("WRITABLE_DIR", "/tmp"), ".env")
+ENV_FILE_PATH = os.path.join(os.path.dirname(__file__), "../../.env").replace("\\", "/")
 
 def remove_markdown(text: str) -> str:
         # Remove code block format type and the code block itself

src/rag/neo4j_graphrag.py

@@ -1972,7 +1972,7 @@ class Neo4jGraphRAG:
                 net.options["interaction"] = {"dragNodes": True}
 
                 # 5. Save to a temporary file, read it, then remove that file
-                net.save_graph(os.getenv("WRITABLE_DIR", "/tmp") + "temp_graph.html")
+                net.save_graph("temp_graph.html")
                 with open("temp_graph.html", "r", encoding="utf-8") as f:
                     html_str = f.read()