Merge pull request containers#111 from MichaelClifford/reorganize

Reorganize
mhdawson · Mar 28, 2024 · f45b92d · f45b92d
2 parents 944ce4b + 3739e41
commit f45b92d
Show file tree

Hide file tree

Showing 56 changed files with 17 additions and 17 deletions.
diff --git a/audio-to-text/README.md → recipes/audio/audio-to-text/README.md b/audio-to-text/README.md → recipes/audio/audio-to-text/README.md
diff --git a/audio-to-text/ai-lab.yaml → recipes/audio/audio-to-text/ai-lab.yaml b/audio-to-text/ai-lab.yaml → recipes/audio/audio-to-text/ai-lab.yaml
@@ -5,7 +5,7 @@ application:
   description: This is a Streamlit transcription application. 
   containers:
     - name: whispercpp-server
-      contextdir: ../model_servers/whispercpp
+      contextdir: ../../../model_servers/whispercpp
       containerfile: Containerfile
       model-service: true
       backend: 

diff --git a/audio-to-text/builds/Containerfile → .../audio/audio-to-text/builds/Containerfile b/audio-to-text/builds/Containerfile → .../audio/audio-to-text/builds/Containerfile
diff --git a/audio-to-text/builds/requirements.txt → ...dio/audio-to-text/builds/requirements.txt b/audio-to-text/builds/requirements.txt → ...dio/audio-to-text/builds/requirements.txt
diff --git a/audio-to-text/quadlet/README.md → ...pes/audio/audio-to-text/quadlet/README.md b/audio-to-text/quadlet/README.md → ...pes/audio/audio-to-text/quadlet/README.md
diff --git a/audio-to-text/quadlet/audio-text.image → ...io/audio-to-text/quadlet/audio-text.image b/audio-to-text/quadlet/audio-text.image → ...io/audio-to-text/quadlet/audio-text.image
diff --git a/...o-to-text/quadlet/audio-text.kube.example → ...o-to-text/quadlet/audio-text.kube.example b/...o-to-text/quadlet/audio-text.kube.example → ...o-to-text/quadlet/audio-text.kube.example
diff --git a/audio-to-text/quadlet/audio-text.yaml → ...dio/audio-to-text/quadlet/audio-text.yaml b/audio-to-text/quadlet/audio-text.yaml → ...dio/audio-to-text/quadlet/audio-text.yaml
diff --git a/audio-to-text/whisper_client.py → ...pes/audio/audio-to-text/whisper_client.py b/audio-to-text/whisper_client.py → ...pes/audio/audio-to-text/whisper_client.py
diff --git a/object_detection/README.md → ...omputer_vision/object_detection/README.md b/object_detection/README.md → ...omputer_vision/object_detection/README.md
diff --git a/object_detection/ai-lab.yaml → ...puter_vision/object_detection/ai-lab.yaml b/object_detection/ai-lab.yaml → ...puter_vision/object_detection/ai-lab.yaml
diff --git a/object_detection/client/Containerfile → ...ion/object_detection/client/Containerfile b/object_detection/client/Containerfile → ...ion/object_detection/client/Containerfile
diff --git a/...tection/client/object_detection_client.py → ...tection/client/object_detection_client.py b/...tection/client/object_detection_client.py → ...tection/client/object_detection_client.py
diff --git a/object_detection/client/requirements.txt → .../object_detection/client/requirements.txt b/object_detection/client/requirements.txt → .../object_detection/client/requirements.txt
diff --git a/object_detection/model_server/Containerfile → ...ject_detection/model_server/Containerfile b/object_detection/model_server/Containerfile → ...ject_detection/model_server/Containerfile
diff --git a/...n/model_server/object_detection_server.py → ...n/model_server/object_detection_server.py b/...n/model_server/object_detection_server.py → ...n/model_server/object_detection_server.py
diff --git a/...t_detection/model_server/requirements.txt → ...t_detection/model_server/requirements.txt b/...t_detection/model_server/requirements.txt → ...t_detection/model_server/requirements.txt
diff --git a/image_understanding/README.md → .../multimodal/image_understanding/README.md b/image_understanding/README.md → .../multimodal/image_understanding/README.md
diff --git a/image_understanding/ai-lab.yaml → ...ultimodal/image_understanding/ai-lab.yaml b/image_understanding/ai-lab.yaml → ...ultimodal/image_understanding/ai-lab.yaml
@@ -4,7 +4,7 @@ application:
   description: This demo uses a Multimodal model to analyze the content of images.  
   containers:
     - name: llamacpp-server
