Corrupt images and delete function fix (#12)

- PR Done (bc03529a6e25c4c42eb3014d76dbec61d45ee864)

Dockerfile

@@ -18,8 +18,6 @@ RUN apt-get update && apt-get install -y \
     zstd \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl -fsSL https://ollama.com/install.sh | sh
-
 COPY requirements.txt ./
 
 RUN pip3 install --no-cache-dir -r requirements.txt

docker-entrypoint.sh

@@ -29,24 +29,6 @@ elif [ -e "$APP_DIR/encrypted_images" ] && [ ! -L "$APP_DIR/encrypted_images" ];
 fi
 ln -sfn "$IMAGE_DIR" "$APP_DIR/encrypted_images"
 
-ollama serve &
-OLLAMA_PID="$!"
-
-for attempt in $(seq 1 60); do
-    if ollama list >/dev/null 2>&1; then
-        break
-    fi
-    if [ "$attempt" -eq 60 ]; then
-        echo "Ollama did not become ready in time." >&2
-        exit 1
-    fi
-    sleep 1
-done
-
-ollama pull embeddinggemma:latest
-
-trap 'kill "$OLLAMA_PID" 2>/dev/null || true' EXIT
-
 exec streamlit run Homepage.py \
     --server.port=8501 \
     --server.address=0.0.0.0 \

repository/Search_Image.py

@@ -60,8 +60,8 @@ if not search_query:
                     decrypted_image = fernet.decrypt(encrypted_image)
                     image = Image.open(BytesIO(decrypted_image)).convert("RGB")
                     st.image(image, width="stretch")
-                    if st.button("Delete", key=metadata["filename"]):
-                        db.delete(ids=[results["ids"][i + j]])
+                    if st.button("Delete", key=metadata["id"]):
+                        db.delete(ids=[metadata["id"]])
                         if os.path.exists(metadata["filepath"]):
                             os.remove(metadata["filepath"])
 
@@ -167,7 +167,7 @@ else:
                 f"Combined: {data['combined_score']:.2f}"
             )
         )
-        if st.button("Delete", key=metadata["filename"]):
+        if st.button("Delete", key=f"delete_{metadata['id']}"):
             db.delete(ids=[metadata["id"]])
             if os.path.exists(metadata["filepath"]):
                 os.remove(metadata["filepath"])

repository/Upload_Image.py

@@ -28,7 +28,11 @@ uploaded_files = st.file_uploader("Upload your images", accept_multiple_files=Tr
 progress_text = "Operation in progress. Please wait."
 progress_bar = st.progress(0, text=progress_text)
 for percent_complete, uploaded_file in enumerate(uploaded_files, start=1):
-    image = Image.open(uploaded_file).convert("RGB")
+    try:
+        image = Image.open(uploaded_file).convert("RGB")
+    except Exception as e:
+        st.error(f"Error occurred while opening {uploaded_file.name}. Skipping this file.")
+        continue
     start_time = time.time()
     buffer = BytesIO()
     image.save(buffer, format="PNG")
@@ -53,6 +57,7 @@ for percent_complete, uploaded_file in enumerate(uploaded_files, start=1):
 
     # metadata
     metadata = {
+        "id": id,
         "filename": uploaded_file.name,
         "filetype": uploaded_file.type,
         "filesize": uploaded_file.size,