renewed app.mount; bug fixed PEP8 changes in api.py; reformatted rag.py inputs; tests timed out

Author: exowanderer

frontend/src/views/ChatView.vue

@@ -97,7 +97,7 @@ const inputFocused = ref(false)
 function search() {
   response.value = undefined;
   displayResponse.value = true
-  fetch(`/api?q=${inputText.value}`)
+  fetch(`/api?query=${inputText.value}`)
     .then((response) => response.json())
     .then((data) => {
       response.value = data

gswikichat/api.py

@@ -2,10 +2,28 @@
 from fastapi.staticfiles import StaticFiles
 from fastapi import FastAPI
 
-from .rag import embedder, retriever, prompt_builder, llm, answer_builder
+from .rag import answer_builder
+from .llm_config import llm
+from .prompt import prompt_builders
+from .vector_store_interface import embedder, retriever, input_documents
+
 from haystack import Document
 
-homepage = "/frontend/dist"
+import logging
+import sys
+
+logger = logging.getLogger()
+logger.setLevel(logging.DEBUG)
+
+handler = logging.StreamHandler(sys.stdout)
+handler.setLevel(logging.DEBUG)
+formatter = logging.Formatter(
+    '%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+handler.setFormatter(formatter)
+logger.addHandler(handler)
+
+static_dir = 'frontend/dist'
+homepage = f'/{static_dir}'
 
 app = FastAPI()
 app.mount(
@@ -38,7 +56,7 @@ async def api(query, top_k=3, lang='en'):
     query_embedded = embedder.run([query])
     query_embedding = query_embedded['documents'][0].embedding
 
-    retreiver_results = retriever.run(
+    retriever_results = retriever.run(
         query_embedding=list(query_embedding),
         filters=None,
         top_k=top_k,
@@ -47,7 +65,7 @@ async def api(query, top_k=3, lang='en'):
     )
 
     logger.debug('retriever results:')
-    for retriever_result in retriever_results:
+    for retriever_result_ in retriever_results:
         logger.debug(retriever_result_)
 
     prompt_builder = prompt_builders[lang]

gswikichat/prompt.py

@@ -49,7 +49,7 @@
 # {% endfor %}
 # """
 
-prompt_builder = {
- 'en': PromptBuilder(template=prompt_template_en),
- 'de': PromptBuilder(template=prompt_template_de),
+prompt_builders = {
+    'en': PromptBuilder(template=prompt_template_en),
+    'de': PromptBuilder(template=prompt_template_de),
 }

gswikichat/rag.py

@@ -2,10 +2,6 @@
 from haystack import Pipeline
 from haystack.components.builders.answer_builder import AnswerBuilder
 
-from .llm_config import llm
-from .prompt import prompt_builder
-from .vector_store_interface import embedder, retriever, input_documents
-
 answer_builder = AnswerBuilder()
 
 # rag_pipeline = Pipeline()