now it should work. Refactored UI into smaller functions, added configurability for repository implementation and model

app.py

@@ -1,87 +1,41 @@
-import os
-import uuid
-from pathlib import Path
-
-from llm_manager.llm_parser import LlmParser
 from prompts.prompts_manager import PromptsManager
 
 from repository.repository import get_repository
 from repository.repository_abc import ModelRoles, Model
-from form.form import build_form_data_from_answers, write_pdf_form
 
 import streamlit as st
 
-user_msg = "Please describe what you need to do. To get the best results try to answer all the following questions:"
-
+from ui_manager import build_ui_for_initial_state, build_ui_for_parsing_answers, build_ui_for_ask_again, \
+    build_ui_for_check_category, build_ui_for_form_created
+from utils.env_utils import build_repo_from_environment
 
+user_msg = "Please describe what you need to do. To get the best results try to answer all the following questions:"
 
-def check_for_missing_answers(parsed_questions: dict[int, str]):
-    return [k for k in parsed_questions if parsed_questions[k] is None]
 
 def use_streamlit():
     pm = PromptsManager()
     help_ = f"{user_msg}\n\n" + '\n'.join(pm.questions)
-    repository = get_repository("ondemand", Model("ondemand-gpt-3.5-turbo", ModelRoles("system", "user", "assistant")))
+    repository = (build_repo_from_environment(pm.system_prompt) or
+                  get_repository("testing",
+                                 Model("fakeModel", ModelRoles("a", "b", "c"))))
+    st.markdown("## Dubai Asset Management red tape cutter")
     if not st.session_state.get("step"):
-        with st.form("Please describe your request"):
-            user_input = st.text_area("Your input", height=700, label_visibility="hidden", placeholder=help_, help=help_)
-            signature = st.file_uploader("Your signature", key="file_upload")
-            st.session_state["signature"] = signature
-            st.session_state["session_id"] = str(uuid.uuid4())
-            button = st.form_submit_button()
+        build_ui_for_initial_state(help_)
+        llama3 = "meta-llama/Meta-Llama-3-8B-Instruct"
+        # repository = get_repository("intel_npu", Model(llama3,
+        #                                                ModelRoles("system", "user", "assistant")),
+        #                             pm.system_prompt, Path("llm_log.txt"))
 
-        if button:
-            llama3 = "meta-llama/Meta-Llama-3-8B-Instruct"
-            # repository = get_repository("intel_npu", Model(llama3,
-            #                                                ModelRoles("system", "user", "assistant")),
-            #                             pm.system_prompt, Path("llm_log.txt"))
-            st.session_state["step"] = "parsing_answers"
     if st.session_state.get("step") == "parsing_answers":
-        with st.status("initialising LLM"):
-            repository.init()
-        with st.status("waiting for LLM"):
-            answer = repository.send_prompt(pm.verify_user_input_prompt(user_input))
-            st.write(f"answers from LLM: {answer['content']}")
-        with st.status("Checking for missing answers"):
-            st.session_state["answers"] = LlmParser.parse_verification_prompt_answers(answer['content'])
-        st.session_state["missing_answers"] = check_for_missing_answers(st.session_state["answers"])
-        if not st.session_state.get("missing_answers"):
-            st.session_state["step"] = "check_category"
-        else:
-            st.session_state["step"] = "ask_again"
+        build_ui_for_parsing_answers(repository, pm)
 
     if st.session_state.get("step") == "ask_again":
-        with st.form("form1"):
-            for ma in st.session_state["missing_answers"]:
-                st.text_input(pm.questions[ma].lower(), key=ma)
-            submitted = st.form_submit_button("Submit answers")
-            if submitted:
-                st.session_state["step"] = "check_category"
-                for ma in st.session_state["missing_answers"]:
-                    st.session_state["answers"][ma] = st.session_state[ma]
-
+        build_ui_for_ask_again(pm)
     if st.session_state.get("step") == "check_category":
