migrate to docker sdk attempt

README.md

@@ -1,11 +1,10 @@
 ---
-title: omicsfuserx-demo
+title: query2plot-demo
 emoji: "🧬"
 colorFrom: red
 colorTo: blue
-sdk: streamlit
+sdk: docker
 sdk_version: 1.41.0
 python_version: "3.12"
-app_file: mycoder/app.py
-pinned: false
+app_port: 7860
 ---

mycoder/Dockerfile

@@ -0,0 +1,32 @@
+FROM ollama/ollama:latest
+
+# Create a user and set up permissions
+RUN useradd -ms /bin/bash ollama-user
+
+# Set the home directory
+ENV HOME=/home/ollama-user
+WORKDIR $HOME
+
+# Ensure the user has access to the directory
+RUN mkdir -p $HOME/.ollama && chown -R ollama-user:ollama-user $HOME/.ollama
+
+# Install netcat (nc) for checking server readiness
+RUN apt-get update && apt-get install -y netcat
+
+# Copy the entrypoint script before switching users
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+
+# Set permissions for the entrypoint script
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+# Switch to the non-root user
+USER ollama-user
+
+# Set Ollama to listen on all network interfaces
+ENV OLLAMA_HOST=0.0.0.0:7860
+
+# Expose the default port
+EXPOSE 7860
+
+# Use the custom entrypoint script
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

mycoder/app.py

@@ -33,9 +33,4 @@ if st.button("Run Query2Plot"):
 
     # TO DO: Display the generated plot if it exists
     if os.path.exists("output/plot.png"):
-        st.image("output/plot.png", caption="Generated Figure")
-
-if st.button("Test Ollama Server"):
-    from mycoder.src.inner.ollama_utils import download_ollama, start_ollama, start_model, stop_model
-    download_ollama()
-    start_ollama()
+        st.image("output/plot.png", caption="Generated Figure")

mycoder/entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Start Ollama server in the background
+ollama serve &
+
+# Wait for the server to be ready
+while ! nc -z localhost 7860; do
+    echo "Waiting for Ollama server to start..."
+    sleep 1
+done
+
+# Pull the model
+echo "Pulling the model..."
+ollama pull gemma3:1b
+
+# Keep the container running
+wait

mycoder/src/inner/ollama_utils.py

@@ -1,13 +0,0 @@
-import subprocess
-
-def download_ollama() -> None:
-    subprocess.run(["curl -fsSL https://ollama.com/install.sh | sh"], shell=True, check=True)
-
-def start_ollama() -> None:
-    subprocess.run(["ollama", "serve"], shell=True, check=True)
-
-def start_model() -> None:
-    subprocess.run(["ollama", "run", "codellama:7b"], check=True)
-
-def stop_model() -> None:
-    subprocess.run(["ollama", "stop", "codellama:7b"], check=True)