-      contextdir: ../model_servers/llamacpp_python
+      contextdir: ../../../model_servers/llamacpp_python
       containerfile: ./base/Containerfile
       model-service: true
       backend: 

diff --git a/image_understanding/builds/Containerfile → .../image_understanding/builds/Containerfile b/image_understanding/builds/Containerfile → .../image_understanding/builds/Containerfile
diff --git a/image_understanding/builds/requirements.txt → ...age_understanding/builds/requirements.txt b/image_understanding/builds/requirements.txt → ...age_understanding/builds/requirements.txt
diff --git a/image_understanding/image_understanding.py → ...mage_understanding/image_understanding.py b/image_understanding/image_understanding.py → ...mage_understanding/image_understanding.py
diff --git a/chatbot/README.md → ...ral_language_processing/chatbot/README.md b/chatbot/README.md → ...ral_language_processing/chatbot/README.md
diff --git a/chatbot/ai-lab.yaml → ...l_language_processing/chatbot/ai-lab.yaml b/chatbot/ai-lab.yaml → ...l_language_processing/chatbot/ai-lab.yaml
@@ -5,7 +5,7 @@ application:
   description: This is a Streamlit chat demo application. 
   containers:
     - name: llamacpp-server
-      contextdir: ../model_servers/llamacpp_python
+      contextdir: ../../../model_servers/llamacpp_python
       containerfile: ./base/Containerfile
       model-service: true
       backend: 

diff --git a/chatbot/builds/Containerfile → ...e_processing/chatbot/builds/Containerfile b/chatbot/builds/Containerfile → ...e_processing/chatbot/builds/Containerfile
diff --git a/chatbot/builds/requirements.txt → ...rocessing/chatbot/builds/requirements.txt b/chatbot/builds/requirements.txt → ...rocessing/chatbot/builds/requirements.txt
diff --git a/chatbot/chatbot_ui.py → ...language_processing/chatbot/chatbot_ui.py b/chatbot/chatbot_ui.py → ...language_processing/chatbot/chatbot_ui.py
diff --git a/chatbot/quadlet/README.md → ...uage_processing/chatbot/quadlet/README.md b/chatbot/quadlet/README.md → ...uage_processing/chatbot/quadlet/README.md
diff --git a/chatbot/quadlet/chatbot.image → ..._processing/chatbot/quadlet/chatbot.image b/chatbot/quadlet/chatbot.image → ..._processing/chatbot/quadlet/chatbot.image
diff --git a/chatbot/quadlet/chatbot.kube.example → ...sing/chatbot/quadlet/chatbot.kube.example b/chatbot/quadlet/chatbot.kube.example → ...sing/chatbot/quadlet/chatbot.kube.example
diff --git a/chatbot/quadlet/chatbot.yaml → ...e_processing/chatbot/quadlet/chatbot.yaml b/chatbot/quadlet/chatbot.yaml → ...e_processing/chatbot/quadlet/chatbot.yaml
diff --git a/code-generation/README.md → ...uage_processing/code-generation/README.md b/code-generation/README.md → ...uage_processing/code-generation/README.md
diff --git a/code-generation/ai-lab.yaml → ...ge_processing/code-generation/ai-lab.yaml b/code-generation/ai-lab.yaml → ...ge_processing/code-generation/ai-lab.yaml
@@ -5,7 +5,7 @@ application:
   description: This is a code-generation demo application. 
   containers:
     - name: llamacpp-server
-      contextdir: ../model_servers/llamacpp_python
+      contextdir: ../../../model_servers/llamacpp_python
       containerfile: ./base/Containerfile
       model-service: true
       backend: 

diff --git a/code-generation/builds/Containerfile → ...sing/code-generation/builds/Containerfile b/code-generation/builds/Containerfile → ...sing/code-generation/builds/Containerfile
diff --git a/code-generation/builds/requirements.txt → ...g/code-generation/builds/requirements.txt b/code-generation/builds/requirements.txt → ...g/code-generation/builds/requirements.txt
diff --git a/code-generation/codegen-app.py → ...processing/code-generation/codegen-app.py b/code-generation/codegen-app.py → ...processing/code-generation/codegen-app.py
diff --git a/code-generation/quadlet/README.md → ...cessing/code-generation/quadlet/README.md b/code-generation/quadlet/README.md → ...cessing/code-generation/quadlet/README.md
diff --git a/code-generation/quadlet/codegen.image → ...ing/code-generation/quadlet/codegen.image b/code-generation/quadlet/codegen.image → ...ing/code-generation/quadlet/codegen.image
diff --git a/code-generation/quadlet/codegen.kube.example → ...e-generation/quadlet/codegen.kube.example b/code-generation/quadlet/codegen.kube.example → ...e-generation/quadlet/codegen.kube.example
diff --git a/code-generation/quadlet/codegen.yaml → ...sing/code-generation/quadlet/codegen.yaml b/code-generation/quadlet/codegen.yaml → ...sing/code-generation/quadlet/codegen.yaml
diff --git a/rag/README.md → ...natural_language_processing/rag/README.md b/rag/README.md → ...natural_language_processing/rag/README.md
diff --git a/rag/ai-lab.yaml → ...tural_language_processing/rag/ai-lab.yaml b/rag/ai-lab.yaml → ...tural_language_processing/rag/ai-lab.yaml
@@ -5,7 +5,7 @@ application:
   description: This is a RAG demo application. 
   containers:
     - name: llamacpp-server
