merging

thewriteway · Nov 7, 2024 · 8682f71 · 8682f71
1 parent 3f5199f
commit 8682f71
Show file tree

Hide file tree

Showing 48 changed files with 20 additions and 214 deletions.
diff --git a/.github/workflows/standard-app-build.yml b/.github/workflows/standard-app-build.yml
@@ -1,10 +1,10 @@
-name: 'DockerBuild'
+name: "DockerBuild"
 
 on:
   push:
     tags:
-      - 'v*'
-  
+      - "v*"
+
 jobs:
   Build_And_Push:
     runs-on: ubuntu-22.04
@@ -49,8 +49,8 @@ jobs:
       - name: Build and Upload for AMD64 and ARM64
         uses: docker/build-push-action@v4
         with:
-          context: .
+          context: ./meme_search/
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 **/.DS_Store
 **/*.db
 **/*.pyc
-data
+meme_search_pro/db_data
diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml
@@ -11,17 +11,17 @@ services:
     depends_on:
       meme-search-db:
         condition: service_healthy
-    volumes:
-      - ./memes/:/rails/public/memes
+    volumes: # <-- any additional meme directory must be mounted here
+      - ./meme_search_pro/memes/:/rails/public/memes
 
   image_to_text_generator:
     image: ghcr.io/neonwatty/image-to-text-generator:latest
     container_name: image_to_text_generator
     ports:
       - 8000:8000
-    volumes:
-      - ./memes/:/app/public/memes
-      - ./data/image_to_text_app:/app/db
+    volumes: # <-- any additional meme directory must be mounted here
+      - ./meme_search_pro/memes/:/app/public/memes
+      - ./meme_search_pro/db_data/image_to_text_generator:/app/db
     deploy:
       resources:
         limits: # <-- roughly tested min memory for cpu usage
@@ -36,7 +36,7 @@ services:
     image: pgvector/pgvector:pg17
     container_name: meme-search-pro-db # note: must use - and not _ as ActiveRecord uses URI::RFC2396_Parser to parse database URLs
     volumes:
-      - ./data/meme-search-pro-db:/var/lib/postgresql/data
+      - ./meme_search_pro/db_data/meme-search-pro-db:/var/lib/postgresql/data
     environment:
       POSTGRES_DB: meme_search
       POSTGRES_USER: postgres

diff --git a/streamlit_app/docker-compose.yml → docker-compose.yml b/streamlit_app/docker-compose.yml → docker-compose.yml
@@ -2,12 +2,12 @@ version: "3.8"
 
 services:
   meme_search:
-    image: ghcr.io/neonwatty/meme-search:streamlit
+    image: ghcr.io/neonwatty/meme-search:latest
     container_name: meme_search
     ports:
       - 8501:8501
     volumes:
-      - ./data:/home/data
+      - ./meme_search/data:/home/data
     ## uncomment to enable GPU support for the container
     # deploy:
     #   resources:

diff --git a/streamlit_app/.gitignore → meme_search/.gitignore b/streamlit_app/.gitignore → meme_search/.gitignore
@@ -1,5 +1,7 @@
+.DS_Store
+._.DS_Store
 **/.DS_Store
-
+**/._.DS_Store
 **/.env*
 scratch.ipynb
 bug_reports/

diff --git a/streamlit_app/.ruff.toml → meme_search/.ruff.toml b/streamlit_app/.ruff.toml → meme_search/.ruff.toml
diff --git a/streamlit_app/.streamlit/config.toml → meme_search/.streamlit/config.toml b/streamlit_app/.streamlit/config.toml → meme_search/.streamlit/config.toml
diff --git a/streamlit_app/Dockerfile → meme_search/Dockerfile b/streamlit_app/Dockerfile → meme_search/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \
 
 WORKDIR /home
 
-COPY requirements.txt .
+COPY ./meme_search/requirements.txt .
 
 RUN pip3 install --no-cache-dir -r requirements.txt
 
@@ -22,8 +22,8 @@ WORKDIR /home
 
 COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
 COPY --from=builder /usr/local/bin /usr/local/bin
-COPY meme_search /home/meme_search
-COPY .streamlit /home/.streamlit
+COPY ./meme_search/meme_search_app /home/meme_search
+COPY ./meme_search/.streamlit /home/.streamlit
 
 EXPOSE 8501
 