-        with st.status("finding the work categories applicable to your work"):
-            answer = repository.send_prompt(pm.get_work_category(st.session_state["answers"][1]))
-            categories = LlmParser.parse_get_categories_answer(answer['content'])
-
-        with st.status("categories found, creating PDF form"):
+        build_ui_for_check_category(repository, pm)
 
-            form_filename = f"{st.session_state['session_id']}_form.pdf"
-            st.session_state["form_filename"] = form_filename
-            form_data, filename = build_form_data_from_answers(st.session_state["answers"], categories,
-                                                     st.session_state.get("signature"))
-            st.session_state["pdf_form"] = write_pdf_form(form_data)
-            st.session_state["pdf_form_filename"] = filename
-            st.session_state["step"] = "form_created"
     if st.session_state.get("step") == "form_created":
-        st.download_button("download form", st.session_state["pdf_form"],
-                           file_name=st.session_state["pdf_form_filename"], mime="application/pdf")
-        start_over_button = st.button("Start over")
-        if start_over_button:
-            del st.session_state["step"]
-            del st.session_state["pdf_form"]
-            del st.session_state["pdf_form_filename"]
+        build_ui_for_form_created()
 
 
 use_streamlit()

llm_manager/llm_parser.py

@@ -1,10 +1,7 @@
-import re
-
 from form.form import work_categories
 
 
 class LlmParser:
-    _verification_prompt_answers_regex = re.compile(r"\|\s*([^|]*)\s?", re.MULTILINE)
 
     @classmethod
     def parse_verification_prompt_answers(cls, llm_answer) -> dict[int, str | None]:

repository/ondemand.py

@@ -8,7 +8,8 @@ from repository.repository_abc import Repository, Model, ModelRoles
 
 class OndemandRepository(Repository):
     session_url = "https://api.on-demand.io/chat/v1/sessions"
-    def __init__(self, model_info: Model, system_message: str = None, log_to_file:Path=None):
+
+    def __init__(self, model_info: Model, system_message: str = None, log_to_file: Path = None):
         self.model_info = model_info
         self.system_message = system_message
         self.log_to_file = log_to_file
@@ -17,7 +18,9 @@ class OndemandRepository(Repository):
     def init(self):
         if not self.session_id:
             headers = {"apiKey": os.getenv("API_KEY")}
-            session_body = {"pluginIds": [], "externalUserId": "virtualDAM", "modelConfigs":{"temperature":0.2}}
+            session_body = {"pluginIds": [], "externalUserId": "virtualDAM", "modelConfigs":
+                {"temperature": 0.2, "fulfillmentPrompt": self.system_message}
+                            }
             response = requests.post(self.session_url, headers=headers, json=session_body)
             response_data = response.json()
             self.session_id = response_data["data"]["id"]
@@ -36,4 +39,4 @@ class OndemandRepository(Repository):
         return {"content": response.json()["data"]["answer"]}
 
     def get_message_history(self) -> list[dict[str, str]]:
-        return []
+        return []

repository/repository.py

