added OLLAMA_MODEL_NAME and OLLAMA_URL as environment variables; called them in llm_config.py

Author: exowanderer

Dockerfile

@@ -36,12 +36,15 @@ RUN npm install -g yarn
 COPY --from=ollama /usr/bin/ollama /usr/local/ollama/bin/ollama
 ENV PATH="/usr/local/ollama/bin:${PATH}"
 
-
 # Pull a language model (see LICENSE_STABLELM2.txt)
-# ARG MODEL=openchat
-ARG MODEL=stablelm2:1.6b-zephyr
-ENV MODEL=${MODEL}
-RUN ollama serve & while ! curl http://localhost:11434; do sleep 1; done; ollama pull $MODEL
+# ARG OLLAMA_MODEL_NAME=openchat
+ARG OLLAMA_MODEL_NAME=stablelm2:1.6b-zephyr
+ARG OLLAMA_URL=http://localhost:11434
+
+ENV OLLAMA_MODEL_NAME=${OLLAMA_MODEL_NAME}
+ENV OLLAMA_URL=${OLLAMA_URL}
+
+RUN ollama serve & while ! curl ${OLLAMA_URL}; do sleep 1; done; ollama pull $OLLAMA_MODEL_NAME
 
 
 # Setup the custom API and frontend

gswikichat/api.py

@@ -36,21 +36,21 @@
 # End of logging logger configuration
 
 
-static_dir = 'frontend/dist'
-homepage = f'/{static_dir}'
+STATIC_DIR = 'frontend/dist'
+LANDING_PAGE = f'/{STATIC_DIR}'
 
 app = FastAPI()
 app.mount(
-    "/frontend/dist",
-    StaticFiles(directory="frontend/dist", html=True),
+    LANDING_PAGE,
+    StaticFiles(directory=STATIC_DIR, html=True),
     name="frontend"
 )
 
 
 @app.get("/")
 async def root():
     return RedirectResponse(
-        url="/frontend/dist",
+        url=LANDING_PAGE,
         status_code=308
     )
     # return {}

gswikichat/llm_config.py

@@ -1,11 +1,21 @@
 import os
 from haystack_integrations.components.generators.ollama import OllamaGenerator
 
-# import logging
-# logger = logging.getLogger()
+import logging
+logger = logging.getLogger()
 
-print(f"Setting up ollama with {os.getenv('MODEL')}")
+OLLAMA_MODEL_NAME = os.environ.get("OLLAMA_MODEL_NAME")
+OLLAMA_URL = os.environ.get("OLLAMA_URL")
+OLLAMA_GENERATE_URL = f"{OLLAMA_URL}/api/generate"
+
+logger.info(f'Using {OLLAMA_MODEL_NAME=}')
+logger.info(f'Endpoint: {OLLAMA_URL=}')
+logger.info(f'Generate: {OLLAMA_GENERATE_URL=}')
+
+logger.debug(f'I AM HERE')
+
+print(f"Setting up ollama with {OLLAMA_MODEL_NAME}")
 llm = OllamaGenerator(
-    model=os.getenv("MODEL"),
-    url="http://localhost:11434/api/generate"
+    model=OLLAMA_MODEL_NAME,
+    url=OLLAMA_GENERATE_URL
 )

gswikichat/rag.py

@@ -1,5 +1,4 @@
-
-from haystack import Pipeline
+# from haystack import Pipeline
 from haystack.components.builders.answer_builder import AnswerBuilder
 
 answer_builder = AnswerBuilder()