diff --git a/meme_search/data/dbs/memes.faiss b/meme_search/data/dbs/memes.faiss
diff --git a/..._app/tests/utilities/test_dbs/placeholder → meme_search/data/dbs/placeholder b/..._app/tests/utilities/test_dbs/placeholder → meme_search/data/dbs/placeholder
diff --git a/...sts/utilities/test_images/test_meme_1.jpg → meme_search/data/input/test_meme_1.jpg b/...sts/utilities/test_images/test_meme_1.jpg → meme_search/data/input/test_meme_1.jpg
diff --git a/...sts/utilities/test_images/test_meme_2.jpg → meme_search/data/input/test_meme_2.jpg b/...sts/utilities/test_images/test_meme_2.jpg → meme_search/data/input/test_meme_2.jpg
diff --git a/...sts/utilities/test_images/test_meme_3.jpg → meme_search/data/input/test_meme_3.jpg b/...sts/utilities/test_images/test_meme_3.jpg → meme_search/data/input/test_meme_3.jpg
diff --git a/meme_search/data/input/test_meme_4.jpg b/meme_search/data/input/test_meme_4.jpg
diff --git a/memes/example_memes_1/both pills.jpeg → meme_search/data/input/test_meme_5.jpg b/memes/example_memes_1/both pills.jpeg → meme_search/data/input/test_meme_5.jpg
diff --git a/memes/example_memes_2/screenshot.jpg → meme_search/data/input/test_meme_6.jpg b/memes/example_memes_2/screenshot.jpg → meme_search/data/input/test_meme_6.jpg
diff --git a/meme_search/data/input/test_meme_7.jpg b/meme_search/data/input/test_meme_7.jpg
diff --git a/meme_search/data/input/test_meme_8.jpg b/meme_search/data/input/test_meme_8.jpg
diff --git a/memes/example_memes_2/no.jpg → meme_search/data/input/test_meme_9.jpg b/memes/example_memes_2/no.jpg → meme_search/data/input/test_meme_9.jpg
diff --git a/streamlit_app/meme_search/__init__.py → meme_search/meme_search_app/__init__.py b/streamlit_app/meme_search/__init__.py → meme_search/meme_search_app/__init__.py
diff --git a/streamlit_app/meme_search/app.py → meme_search/meme_search_app/app.py b/streamlit_app/meme_search/app.py → meme_search/meme_search_app/app.py
diff --git a/streamlit_app/meme_search/style.css → meme_search/meme_search_app/style.css b/streamlit_app/meme_search/style.css → meme_search/meme_search_app/style.css
diff --git a/...lit_app/meme_search/utilities/__init__.py → ...rch/meme_search_app/utilities/__init__.py b/...lit_app/meme_search/utilities/__init__.py → ...rch/meme_search_app/utilities/__init__.py
diff --git a/streamlit_app/meme_search/utilities/add.py → meme_search/meme_search_app/utilities/add.py b/streamlit_app/meme_search/utilities/add.py → meme_search/meme_search_app/utilities/add.py
diff --git a/...amlit_app/meme_search/utilities/chunks.py → ...earch/meme_search_app/utilities/chunks.py b/...amlit_app/meme_search/utilities/chunks.py → ...earch/meme_search_app/utilities/chunks.py
diff --git a/...amlit_app/meme_search/utilities/create.py → ...earch/meme_search_app/utilities/create.py b/...amlit_app/meme_search/utilities/create.py → ...earch/meme_search_app/utilities/create.py
diff --git a/streamlit_app/meme_search/utilities/imgs.py → ..._search/meme_search_app/utilities/imgs.py b/streamlit_app/meme_search/utilities/imgs.py → ..._search/meme_search_app/utilities/imgs.py
diff --git a/streamlit_app/meme_search/utilities/query.py → ...search/meme_search_app/utilities/query.py b/streamlit_app/meme_search/utilities/query.py → ...search/meme_search_app/utilities/query.py
diff --git a/...amlit_app/meme_search/utilities/remove.py → ...earch/meme_search_app/utilities/remove.py b/...amlit_app/meme_search/utilities/remove.py → ...earch/meme_search_app/utilities/remove.py
diff --git a/...amlit_app/meme_search/utilities/status.py → ...earch/meme_search_app/utilities/status.py b/...amlit_app/meme_search/utilities/status.py → ...earch/meme_search_app/utilities/status.py
diff --git a/.../meme_search/utilities/text_extraction.py → ...e_search_app/utilities/text_extraction.py b/.../meme_search/utilities/text_extraction.py → ...e_search_app/utilities/text_extraction.py
diff --git a/streamlit_app/requirements.test → meme_search/requirements.test b/streamlit_app/requirements.test → meme_search/requirements.test
diff --git a/streamlit_app/requirements.txt → meme_search/requirements.txt b/streamlit_app/requirements.txt → meme_search/requirements.txt
diff --git a/memes/example_memes_1/all the fucks.jpg → ...o/memes/example_memes_1/all the fucks.jpg b/memes/example_memes_1/all the fucks.jpg → ...o/memes/example_memes_1/all the fucks.jpg
diff --git a/meme_search_pro/memes/example_memes_1/both pills.jpeg b/meme_search_pro/memes/example_memes_1/both pills.jpeg
diff --git a/meme_search_pro/memes/example_memes_2/no.jpg b/meme_search_pro/memes/example_memes_2/no.jpg
diff --git a/meme_search_pro/memes/example_memes_2/screenshot.jpg b/meme_search_pro/memes/example_memes_2/screenshot.jpg
diff --git a/memes/example_memes_3/happy.jpeg → ...arch_pro/memes/example_memes_3/happy.jpeg b/memes/example_memes_3/happy.jpeg → ...arch_pro/memes/example_memes_3/happy.jpeg
diff --git a/memes/example_memes_3/techlife.jpg → ...ch_pro/memes/example_memes_3/techlife.jpg b/memes/example_memes_3/techlife.jpg → ...ch_pro/memes/example_memes_3/techlife.jpg
diff --git a/streamlit_app/tests/__init__.py b/streamlit_app/tests/__init__.py
diff --git a/streamlit_app/tests/test_app.py b/streamlit_app/tests/test_app.py
diff --git a/streamlit_app/tests/test_compose.py b/streamlit_app/tests/test_compose.py
diff --git a/streamlit_app/tests/utilities/__init__.py b/streamlit_app/tests/utilities/__init__.py
diff --git a/streamlit_app/tests/utilities/test_add_remove.py b/streamlit_app/tests/utilities/test_add_remove.py
diff --git a/streamlit_app/tests/utilities/test_dbs/memes.faiss b/streamlit_app/tests/utilities/test_dbs/memes.faiss
diff --git a/streamlit_app/tests/utilities/test_images_alternate/placeholder b/streamlit_app/tests/utilities/test_images_alternate/placeholder
diff --git a/streamlit_app/tests/utilities/test_imgs.py b/streamlit_app/tests/utilities/test_imgs.py
diff --git a/streamlit_app/tests/utilities/test_query.py b/streamlit_app/tests/utilities/test_query.py