upddate

Dockerfile

@@ -1,12 +1,17 @@
 FROM python:3.10-slim-buster
+
 # Set the working directory
 WORKDIR /app
+
 # Copy requirements file
 COPY requirements.txt requirements.txt
+
 # Create a virtual environment
 RUN python -m venv venv
+
 # Set the PATH to use the virtual environment
 ENV PATH="/app/venv/bin:$PATH"
+
 # Update package list and install necessary packages in a single step
 RUN apt-get update && apt-get install -y \
     curl \
@@ -17,19 +22,45 @@ RUN apt-get update && apt-get install -y \
     tini \
     systemd && \
     apt-get clean
+
 # Upgrade pip and install dependencies
 RUN python -m pip install --upgrade pip
 RUN pip install --no-cache-dir -r requirements.txt
-# Install Ollama
-RUN curl -fsSL https://ollama.com/install.sh | sh
+
+# Install application
+RUN curl https://ollama.ai/install.sh | sh
+
+# Create the directory and give appropriate permissions
 RUN mkdir -p /.ollama && chmod 777 /.ollama
+
+WORKDIR /.ollama
+# Copy the entry point script
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+# Set the entry point script as the default command
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["ollama", "serve"]
+
+# Set the model as an environment variable (this can be overridden)
+ENV model=${model}
+
+# Expose the server port
+EXPOSE 7860
+
+# Ensure Ollama binary is in the PATH
 RUN which ollama
-# Expose the port the application uses (replace 11434 with the actual port)
-EXPOSE 11434
+
+
 # Copy the entire application
 COPY . .
+
 # Set proper permissions for the translations directory
 RUN chmod -R 777 translations
+
+# Copy the startup script and make it executable
+COPY start.sh .
+RUN chmod +x start.sh
+
 # Define the command to run the application
 CMD ["python", "./run.py"]
-

entrypoint.sh

@@ -14,7 +14,6 @@ for m in "${MODELS[@]}"; do
     # echo "Running $m"
     # ollama run "$m"
     # No need to sleep here unless you want to give some delay between each pull for some reason
-    python run.py
 done
 
 # Keep the script running to prevent the container from exiting

server/backend.py

@@ -62,8 +62,8 @@ class Backend_Api:
             model = request.json['model']
             
             messages = build_messages(jailbreak)
-            local_mode_1=False
-            local_model_2 =True
+            local_mode_1=True
+            local_model_2 =False
             print(model)
 
             if model=='terminal':