update

Dockerfile

@@ -1,118 +1,64 @@
-# # Use Ubuntu as base image for better compatibility
-# FROM ubuntu:22.04
+# # Use a base image with Python
+# FROM python:3.10
 
-# # Set environment variables
-# ENV DEBIAN_FRONTEND=noninteractive
-# ENV PYTHONUNBUFFERED=1
-# ENV PYTHONPATH=/app
-# ENV OLLAMA_HOST=0.0.0.0
-# ENV TRANSFORMERS_CACHE=/app/.cache/huggingface
-# ENV HF_HOME=/app/.cache/huggingface
-
-# # Install system dependencies
-# RUN apt-get update && apt-get install -y \
-#     curl \
-#     wget \
-#     git \
-#     python3.10 \
-#     python3-pip \
-#     python3.10-venv \
-#     && rm -rf /var/lib/apt/lists/*
-
-# # Create symbolic link for python3
-# RUN ln -sf /usr/bin/python3.10 /usr/bin/python3
+# # Set the working directory
+# WORKDIR /app
 
 # # Create a non-root user
-# RUN useradd -m -s /bin/bash appuser
-
-# # Create necessary directories with proper permissions
-# RUN mkdir -p /app/.cache/huggingface \
-#     && mkdir -p /app/.ollama \
-#     && chown -R appuser:appuser /app \
-#     && chown -R appuser:appuser /app/.cache \
-#     && chown -R appuser:appuser /app/.ollama
+# RUN useradd -m -u 1000 appuser
 
-# # Install Ollama
-# RUN curl -fsSL https://ollama.com/install.sh | sh
-
-# # Set working directory
-# WORKDIR /app
+# # Install system dependencies
+# RUN apt update && apt install -y curl && \
+#     curl -fsSL https://ollama.ai/install.sh | sh
 
-# # Copy requirements first to leverage Docker cache
-# COPY requirements.txt .
+# # Create .ollama directory and set permissions
+# RUN mkdir -p /home/appuser/.ollama && \
+#     chown -R appuser:appuser /home/appuser/.ollama
 
 # # Install Python dependencies
-# RUN pip3 install --no-cache-dir -r requirements.txt
+# COPY requirements.txt requirements.txt
+# RUN pip install --no-cache-dir -r requirements.txt
 
-# # Copy the application code
+# # Copy application files
 # COPY . .
 
-# # Set proper ownership of all files
-# RUN chown -R appuser:appuser /app
-
-# # Create a startup script with better logging and error handling
+# # Create a more robust startup script
 # RUN echo '#!/bin/bash\n\
-# set -e\n\
-# \n\
-# echo "Starting Healthcare AI Assistant..."\n\
-# \n\
-# # Function to check if Ollama is running\n\
-# check_ollama() {\n\
-#     curl -s http://localhost:11434/api/tags > /dev/null\n\
-#     return $?\n\
-# }\n\
-# \n\
-# # Start Ollama in the background\n\
 # echo "Starting Ollama server..."\n\
 # ollama serve &\n\
-# OLLAMA_PID=$!\n\
 # \n\
-# # Wait for Ollama to start\n\
-# echo "Waiting for Ollama to start..."\n\
-# for i in {1..30}; do\n\
-#     if check_ollama; then\n\
-#         echo "Ollama server is running"\n\
-#         break\n\
-#     fi\n\
-#     if [ $i -eq 30 ]; then\n\
-#         echo "Error: Ollama server failed to start"\n\
-#         exit 1\n\
-#     fi\n\
-#     sleep 1\n\
+# # Wait for Ollama server to be ready\n\
+# until curl -s http://localhost:11434/api/tags >/dev/null; do\n\
+#     echo "Waiting for Ollama server to be ready..."\n\
+#     sleep 2\n\
 # done\n\
 # \n\
-# # Pull Mistral model\n\
 # echo "Pulling Mistral model..."\n\
 # ollama pull mistral\n\
 # \n\
-# # Start FastAPI application\n\
 # echo "Starting FastAPI application..."\n\
-# cd /app\n\
-# \n\
-# # Keep the container running and show logs\n\
-# exec uvicorn main:app --host 0.0.0.0 --port 8000 --log-level info\n\
-# ' > /app/start.sh && chmod +x /app/start.sh
+# uvicorn main:app --host 0.0.0.0 --port 7860' > start.sh && \
+#     chmod +x start.sh
 
