Update Dockerfile

Dockerfile

@@ -1,12 +1,9 @@
 # syntax=docker/dockerfile:1.4
 FROM python:3.10-slim
 
-# Set working directory
 WORKDIR /app
 
 # --- Install System Dependencies ---
-# Includes git (for cloning), R, and R development tools (needed for R packages/rpy2)
-# Add any other system libraries needed by specific R packages here (e.g., libcurl4-openssl-dev, libssl-dev)
 RUN apt-get update && apt-get install -y --no-install-recommends \
     git \
     r-base \
@@ -14,37 +11,53 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 # --- Install R Packages ---
-# Install the R packages required by your model.
-# *** Adjust the list c('randomForest') if your model needs other packages ***
-RUN Rscript -e "install.packages(c('randomForest'), repos='https://cloud.r-project.org/', dependencies=TRUE)"
+# Using tryCatch for basic error checking during R package installation
+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."
 
 # --- Python Setup ---
-# Upgrade pip
 RUN pip install --upgrade pip
 
-# Create app directory (redundant with WORKDIR, but harmless) and set permissions
-# Using 755 is generally safer than 777 unless specifically needed
-RUN mkdir -p /app && chmod -R 755 /app
-WORKDIR /app # Ensure we are in the workdir
-
 # --- Application Code ---
-# Clone private repository using mounted secret
-# This will bring in api.py, rf_model.rds, requirements.txt, etc.
+# Clone repository
 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 .
+    git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/leoncool23/pdpredict.git . \
+    || (echo "GIT CLONE FAILED!" && exit 1) # Add basic error check for clone
+
+# --- DEBUG: List files in /app AFTER cloning ---
+# This is CRITICAL to see if api.py and requirements.txt are where they should be
+RUN echo "--- Listing files in /app after clone ---" && ls -la /app
 
 # --- Install Python Dependencies ---
-# requirements.txt should be present after cloning
-# This MUST run *after* R is installed so rpy2 can find it
-RUN pip install --no-cache-dir -r requirements.txt
+# Check if requirements.txt exists before trying to install
+RUN if [ ! -f requirements.txt ]; then \
+      echo "ERROR: requirements.txt not found in /app after clone!"; \
+      exit 1; \
+    fi
+# Install dependencies
+RUN pip install --no-cache-dir -r requirements.txt \
+    || (echo "PIP INSTALL FAILED!" && exit 1) # Add basic error check
+
+# --- DEBUG: Test Critical Imports ---
+# Test if R library can be loaded via Rscript
+RUN echo "--- Testing R library load ---" \
+    && Rscript -e "library(randomForest)" \
+    || (echo "ERROR: Failed to load randomForest R library" && exit 1)
+# Test if rpy2 can be imported in Python
+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: Check api.py syntax (optional but helpful) ---
+# This tries to compile api.py to catch basic syntax errors
+RUN echo "--- Checking api.py syntax ---" \
+    && python -m compileall api.py \
+    || (echo "ERROR: api.py has syntax errors" && exit 1)
+
+# Set permissions (can often be skipped if owner is correct, but good practice)
+RUN chmod -R 755 /app
 
 # --- Port and Run Command ---
-# Expose the port your FastAPI app runs on (as defined in api.py or CMD)
-# Changed from 7860 to 8000 to match api.py standard uvicorn command
+# Using port 8000 based on api.py, adjust if HF requires 7860
 EXPOSE 8000
-
-# Run the FastAPI app defined in api.py using uvicorn
-# Corrected 'app:app' to 'api:app'
-# Corrected port from 7860 to 8000
-# If HF Spaces requires port 7860, change EXPOSE and --port back to 7860
 CMD ["uvicorn", "api:app", "--host", "0.0.0.0", "--port", "8000"]