fixed Dockerfile and package imports

Dockerfile

@@ -10,9 +10,9 @@ WORKDIR /app
 RUN ls -a
 RUN rm deps/*.whl
 RUN pip install -r requirements-base.txt
-WORKDIR /app/dam_helper
+WORKDIR /app
 EXPOSE 8501
-CMD streamlit run app.py \
+CMD streamlit run dam_helper/app.py \
     --server.headless true \
     --server.enableCORS false \
     --server.enableXsrfProtection false \

dam_helper/email_manager/email_manager.py

@@ -1,8 +1,7 @@
 from email.message import EmailMessage
-
-from dam_helper.enums.enums import Questions
-from dam_helper.prompts.prompts_manager import PromptsManager
-from dam_helper.repository import Repository
+from prompts.prompts_manager import Questions
+from prompts.prompts_manager import PromptsManager
+from repository import Repository
 
 
 class EmailManager:

dam_helper/form/form.py

@@ -2,9 +2,9 @@ from pathlib import Path
 from typing import TypedDict, Tuple
 from PyPDFForm import PdfWrapper
 
-from dam_helper.enums.enums import Questions
-from dam_helper.utils.date_utils import get_today_date_as_dd_mm_yyyy
-from dam_helper.utils.parsing_utils import find_and_parse_date, find_and_parse_phone_number
+from enums.enums 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[Questions, str], categories: list[str], signature: str | None = None) -> (

dam_helper/llm_manager/llm_parser.py

@@ -1,6 +1,6 @@
-from dam_helper.form.form import work_categories
-from dam_helper.local_storage.entities import SavedDetails
-from dam_helper.enums.enums import Questions
+from form.form import work_categories
+from local_storage.entities import SavedDetails
+from enums.enums import Questions
 
 
 class LlmParser:

dam_helper/local_storage/entities.py

@@ -1,6 +1,6 @@
 import abc
 
-from dam_helper.enums.enums import Questions, DetailsType
+from enums.enums import Questions, DetailsType
 
 
 class SavedDetails(abc.ABC):

dam_helper/local_storage/ls_manager.py

@@ -1,8 +1,7 @@
 from streamlit_local_storage import LocalStorage
 
-from dam_helper.local_storage.entities import SavedDetails, PersonalDetails, LocationDetails, ContractorDetails, \
-    detail_classes
-from dam_helper.enums.enums import DetailsType
+from local_storage.entities import SavedDetails, PersonalDetails, LocationDetails, ContractorDetails, detail_classes
+from enums.enums import DetailsType
 
 
 class LocalStorageManager:
@@ -14,8 +13,7 @@ class LocalStorageManager:
             detail = self.ls.getItem(detail_type.name).get(key)
             if detail:
                 cls = detail_classes[detail_type]
-                cls(**detail)
-                return None
+                return cls(**detail)
         return None
 
     def save_details(self, details: SavedDetails):

dam_helper/prompts/prompts_manager.py

@@ -1,8 +1,8 @@
 from pathlib import Path
 
-from dam_helper.enums.enums import Questions
-from dam_helper.local_storage.entities import PersonalDetails, ContractorDetails, LocationDetails
-from dam_helper.utils.date_utils import get_today_date_as_dd_mm_yyyy
+from enums.enums import Questions
+from local_storage.entities import PersonalDetails, ContractorDetails, LocationDetails
+from utils.date_utils import get_today_date_as_dd_mm_yyyy
 
 
 class PromptsManager:

dam_helper/repository/intel_npu.py

@@ -5,7 +5,7 @@ from intel_npu_acceleration_library import NPUModelForCausalLM, float16
 from intel_npu_acceleration_library.compiler import CompilerConfig
 from transformers import AutoTokenizer
 
-from dam_helper.repository import Model, Repository
+from repository import Model, Repository
 
 
 class IntelNpuRepository(Repository):

dam_helper/repository/ondemand.py

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

dam_helper/repository/repository.py

@@ -1,14 +1,14 @@
 import os
 from pathlib import Path
 
-from dam_helper.repository import ModelRoles, Model
-from dam_helper.utils.env_utils import in_hf
+from repository import ModelRoles, Model
+from utils.env_utils import in_hf
 
 if not in_hf():
-    from dam_helper.repository.intel_npu import IntelNpuRepository
-    from dam_helper.repository.ollama import OllamaRepository
-from dam_helper.repository.ondemand import OndemandRepository
-from dam_helper.repository.testing_repo import TestingRepository
+    from repository.intel_npu import IntelNpuRepository
+    from repository.ollama import OllamaRepository
+from repository.ondemand import OndemandRepository
+from repository.testing_repo import TestingRepository
 
 
 def build_repo_from_environment(system_prompt: str):
@@ -17,15 +17,13 @@ def build_repo_from_environment(system_prompt: str):
 
     if implementation:
         return get_repository(implementation, Model(model_name, ModelRoles("system",
-                                                                                                 "user",
-                                                                                                 "assistant")),
+                                                                           "user",
+                                                                           "assistant")),
                               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:
@@ -48,5 +46,3 @@ def get_repository(implementation: str, model: Model, system_msg: str = None, lo
                 "content": "pest_control"
             }
         ])
-
-

dam_helper/repository/testing_repo.py

@@ -1,4 +1,4 @@
-from dam_helper.repository import ModelRoles, Model, Repository
+from repository import ModelRoles, Model, Repository
 
 
 class TestingRepository(Repository):

dam_helper/ui_manager/ui_manager.py

@@ -4,17 +4,17 @@ import streamlit as st
 from streamlit import session_state as ss
 from streamlit.runtime.scriptrunner_utils.exceptions import StopException
 
-from dam_helper.email_manager.email_manager import EmailManager
-from dam_helper.enums.enums import Steps, DetailsType, Questions as Q
-from dam_helper.form.form import work_categories, build_form_data_from_answers, write_pdf_form
-from dam_helper.llm_manager.llm_parser import LlmParser
-from dam_helper.local_storage.entities import PersonalDetails, LocationDetails, ContractorDetails, SavedDetails, \
+from email_manager.email_manager import EmailManager
+from enums.enums import Steps, DetailsType, Questions as Q
+from form.form import work_categories, build_form_data_from_answers, write_pdf_form
+from llm_manager.llm_parser import LlmParser
+from local_storage.entities import PersonalDetails, LocationDetails, ContractorDetails, SavedDetails, \
     detail_classes
-from dam_helper.local_storage.ls_manager import LocalStorageManager
-from dam_helper.prompts.prompts_manager import PromptsManager
-from dam_helper.repository import Model, ModelRoles
-from dam_helper.repository.repository import build_repo_from_environment, get_repository
-from dam_helper.utils.parsing_utils import check_for_missing_answers
+from local_storage.ls_manager import LocalStorageManager
+from prompts.prompts_manager import PromptsManager
+from repository import Model, ModelRoles
+from repository.repository import build_repo_from_environment, get_repository
+from utils.parsing_utils import check_for_missing_answers
 
 
 class UIManager:
@@ -68,6 +68,7 @@ class UIManager:
         self._build_base_ui()
         with st.status("parsing user input for tags"):
             tags = self.find_tags_regex.findall(ss["user_input"])
+            ss["user_input"] = self.find_tags_regex.sub("",ss["user_input"])
             details = [self.lsm.get_detail(t) for t in tags]
         with st.status("initialising LLM"):
             self.repository.init()