now saving personal, location and contractor details in the browser local storage

app.py

@@ -4,19 +4,19 @@ import streamlit as st
 from streamlit import session_state as ss
 from streamlit_local_storage import LocalStorage
 
-from form.form import build_form_data_from_answers, write_pdf_form
+from form.form import build_form_data_from_answers, write_pdf_form, work_categories
 from llm_manager.llm_parser import LlmParser
 from local_storage.entities import PersonalDetails, LocationDetails, ContractorDetails
 from prompts.prompts_manager import PromptsManager, Questions as Q
 from repository.repository import build_repo_from_environment, get_repository
-from repository.repository_abc import Model, ModelRoles
+from repository import ModelRoles, Model
 from utils.parsing_utils import check_for_missing_answers
 
 user_msg = "Please describe what you need to do. To get the best results try to answer all the following questions:"
 ls: LocalStorage = LocalStorage()
 class UIManager:
     def __init__(self):
-        self.pm: PromptsManager = PromptsManager()
+        self.pm: PromptsManager = PromptsManager(work_categories=work_categories)
         self.repository = (build_repo_from_environment(self.pm.system_prompt) or
                            get_repository("testing",
                                           Model("fakeModel", ModelRoles("a", "b", "c"))))
@@ -78,7 +78,7 @@ class UIManager:
     def build_ui_for_check_category(self):
         self._build_base_ui()
         with st.status("finding the work categories applicable to your work"):
-            answer = self.repository.send_prompt(self.pm.get_work_category(ss["answers"][1]))
+            answer = self.repository.send_prompt(self.pm.get_work_category(ss["answers"][Q.WORK_TO_DO]))
             categories = LlmParser.parse_get_categories_answer(answer['content'])
 
         with st.status("categories found, creating PDF form"):
@@ -105,27 +105,28 @@ class UIManager:
             st.rerun()
 
     def build_ui_for_parsing_error(self):
-        def build_form_fragment(form_, col, title, *questions):
+        def build_form_fragment(form_, col, title, add_save, *questions):
             form_.text(title)
             for user_data in questions:
                 with col:
                     form_.text_input(self.pm.questions_to_field_labels()[user_data], value=ss.get("answers", {})
                                      .get(user_data), key=f"fq_{user_data.name}")
-            with col:
-                form_.text_input("Save as", key=title.replace(" ", "_"))
+            if add_save:
+                with col:
+                    form_.text_input("Save as", key=title.replace(" ", "_"))
 
         self._build_base_ui()
         f = st.form("Please check the following information and correct fix any inaccuracies")
         col1, col2 = f.columns(2)
