Update Dockerfile

Dockerfile

@@ -4,6 +4,7 @@ FROM python:3.10-slim
 WORKDIR /app
 
 # --- Install System Dependencies ---
+# Includes git (for cloning), R, and R development tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
     git \
     r-base \
@@ -11,46 +12,33 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 # --- Install R Packages ---
-RUN Rscript -e "tryCatch(install.packages(c('randomForest'), repos='https://cloud.r-project.org/', dependencies=TRUE), error=function(e){print(e); q(status=1)})" \
-    && echo "R packages installed successfully."
+# Install the R packages required by your model (adjust if needed)
+RUN Rscript -e "install.packages(c('randomForest'), repos='https://cloud.r-project.org/', dependencies=TRUE)"
 
 # --- Python Setup ---
+# Upgrade pip
 RUN pip install --upgrade pip
 
 # --- Application Code ---
+# Clone private repository using mounted secret
+# Assumes app.py, requirements.txt, rf_model.rds are in the repo root
 RUN --mount=type=secret,id=GITHUB_TOKEN,mode=0444,required=true \
     git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/leoncool23/pdpredict.git . \
     || (echo "GIT CLONE FAILED!" && exit 1)
 
-RUN echo "--- Listing files in /app after clone ---" && ls -la /app
-
 # --- Install Python Dependencies ---
-RUN if [ ! -f requirements.txt ]; then \
-      echo "ERROR: requirements.txt not found!"; exit 1; \
-    fi
+# Install Python requirements from file cloned via git
 RUN pip install --no-cache-dir -r requirements.txt \
     || (echo "PIP INSTALL FAILED!" && exit 1)
 
-# --- DEBUG: Test R and rpy2 imports ---
-RUN echo "--- Testing R library load ---" \
-    && Rscript -e "library(randomForest)" \
-    || (echo "ERROR: Failed to load randomForest R library" && exit 1)
-RUN echo "--- Testing rpy2 import ---" \
-    && python -c "import rpy2.robjects; print('rpy2 import OK')" \
-    || (echo "ERROR: Failed to import rpy2 in Python" && exit 1)
-
-# --- DEBUG: Try importing the 'api' module directly with Python ---
-# This will execute the module-level code in api.py and show any import-time errors
-RUN echo "--- Attempting Python import of 'api' module ---" \
-    && python -c "import api; print('SUCCESS: Python successfully imported api module')" \
-    || (echo "ERROR: Python failed to import the 'api' module. Check traceback above." && exit 1)
-
-# Set permissions
+# --- Permissions ---
+# Optional, but can help prevent permission issues in some environments
 RUN chmod -R 755 /app
 
-# --- DEBUG: List files right before CMD ---
-RUN echo "--- Listing files in /app before CMD ---" && ls -la /app
-
 # --- Port and Run Command ---
+# Expose the port (Using 8000, change to 7860 if required by Hugging Face Spaces)
 EXPOSE 8000
-CMD ["uvicorn", "api:app", "--host", "0.0.0.0", "--port", "8000"]
+
+# Run the FastAPI app defined in app.py (app:app) using uvicorn
+# Using port 8000, change to 7860 if required by Hugging Face Spaces
+CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "8000"]