-# # Expose ports
-# # EXPOSE 8000 11434
+# # Set ownership of the application files
+# RUN chown -R appuser:appuser /app
 
 # # Switch to non-root user
 # USER appuser
 
-# # Set the entrypoint
-# ENTRYPOINT ["/app/start.sh"]
+# # Expose the port FastAPI will run on
+# EXPOSE 7860
+
+# # Set the HOME environment variable
+# ENV HOME=/home/appuser
+
+# # Run the startup script
+# CMD ["./start.sh"]
+
 
 # Use a base image with Python
 FROM python:3.10
 
-# Set environment variables
-ENV PYTHONUNBUFFERED=1
-ENV PYTHONPATH=/app
-ENV OLLAMA_HOST=0.0.0.0
-ENV TRANSFORMERS_CACHE=/home/appuser/.cache/huggingface
-ENV HF_HOME=/home/appuser/.cache/huggingface
-ENV API_BASE_URL=http://localhost:8000
-
 # Set the working directory
 WORKDIR /app
 
@@ -120,37 +66,32 @@ WORKDIR /app
 RUN useradd -m -u 1000 appuser
 
 # Install system dependencies
-RUN apt update && apt install -y curl && \
-    curl -fsSL https://ollama.ai/install.sh | sh
+RUN apt-get update && apt-get install -y --no-install-recommends curl && \
+    curl -fsSL https://ollama.ai/install.sh | sh && \
+    rm -rf /var/lib/apt/lists/*
 
-# Create necessary directories and set permissions
+# Create .ollama directory and set permissions
 RUN mkdir -p /home/appuser/.ollama && \
-    mkdir -p /home/appuser/.cache/huggingface && \
-    chown -R appuser:appuser /home/appuser/.ollama && \
-    chown -R appuser:appuser /home/appuser/.cache
+    chown -R appuser:appuser /home/appuser/.ollama
 
 # Install Python dependencies
-COPY requirements.txt requirements.txt
+COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy application files
-COPY . .
+COPY --chown=appuser:appuser . .
 
 # Create a more robust startup script
 RUN echo '#!/bin/bash\n\
 set -e\n\
 \n\
-echo "Starting Healthcare AI Assistant..."\n\
-\n\
-# Start Ollama server\n\
+# Start Ollama server in background\n\
 echo "Starting Ollama server..."\n\
 ollama serve &\n\
-OLLAMA_PID=$!\n\
 \n\
 # Wait for Ollama server to be ready\n\
 echo "Waiting for Ollama server to be ready..."\n\
-until curl -s http://localhost:11434/api/tags >/dev/null; do\n\
-    echo "Waiting for Ollama server..."\n\
+while ! curl -s http://localhost:11434 >/dev/null; do\n\
     sleep 2\n\
 done\n\
 \n\
@@ -158,8 +99,8 @@ echo "Pulling Mistral model..."\n\
 ollama pull mistral\n\
 \n\
 echo "Starting FastAPI application..."\n\
-exec uvicorn main:app --host 0.0.0.0 --port 7860 --log-level info\n\
-' > start.sh && chmod +x start.sh
+exec uvicorn main:app --host 0.0.0.0 --port 7860' > start.sh && \
+    chmod +x start.sh
 
 # Set ownership of the application files
 RUN chown -R appuser:appuser /app
@@ -167,11 +108,13 @@ RUN chown -R appuser:appuser /app
 # Switch to non-root user
 USER appuser
 
-# Expose both ports
+# Expose both Ollama and FastAPI ports
 EXPOSE 7860 11434
 
-# Set the HOME environment variable
+# Set environment variables
 ENV HOME=/home/appuser
+ENV OLLAMA_HOST=0.0.0.0
+ENV PYTHONUNBUFFERED=1
 
 # Run the startup script
 CMD ["./start.sh"]

main.py

@@ -750,6 +750,6 @@ async def health_check():
 async def root():
     return {"message": "Hello World"}
 
-if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+# if __name__ == "__main__":
+#     import uvicorn
+#     uvicorn.run(app, host="0.0.0.0", port=8000)