-        build_form_fragment(f, col1, "your details", Q.FULL_NAME, Q.CONTACT_NUMBER, Q.YOUR_EMAIL)
-        build_form_fragment(f, col2, "work details", Q.WORK_TO_DO, Q.START_DATE, Q.END_DATE)
-        build_form_fragment(f, col1, "location details", Q.COMMUNITY, Q.BUILDING, Q.UNIT_APT_NUMBER,
+        build_form_fragment(f, col1, "your details", True, Q.FULL_NAME, Q.CONTACT_NUMBER, Q.YOUR_EMAIL)
+        build_form_fragment(f, col2, "work details", False, Q.WORK_TO_DO, Q.START_DATE, Q.END_DATE)
+        build_form_fragment(f, col1, "location details",  True, Q.COMMUNITY, Q.BUILDING, Q.UNIT_APT_NUMBER,
                             Q.OWNER_OR_TENANT)
-        build_form_fragment(f, col2, "contractor details", Q.COMPANY_NAME, Q.COMPANY_NUMBER, Q.COMPANY_EMAIL)
+        build_form_fragment(f, col2, "contractor details", True, Q.COMPANY_NAME, Q.COMPANY_NUMBER, Q.COMPANY_EMAIL)
         submit_data = f.form_submit_button()
         if submit_data:
             for i in range(len(Q)):
-                ss["answers"][Q(i).name] = ss[f"fq_{Q(i).name}"]
+                ss["answers"][Q(i)] = ss[f"fq_{Q(i).name}"]
 
             for details_key, func in [("your_details", self._get_personal_details),
                                       ("location_details", self._get_location_details),
@@ -133,7 +134,9 @@ class UIManager:
                 details = func(details_key)
                 if details:
                     key = ss[details_key]  # get the name under which this data should be saved
-                    ls.setItem(key, json.dumps(details.__dict__))
+                    ls.setItem(key, json.dumps(details.__dict__), key)
+            ss["step"] = "check_category"
+            st.rerun()
 
     @staticmethod
     def _get_personal_details(personal_details_key) -> PersonalDetails | None:
@@ -151,8 +154,8 @@ class UIManager:
     @staticmethod
     def _get_contractor_details(contractor_details_key) -> ContractorDetails | None:
         if ss.get(contractor_details_key):
-            return ContractorDetails(ss[f"fq_{Q.COMPANY_NAME}"], ss[f"fq_{Q.COMPANY_NUMBER}"],
-                                     ss[f"fq_{Q.COMPANY_EMAIL}"])
+            return ContractorDetails(ss[f"fq_{Q.COMPANY_NAME.name}"], ss[f"fq_{Q.COMPANY_NUMBER.name}"],
+                                     ss[f"fq_{Q.COMPANY_EMAIL.name}"])
         return None
 
 
@@ -175,7 +178,3 @@ def use_streamlit():
 
 
 use_streamlit()
-
-
-
-

form/form.py

@@ -1,36 +1,36 @@
-from io import BytesIO
 from pathlib import Path
 from typing import TypedDict, Tuple
 from PyPDFForm import PdfWrapper
 
+from prompts.prompts_manager import Questions
 from utils.date_utils import get_today_date_as_dd_mm_yyyy
 from utils.parsing_utils import find_and_parse_date, find_and_parse_phone_number
 
 
-def build_form_data_from_answers(answers: dict[int, str], categories: list[str], signature: str | None = None) -> (
+def build_form_data_from_answers(answers: dict[Questions, str], categories: list[str], signature: str | None = None) -> (
         Tuple)[dict[str, str], str]:
     form_data = {}
     for category in categories:
         form_data[form_fields_map[category]] = True
     form_data[form_fields_map["minor_work"]] = True
-    form_data[form_fields_map["signed_by"]] = answers[0]
-    form_data[form_fields_map["community"]] = answers[2]
-    form_data[form_fields_map["building_name"]] = answers[3]
-    form_data[form_fields_map["unit_no"]] = answers[4]
-    form_data[form_fields_map["owner" if "owner" in answers[5].lower() else "tenant"]] = True
-    form_data[form_fields_map["start_date"]] = find_and_parse_date(answers[6])
-    form_data[form_fields_map["end_date"]] = find_and_parse_date(answers[7])
-    form_data[form_fields_map["contact_number"]] = find_and_parse_phone_number(answers[8])
-    form_data[form_fields_map["contractor_name"]] = answers[9]
-    form_data[form_fields_map["contractor_contact_number"]] = answers[10]
-    form_data[form_fields_map["contractor_email"]] = answers[11]
-    form_data[form_fields_map["email"]] = answers[12]
-    form_data[form_fields_map["occupant_name"]] = answers[0]
+    form_data[form_fields_map["signed_by"]] = answers[Questions.FULL_NAME]
+    form_data[form_fields_map["community"]] = answers[Questions.COMMUNITY]
+    form_data[form_fields_map["building_name"]] = answers[Questions.BUILDING]
+    form_data[form_fields_map["unit_no"]] = answers[Questions.UNIT_APT_NUMBER]
+    form_data[form_fields_map["owner" if "owner" in answers[Questions.OWNER_OR_TENANT].lower() else "tenant"]] = True
+    form_data[form_fields_map["start_date"]] = find_and_parse_date(answers[Questions.START_DATE])
+    form_data[form_fields_map["end_date"]] = find_and_parse_date(answers[Questions.END_DATE])
+    form_data[form_fields_map["contact_number"]] = find_and_parse_phone_number(answers[Questions.END_DATE])
+    form_data[form_fields_map["contractor_name"]] = answers[Questions.COMPANY_NAME]
+    form_data[form_fields_map["contractor_contact_number"]] = answers[Questions.COMPANY_NUMBER]
+    form_data[form_fields_map["contractor_email"]] = answers[Questions.COMPANY_EMAIL]
+    form_data[form_fields_map["email"]] = answers[Questions.YOUR_EMAIL]
+    form_data[form_fields_map["occupant_name"]] = answers[Questions.FULL_NAME]
     form_data[form_fields_map["signature_date"]] = get_today_date_as_dd_mm_yyyy()
     if signature:
         form_data[form_fields_map["signature"]] = signature
     return form_data, (f"work_permit_request"
-                       f"_{'-'.join(categories)}_{answers[9]}_"
+                       f"_{'-'.join(categories)}_{answers[Questions.COMPANY_NAME]}_"
                        f"{form_data[form_fields_map['start_date']].replace('/','-')}.pdf")
 
 

prompts/prompts_manager.py

@@ -3,7 +3,6 @@ from enum import Enum
 from pathlib import Path
 
 from utils.date_utils import get_today_date_as_dd_mm_yyyy
-from form.form import work_categories as wc
 
 
 class Questions(Enum):
@@ -23,8 +22,7 @@ class Questions(Enum):
 
 class PromptsManager:
     def __init__(self, work_categories: dict[str, str] = None):
-        if not work_categories:
-            self.work_categories = wc
+        self.work_categories = work_categories
         base_path = Path(__file__).parent
         with open(Path(base_path, "system_prompt.txt")) as sysprompt_file:
             self.system_prompt: str = sysprompt_file.read()
@@ -45,7 +43,8 @@ class PromptsManager:
 
     def get_work_category(self, work_description: str) -> str:
         return (
-            f"The work to do is {work_description}: choose the most accurate categories among the following {', '.join(self.work_categories.values())} "
+            f"The work to do is {work_description}: choose the most accurate categories among the following:"
+            f"{', '.join(self.work_categories.values())}\n"
             f"Only return the categories, separated by a semicolon")
 
     @staticmethod

repository/__init__.py

@@ -0,0 +1,35 @@
+import abc
+
+
+class ModelRoles:
+    def __init__(self, system_role: str, user_role: str, ai_role: str):
+        self.system_role: str = system_role
+        self.user_role: str = user_role
+        self.ai_role: str = ai_role
+
+
+class Model:
+    def __init__(self, model_name: str, model_roles: ModelRoles):
+        self.name = model_name
+        self.roles = model_roles
+
+
+class Repository(abc.ABC):
+
+    def get_model_info(self) -> Model:
+        pass
+
+    def get_model_roles(self) -> ModelRoles:
+        pass
+
+    def get_message_history(self) -> list[dict[str, str]]:
+        pass
+
+    def send_prompt(self, prompt: str, add_to_history: bool) -> dict[str, str]:
+        pass
+
+    def set_message_for_role(self, role: str, message: str):
+        self.get_message_history().append({"role": role, "content": message})
+
+    def init(self):
+        pass

repository/intel_npu.py

@@ -6,7 +6,7 @@ from intel_npu_acceleration_library.compiler import CompilerConfig
 from intel_npu_acceleration_library.dtypes import float32, float64, bfloat16
 from transformers import AutoTokenizer
 
-from repository.repository_abc import Repository, Model
+from repository import Model, Repository
 
 
 class IntelNpuRepository(Repository):

repository/ollama.py

@@ -1,7 +1,7 @@
 import ollama
 from ollama import Options
 
-from repository.repository_abc import Repository, Model
+from repository import Model, Repository
 
 
 class OllamaRepository(Repository):

repository/ondemand.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 import requests
 
-from repository.repository_abc import Repository, Model, ModelRoles
+from repository import ModelRoles, Model, Repository
 
 
 class OndemandRepository(Repository):

repository/repository.py

@@ -1,15 +1,16 @@
 import os
 from pathlib import Path
 
+from repository import ModelRoles, Model
 from utils.env_utils import in_hf
 
 if not in_hf():
     from repository.intel_npu import IntelNpuRepository
     from repository.ollama import OllamaRepository
 from repository.ondemand import OndemandRepository
-from repository.repository_abc import Model
 from repository.testing_repo import TestingRepository
 
+
 def build_repo_from_environment(system_prompt: str):
     implementation = os.getenv("implementation")
     model_name = os.getenv("model_name")
@@ -18,10 +19,13 @@ def build_repo_from_environment(system_prompt: str):
         return get_repository(implementation, Model(model_name, ModelRoles("system",
                                                                                                  "user",
                                                                                                  "assistant")),
-                                                    system_prompt)
+                              system_prompt)
     else:
         return None
 
+
+
+
 def get_repository(implementation: str, model: Model, system_msg: str = None, log_to_file: Path = None):
     known_implementations = ["ollama", "intel_npu", "testing", "ondemand"]
     if not implementation or implementation.lower() not in known_implementations:
@@ -40,7 +44,9 @@ def get_repository(implementation: str, model: Model, system_msg: str = None, lo
                 "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"
             },
             {
-                "role":"assistant",
-                "content":"pest_control"
+                "role": "assistant",
+                "content": "pest_control"
             }
         ])
