Updated URL option

.gitignore

@@ -3,4 +3,5 @@
 .vscode/
 .cache/
 resources/
+**/__pycache__/
 

Dockerfile

@@ -30,7 +30,8 @@ COPY requirements.txt ./
 COPY src/ ./src/
 COPY data/ ./data/
 
-RUN pip3 install -r requirements.txt
+RUN pip3 install --user -r requirements.txt
+ENV PATH=$HOME/.local/bin:$PATH
 
 EXPOSE 8501
 

Dockerfile.simple

@@ -0,0 +1,30 @@
+FROM python:3.11-slim
+
+# Create a non-root user and set up home
+RUN useradd -m appuser
+USER appuser
+ENV HOME=/home/appuser
+WORKDIR $HOME
+
+# Copy code and requirements
+COPY requirements.txt ./
+COPY src/ ./src/
+COPY data/ ./data/
+
+# Install Python dependencies for the user
+RUN pip3 install --user -r requirements.txt
+
+# Make sure user-level bin is in PATH
+ENV PATH=$HOME/.local/bin:$PATH
+
+# (Optional) Set up cache for torch if needed
+RUN mkdir -p $HOME/.cache/torch
+
+# Expose Streamlit's default port
+EXPOSE 8501
+
+# Disable XSRF protection for compatibility (optional, but safe for student demos)
+ENV ENABLE_XSRF_PROTECTION=false
+
+# Run the Streamlit app
+ENTRYPOINT ["streamlit", "run", "src/streamlit_app.py", "--server.port=8501", "--server.address=0.0.0.0"]

Makefile

@@ -1,30 +1,43 @@
-# Docker image name
-IMAGE_NAME = pokemon-similarity-hf-app
-CONTAINER_NAME = pokedex-container
+# Python environment
+PROJECT_ROOT = $(shell pwd)
+VENV = $(PROJECT_ROOT)/.venv
+PYTHON_ENV = $(VENV)/bin/python
 
-# Default port for Streamlit
+# Docker image and container names for the student demo
+IMAGE_NAME = streamlit-student-demo
+CONTAINER_NAME = streamlit-student-demo-container
 PORT = 8501
 
-.PHONY: build run clean
+.PHONY: build run run-detached stop clean up restart
 
-# Build the Docker image
+# Build the Docker image using Dockerfile.simple
 build:
-	docker build -t $(IMAGE_NAME) .
+	docker build -f Dockerfile.simple -t $(IMAGE_NAME) .
 
-# Run the Docker container
+# Run the Docker container interactively (foreground)
 run:
+	docker run --rm -it \
+		--name $(CONTAINER_NAME) \
+		-p $(PORT):8501 \
+		$(IMAGE_NAME)
+
+# Run the Docker container in detached mode (background)
+run-detached:
 	docker run -d \
 		--name $(CONTAINER_NAME) \
 		-p $(PORT):8501 \
 		$(IMAGE_NAME)
 
-# Stop and remove the container
-clean:
+# Stop the running container
+stop:
 	docker stop $(CONTAINER_NAME) || true
+
+# Remove the container (if stopped)
+clean:
 	docker rm $(CONTAINER_NAME) || true
 
-# Build and run in one command
-up: build run
+# Build and run in one command (detached)
+up: build run-detached
 
-# Stop and remove container, then rebuild and run
-restart: clean up
+# Stop, remove, rebuild, and run
+restart: stop clean up

src/streamlit_app.py

@@ -31,45 +31,51 @@ similarity_engine = get_similarity_engine()
 # Title and description
 st.title("🎮 Pokemon Similarity Finder")
 st.markdown("""
-Upload an image of a Pokemon and we'll find the closest match in our database!
+Upload an image of a Pokemon or provide an image URL and we'll find the closest match in our database!
 """)
 
-# File uploader
+# File uploader and URL input
 uploaded_file = st.file_uploader("Choose a Pokemon image...", type=["jpg", "jpeg", "png"])
+image_url = st.text_input("Or enter an image URL:")
 
+# Determine which input to use
+image_input = None
+input_type = None
 if uploaded_file is not None:
-    logger.info(f"File uploaded: {uploaded_file.name}")
-    try:
-        # Display the uploaded image
-        image = Image.open(uploaded_file)
-        st.image(image, caption="Uploaded Image", use_column_width=True)
-        logger.info("Successfully displayed uploaded image")
-        
-        # Add a button to trigger the similarity search
-        if st.button("Find Similar Pokemon"):
-            logger.info("Find Similar Pokemon button clicked")
-            with st.spinner("Analyzing image..."):
-                try:
-                    # Get the image bytes
-                    img_bytes = uploaded_file.getvalue()
-                    logger.info(f"Image size: {len(img_bytes)} bytes")
-                    
-                    # Find the closest Pokemon
-                    logger.info("Finding closest Pokemon match...")
-                    pokemon_name = similarity_engine.find_closest_pokemon(img_bytes)
-                    logger.info(f"Found closest Pokemon: {pokemon_name}")
-                    
-                    # Display the result
-                    st.success(f"🎯 The closest Pokemon is: **{pokemon_name}**")
-                    
-                    # Add some fun styling
-                    st.balloons()
-                except Exception as e:
-                    logger.error(f"Error during Pokemon matching: {str(e)}")
-                    st.error(f"❌ Error: {str(e)}")
-                    st.info("Please try uploading a different image or try again later.")
-    except Exception as e:
-        logger.error(f"Error loading image: {str(e)}")
-        st.error(f"❌ Error loading image: {str(e)}")
-        st.info("Please make sure you've uploaded a valid image file.")
+    image_input = uploaded_file.getvalue()
+    input_type = 'file'
+elif image_url:
+    image_input = image_url
+    input_type = 'url'
+
+if image_input is not None:
+    if input_type == 'file':
+        logger.info(f"File uploaded: {uploaded_file.name}")
+        try:
+            # Display the uploaded image
+            image = Image.open(io.BytesIO(image_input))
+            st.image(image, caption="Uploaded Image", use_column_width=True)
+            logger.info("Successfully displayed uploaded image")
+        except Exception as e:
+            logger.error(f"Error loading image: {str(e)}")
+            st.error(f"❌ Error loading image: {str(e)}")
+            st.info("Please make sure you've uploaded a valid image file.")
+    elif input_type == 'url':
+        logger.info(f"Image URL provided: {image_url}")
+        st.image(image_url, caption="Image from URL", use_column_width=True)
+
+    # Add a button to trigger the similarity search
+    if st.button("Find Similar Pokemon"):
+        logger.info("Find Similar Pokemon button clicked")
+        with st.spinner("Analyzing image..."):
+            try:
+                logger.info(f"Finding closest Pokemon match using {input_type} input...")
+                pokemon_name = similarity_engine.find_closest_pokemon(image_input)
+                logger.info(f"Found closest Pokemon: {pokemon_name}")
+                st.success(f"🎯 The closest Pokemon is: **{pokemon_name}**")
+                st.balloons()
+            except Exception as e:
+                logger.error(f"Error during Pokemon matching: {str(e)}")
+                st.error(f"❌ Error: {str(e)}")
+                st.info("Please try uploading a different image, using a different URL, or try again later.")