h-ai-brain 0.0.17__py3-none-any.whl → 0.0.19__py3-none-any.whl

h_ai/application/hai_service.py

@@ -1,13 +1,20 @@
 from h_message_bus import NatsPublisherAdapter
-from h_message_bus.domain.request_messages.vector_read_metadata_request_message import VectorReadMetaDataRequestMessage
-from h_message_bus.domain.request_messages.vector_read_metadata_response_message import VectorReadMetaDataResponseMessage
+
+from ..domain.llm_config import LLMConfig
+from ..infrastructure.llm.ollama.ollama_generate_repository import OllamaGenerateRepository
+
 
 class HaiService:
-    def __init__(self, nats_publisher_adapter: NatsPublisherAdapter):
+    def __init__(self, nats_publisher_adapter: NatsPublisherAdapter, llm_config: LLMConfig):
         self.nats_publisher_adapter = nats_publisher_adapter
+        self.llm_config = llm_config
+        self.llm_generate_repository = OllamaGenerateRepository(
+            self.llm_config.url,
+            self.llm_config.model_name,
+            temperature=self.llm_config.temperature,
+            max_tokens=self.llm_config.max_tokens)
+
+    def ask_question(self, question: str, system_prompt: str = None, max_tokens = None) -> str:
+        return self.llm_generate_repository.generate(question, system_prompt, max_tokens)
+
 
-    async def get_knowledgebase_metadata(self) -> VectorReadMetaDataResponseMessage:
-        message = VectorReadMetaDataRequestMessage.create_message()
-        response = await self.nats_publisher_adapter.request(message)
-        metadata_result = VectorReadMetaDataResponseMessage.from_hai_message(response)
-        return metadata_result

h_ai/domain/llm_config.py

@@ -0,0 +1,6 @@
+class LLMConfig:
+    def __init__(self, url: str, model_name: str, temperature: float = 0.6, max_tokens: int = 2500):
+        self.url = url
+        self.model_name = model_name
+        self.temperature = temperature
+        self.max_tokens = max_tokens

h_ai/infrastructure/llm/ollama/ollama_generate_repository.py

@@ -2,20 +2,22 @@ import uuid
 
 import requests
 
+from ..llm_response_cleaner import clean_llm_response
 from ....domain.reasoning.llm_generate_respository import LlmGenerateRepository
 
 
 class OllamaGenerateRepository(LlmGenerateRepository):
 
-    def __init__(self, api_url: str, model_name: str, system_prompt: str = None, temperature: float = None, seed: int = None):
+    def __init__(self, api_url: str, model_name: str, system_prompt: str = None, temperature: float = None, seed: int = None, max_tokens: int = 5000):
         self.model_name = model_name
         self.system_prompt = system_prompt
         self.api_url = api_url
         self.temperature = temperature
         self.seed = seed
+        self.max_tokens = max_tokens
 
 
-    def generate(self, user_prompt: str, system_prompt: str = None, session_id: str = None) -> str|None:
+    def generate(self, user_prompt: str, system_prompt: str = None, session_id: str = None, max_tokens: int = None) -> str|None:
         url = f"{self.api_url}/generate"
         random_guid = uuid.uuid4()
         guid_str = str(random_guid)
@@ -26,16 +28,18 @@ class OllamaGenerateRepository(LlmGenerateRepository):
             "system": system_prompt,
             "stream": False,
             "session": guid_str,
-            "num_ctx": "5000",
-            "temperature": "0.6"
+            "num_ctx": f"{self.max_tokens}",
+            "temperature": f"{self.temperature}"
         }
 
         if session_id:
             payload["session"] = session_id
         if self.seed:
-            payload["seed"] = self.seed
+            payload["seed"] = f"{self.seed}"
         if self.temperature:
-            payload["temperature"] = self.temperature
+            payload["temperature"] = f"{self.temperature}"
+        if max_tokens:
+            payload["num_ctx"] = f"{max_tokens}"
 
         try:
             print(payload)

h_ai/infrastructure/llm/prompt_loader.py

@@ -4,7 +4,7 @@ import os
 
 class PromptLoader:
     def __init__(self, file_path):
-        # Resolve relative path to absolute path
+        # Resolve a relative path to an absolute path
         absolute_file_path = os.path.abspath(file_path)
 
         with open(absolute_file_path, "r") as file:

{h_ai_brain-0.0.17.dist-info → h_ai_brain-0.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h_ai_brain
-Version: 0.0.17
+Version: 0.0.19
 Summary: AI Research agent API
 Author-email: shoebill <shoebill.hai@gmail.com>
 Classifier: Programming Language :: Python :: 3
@@ -10,7 +10,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE.txt
-Requires-Dist: h_message_bus~=0.0.21
+Requires-Dist: h_message_bus~=0.0.22
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file

{h_ai_brain-0.0.17.dist-info → h_ai_brain-0.0.19.dist-info}/RECORD

@@ -1,9 +1,8 @@
 h_ai/__init__.py,sha256=63uVFHPxXmLrZVo2ZPixL2cU4jwf3XTAuwIVGHGkqJI,75
 h_ai/application/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-h_ai/application/hai_service.py,sha256=UwzM-w2zpSNiCsoba-uClUBRFhMq74uuznkLpt08f5g,794
-h_ai/application/system_prompts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-h_ai/application/system_prompts/roles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+h_ai/application/hai_service.py,sha256=k7bhMwqJxrpj2rtH_rQokOEYdIzl6bx69bmoyvqzybA,844
 h_ai/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+h_ai/domain/llm_config.py,sha256=xdyRoc26yDoKy8Y5L724TT6LoF3MEOpi7SZPQvS-lx8,258
 h_ai/domain/reasoning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 h_ai/domain/reasoning/llm_chat_repository.py,sha256=rY2izDyaDnoyyrCRS1qc9erHB98vARj4Mp-SnPwNhyY,211
 h_ai/domain/reasoning/llm_generate_respository.py,sha256=DPiV6ldCE8YhDdVb5rj98MBudKalDQHV3CZ2ADTm_f8,178
@@ -15,17 +14,17 @@ h_ai/infrastructure/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 h_ai/infrastructure/llm/data_handler.py,sha256=M2h1azkjBP9GyaffTggKQZb2CQmOvAk2yo9NrsFMYAo,987
 h_ai/infrastructure/llm/llm_response_cleaner.py,sha256=pp1K7I77hagrC1r6Ib61-iSNQnU6wlM54bRmOUa7eFk,859
 h_ai/infrastructure/llm/prompt_helper.py,sha256=QjxPbNW7hu2wBIi9GLJ7r00ELytT2Wr1JKDAA1jB2U4,238
-h_ai/infrastructure/llm/prompt_loader.py,sha256=8h6QGq_h-s-UzC9fIxpeMCrhjHd7347NaAq7uLf-ook,455
+h_ai/infrastructure/llm/prompt_loader.py,sha256=hVep4BuheFc6Arple3OrV249KSwEqjIqHbAEJ_ymuvI,460
 h_ai/infrastructure/llm/ollama/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 h_ai/infrastructure/llm/ollama/ollama_chat_repository.py,sha256=GALea7UWLtKyt767Frtl3uv8rvy42HrOKMIQGpqq-H0,2108
-h_ai/infrastructure/llm/ollama/ollama_generate_repository.py,sha256=jorJrsIR3WPkvls7NE3BXllEtiDePCgMX5DFADz2s8E,1712
+h_ai/infrastructure/llm/ollama/ollama_generate_repository.py,sha256=grLQwAQn2E1C-MPb0DBwuolLlSGb-AJL-yZas3gR2h8,1967
 h_ai/infrastructure/llm/ollama/ollama_tool_repository.py,sha256=7UZ-qsgXQUcJFx1qY7SVI7p3FhIy0Drdqs7jZIp42Ag,4683
 h_ai/infrastructure/llm/ollama/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 h_ai/infrastructure/llm/ollama/models/ollama_chat_message.py,sha256=ZIz4PQ3869vI3xAYYufPrxXpacajRDtOI8RDl5Dm9RQ,305
 h_ai/infrastructure/llm/ollama/models/ollama_chat_session.py,sha256=GZ_ddpbWa8iy6NZq50vokUFVZBiX0WNa81z9-r9RzTY,392
-h_ai_brain-0.0.17.dist-info/licenses/LICENSE,sha256=SbvpEU5JIU3yzMMkyzrI0dGqHDoJR_lMKGdl6GZHsy4,11558
-h_ai_brain-0.0.17.dist-info/licenses/NOTICE.txt,sha256=vxeIKUiGqAePLvDW4AVm3Xh-3BcsvMtCMn1tbsr9zsE,668
-h_ai_brain-0.0.17.dist-info/METADATA,sha256=Dx3oqE6H3-RC4LkAPuZGDjMzttB6pSadgiXv4dNdPLk,536
-h_ai_brain-0.0.17.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-h_ai_brain-0.0.17.dist-info/top_level.txt,sha256=3MChDBWvDJV4cEHuZhzeODxQ4ewtw-arOuyaDOc6sIo,5
-h_ai_brain-0.0.17.dist-info/RECORD,,
+h_ai_brain-0.0.19.dist-info/licenses/LICENSE,sha256=SbvpEU5JIU3yzMMkyzrI0dGqHDoJR_lMKGdl6GZHsy4,11558
+h_ai_brain-0.0.19.dist-info/licenses/NOTICE.txt,sha256=vxeIKUiGqAePLvDW4AVm3Xh-3BcsvMtCMn1tbsr9zsE,668
+h_ai_brain-0.0.19.dist-info/METADATA,sha256=AcpQoCaSmqAcQa8-J5Sj2KRZQYnrsqc-JAVbxATvhHA,536
+h_ai_brain-0.0.19.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+h_ai_brain-0.0.19.dist-info/top_level.txt,sha256=3MChDBWvDJV4cEHuZhzeODxQ4ewtw-arOuyaDOc6sIo,5
+h_ai_brain-0.0.19.dist-info/RECORD,,

{h_ai_brain-0.0.17.dist-info → h_ai_brain-0.0.19.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any