@@ -22,10 +22,6 @@ def get_repository(implementation: str, model: Model, system_msg: str = None, lo
         return OndemandRepository(model, system_msg, log_to_file)
     if "testing" == implementation:
         return TestingRepository(prompts_answers=[
-            {
-                "role": "assistant",
-                "content": "OK"
-            },
             {
                 "role": "assistant",
                 "content": "What is my full name?\n\nnull\n\nWhat is the nature of the work I need to do?\n\nPest control\n\nIn which community is the work taking place?\n\nJBR\n\nIn which building?\n\nnull\n\nIn which unit/apartment number?\n\nnull\n\nAm I the owner or the tenant?\n\nTenant\n\nIn which date is the work taking place?\n\n12/09/2024\n\nIn which date will the work finish?\n\n12/09/2024\n\nWhat is my contact number?\n\nnull\n\nWhat is the name of the contracting company?\n\nnull\n\nWhat is the contact number of the contracting company?\n\nnull\n\nWhat is the email of the contracting company?\n\nnull\n\nWhat is my email?\n\nnull"

ui_manager.py

@@ -0,0 +1,65 @@
+import streamlit as st
+
+from form.form import build_form_data_from_answers, write_pdf_form
+from llm_manager.llm_parser import LlmParser
+from utils.parsing_utils import check_for_missing_answers
+
+
+def build_ui_for_initial_state(help_):
+    with st.form("Please describe your request"):
+        user_input = st.text_area("Your input", height=700, label_visibility="hidden", placeholder=help_, help=help_)
+        signature = st.file_uploader("Your signature", key="file_upload")
+        st.session_state["signature"] = signature
+        submit_button = st.form_submit_button()
+        if submit_button:
+            st.session_state["user_input"] = user_input
+            st.session_state["step"] = "parsing_answers"
+            st.rerun()
+def build_ui_for_parsing_answers(repository, pm):
+    with st.status("initialising LLM"):
+        repository.init()
+    with st.status("waiting for LLM"):
+        answer = repository.send_prompt(pm.verify_user_input_prompt(st.session_state["user_input"]))
+        st.write(f"answers from LLM: {answer['content']}")
+    with st.status("Checking for missing answers"):
+        st.session_state["answers"] = LlmParser.parse_verification_prompt_answers(answer['content'])
+    st.session_state["missing_answers"] = check_for_missing_answers(st.session_state["answers"])
+    if not st.session_state.get("missing_answers"):
+        st.session_state["step"] = "check_category"
+    else:
+        st.session_state["step"] = "ask_again"
+    st.rerun()
+
+def build_ui_for_ask_again(pm):
+    with st.form("form1"):
+        for ma in st.session_state["missing_answers"]:
+            st.text_input(pm.questions[ma].lower(), key=ma)
+        submitted = st.form_submit_button("Submit answers")
+        if submitted:
+            for ma in st.session_state["missing_answers"]:
+                st.session_state["answers"][ma] = st.session_state[ma]
+            st.session_state["step"] = "check_category"
+            st.rerun()
+def build_ui_for_check_category(repository, pm):
+    with st.status("finding the work categories applicable to your work"):
+        answer = repository.send_prompt(pm.get_work_category(st.session_state["answers"][1]))
+        categories = LlmParser.parse_get_categories_answer(answer['content'])
+
+    with st.status("categories found, creating PDF form"):
+        form_data, filename = build_form_data_from_answers(st.session_state["answers"], categories,
+                                                           st.session_state.get("signature"))
+        pdf_form = write_pdf_form(form_data)
+        pdf_form_filename = filename
+        st.session_state["pdf_form"] = pdf_form
+        st.session_state["pdf_form_filename"] = pdf_form_filename
+        st.session_state["step"] = "form_created"
+        st.rerun()
+def build_ui_for_form_created():
+    st.download_button("download form", st.session_state["pdf_form"],
+                       file_name=st.session_state["pdf_form_filename"], mime="application/pdf")
+    start_over_button = st.button("Start over")
+    if start_over_button:
+        del st.session_state["step"]
+        del st.session_state["pdf_form"]
+        del st.session_state["pdf_form_filename"]
+        st.rerun()

utils/env_utils.py

@@ -1,3 +1,22 @@
 import os
+
+import repository.repository
+from repository.repository_abc import Model, ModelRoles
+
+
 def in_hf() -> bool:
     return os.getenv("env") == "hf"
+
+
+def build_repo_from_environment(system_prompt: str):
+    implementation = os.getenv("implementation")
+    model_name = os.getenv("model_name")
+
+    if implementation:
+        return repository.repository.get_repository(implementation, Model(model_name, ModelRoles("system",
+                                                                                                 "user",
+                                                                                                 "assistant")),
+                                                    system_prompt)
+    else:
+        return None
+