-      contextdir: ../model_servers/llamacpp_python
+      contextdir: ../../../model_servers/llamacpp_python
       containerfile: ./base/Containerfile
       model-service: true
       backend: 
@@ -17,7 +17,7 @@ application:
         - 8001
       image: quay.io/redhat-et/locallm-model-service:latest
     - name: chromadb-server
-      contextdir: ../vector_dbs/chromadb
+      contextdir: ../../../vector_dbs/chromadb
       containerfile: Containerfile
       vectordb: true
       arch:

diff --git a/rag/builds/Containerfile → ...guage_processing/rag/builds/Containerfile b/rag/builds/Containerfile → ...guage_processing/rag/builds/Containerfile
diff --git a/rag/builds/requirements.txt → ...ge_processing/rag/builds/requirements.txt b/rag/builds/requirements.txt → ...ge_processing/rag/builds/requirements.txt
diff --git a/rag/populate_vectordb.py → ...guage_processing/rag/populate_vectordb.py b/rag/populate_vectordb.py → ...guage_processing/rag/populate_vectordb.py
diff --git a/rag/rag_app.py → ...atural_language_processing/rag/rag_app.py b/rag/rag_app.py → ...atural_language_processing/rag/rag_app.py
diff --git a/summarizer/README.md → ..._language_processing/summarizer/README.md b/summarizer/README.md → ..._language_processing/summarizer/README.md
diff --git a/summarizer/ai-lab.yaml → ...anguage_processing/summarizer/ai-lab.yaml b/summarizer/ai-lab.yaml → ...anguage_processing/summarizer/ai-lab.yaml
@@ -5,7 +5,7 @@ application:
   description: This is a Streamlit demo application for summarizing text. 
   containers:
     - name: llamacpp-server
-      contextdir: ../model_servers/llamacpp_python
+      contextdir: ../../../model_servers/llamacpp_python
       containerfile: ./base/Containerfile
       model-service: true
       backend: 

diff --git a/summarizer/builds/Containerfile → ...rocessing/summarizer/builds/Containerfile b/summarizer/builds/Containerfile → ...rocessing/summarizer/builds/Containerfile
diff --git a/summarizer/builds/requirements.txt → ...essing/summarizer/builds/requirements.txt b/summarizer/builds/requirements.txt → ...essing/summarizer/builds/requirements.txt
diff --git a/recipes/natural_language_processing/summarizer/quadlet/README.md b/recipes/natural_language_processing/summarizer/quadlet/README.md
@@ -0,0 +1,10 @@
+### Run summarizer-langchain as a systemd service
+
+```bash
+cp summarizer.yaml /etc/containers/systemd/summarizer.yaml
+cp summarizer.kube.example /etc/containers/summarizer.kube
+cp summarizer.image /etc/containers/summarizer.image
+/usr/libexec/podman/quadlet --dryrun (optional)
+systemctl daemon-reload
+systemctl start summarizer
+```
diff --git a/summarizer/quadlet/summarizer.image → ...ssing/summarizer/quadlet/summarizer.image b/summarizer/quadlet/summarizer.image → ...ssing/summarizer/quadlet/summarizer.image
diff --git a/summarizer/quadlet/summarizer.kube.example → ...ummarizer/quadlet/summarizer.kube.example b/summarizer/quadlet/summarizer.kube.example → ...ummarizer/quadlet/summarizer.kube.example
diff --git a/summarizer/quadlet/summarizer.yaml → ...essing/summarizer/quadlet/summarizer.yaml b/summarizer/quadlet/summarizer.yaml → ...essing/summarizer/quadlet/summarizer.yaml
diff --git a/summarizer/summarizer.py → ...guage_processing/summarizer/summarizer.py b/summarizer/summarizer.py → ...guage_processing/summarizer/summarizer.py
diff --git a/summarizer/quadlet/README.md b/summarizer/quadlet/README.md