+
+

repository/repository_abc.py

@@ -1,35 +0,0 @@
-import abc
-
-
-class ModelRoles:
-    def __init__(self, system_role: str, user_role: str, ai_role: str):
-        self.system_role: str = system_role
-        self.user_role: str = user_role
-        self.ai_role: str = ai_role
-
-
-class Model:
-    def __init__(self, model_name: str, model_roles: ModelRoles):
-        self.name = model_name
-        self.roles = model_roles
-
-
-class Repository(abc.ABC):
-
-    def get_model_info(self) -> Model:
-        pass
-
-    def get_model_roles(self) -> ModelRoles:
-        pass
-
-    def get_message_history(self) -> list[dict[str, str]]:
-        pass
-
-    def send_prompt(self, prompt: str, add_to_history: bool) -> dict[str, str]:
-        pass
-
-    def set_message_for_role(self, role: str, message: str):
-        self.get_message_history().append({"role": role, "content": message})
-
-    def init(self):
-        pass

repository/testing_repo.py

@@ -1,7 +1,6 @@
 from typing import Tuple
 
-
-from repository.repository_abc import Repository, Model, ModelRoles
+from repository import ModelRoles, Model, Repository
 
 
 class TestingRepository(Repository):

ui_manager.py

@@ -9,7 +9,7 @@ from llm_manager.llm_parser import LlmParser
 from local_storage.entities import PersonalDetails, LocationDetails, ContractorDetails
 from prompts.prompts_manager import PromptsManager, Questions as Q
 from repository.repository import get_repository
-from repository.repository_abc import Model, ModelRoles
+from repository import ModelRoles, Model
 from utils.parsing_utils import check_for_missing_answers
 
 ls: LocalStorage = LocalStorage()