h-ai-brain 0.0.21__py3-none-any.whl → 0.0.23__py3-none-any.whl

h_ai/application/hai_service.py

@@ -9,7 +9,8 @@ class HaiService:
             self.llm_config.url,
             self.llm_config.model_name,
             temperature=self.llm_config.temperature,
-            max_tokens=self.llm_config.max_tokens)
+            max_tokens=self.llm_config.max_tokens,
+            api_token=self.llm_config.api_token)
 
     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)

h_ai/domain/llm_config.py

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

h_ai/infrastructure/llm/data_handler.py

@@ -1,7 +1,7 @@
 import json
 
 
-def parse_json_data(json_string: str) -> dict |None:
+def parse_json_data(json_string: str) -> dict | None:
     try:
         # Check for empty string
         if not json_string or not json_string.strip():
@@ -14,17 +14,21 @@ def parse_json_data(json_string: str) -> dict |None:
         if match:
             json_string = match.group(1).strip()
         else:
-            # If no code block found, try the existing logic
-            if json_string.strip().startswith('json'):
-                json_string = json_string.strip()[4:].strip()
+            # If no code block found, check for various JSON prefixes
+            stripped = json_string.strip()
+            # Check for <json> prefix
+            if stripped.startswith('<json>'):
+                json_string = stripped[6:].strip()
+            # Check for 'json' prefix
+            elif stripped.startswith('json'):
+                json_string = stripped[4:].strip()
 
         # Parse the JSON data
         data = json.loads(json_string)
-
         return data
     except json.JSONDecodeError as e:
         print(f"Error parsing JSON data: {e}")
         return {}
     except Exception as e:
         print(f"Unexpected error while parsing JSON data: {e}")
-        return {}
+        return {}

h_ai/infrastructure/llm/ollama/ollama_generate_repository.py

@@ -8,13 +8,14 @@ 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, max_tokens: int = 5000):
+    def __init__(self, api_url: str, model_name: str, system_prompt: str = None, temperature: float = None, seed: int = None, max_tokens: int = 5000, api_token: str = None):
         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
+        self.api_token = api_token
 
 
     def generate(self, user_prompt: str, system_prompt: str = None, session_id: str = None, max_tokens: int = None) -> str|None:
@@ -41,12 +42,17 @@ class OllamaGenerateRepository(LlmGenerateRepository):
         if max_tokens:
             payload["num_ctx"] = f"{max_tokens}"
 
+        headers = {}
+        if self.api_token:
+            headers["Authorization"]="Bearer "+self.api_token
+
         try:
-            print(payload)
-            response = requests.post(url, json=payload)
+            #print(payload)
+            response = requests.post(url, json=payload, headers=headers)
+
             response.raise_for_status()
 
-            print(response.json())
+            #print(response.json())
 
             response_content = response.json()["response"]
             return clean_llm_response(response_content)

{h_ai_brain-0.0.21.dist-info → h_ai_brain-0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h_ai_brain
-Version: 0.0.21
+Version: 0.0.23
 Summary: AI Research agent API
 Author-email: shoebill <shoebill.hai@gmail.com>
 Classifier: Programming Language :: Python :: 3

{h_ai_brain-0.0.21.dist-info → h_ai_brain-0.0.23.dist-info}/RECORD

@@ -1,8 +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=LPRAfwlyGpAY8qUL-pB3c_KhOWa93ztr_CJo11Sy7Xc,686
+h_ai/application/hai_service.py,sha256=-HfdxS8pYE2xx7OU_D5pOQLdlm7uZAVAn2gslouL2oY,736
 h_ai/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-h_ai/domain/llm_config.py,sha256=xdyRoc26yDoKy8Y5L724TT6LoF3MEOpi7SZPQvS-lx8,258
+h_ai/domain/llm_config.py,sha256=sYmD_ceOcGaP_UCTz0vtyuh-CTODvMudyURLiyrQ8tM,317
 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
@@ -11,20 +11,20 @@ h_ai/domain/reasoning/text_analysis.py,sha256=rmCUHWzJ3muFBorVXx7HcU2Sw-UfXFOuAV
 h_ai/domain/reasoning/tool_message.py,sha256=jpbfbJXj6oqZyB3lDxGOUyFB4faHtXAaEOVBHgTgSnk,67
 h_ai/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 h_ai/infrastructure/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-h_ai/infrastructure/llm/data_handler.py,sha256=M2h1azkjBP9GyaffTggKQZb2CQmOvAk2yo9NrsFMYAo,987
+h_ai/infrastructure/llm/data_handler.py,sha256=9wAxF5v409DGu7hn_4MGubGe0XyiowYtC30ftvnRDdE,1198
 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=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=grLQwAQn2E1C-MPb0DBwuolLlSGb-AJL-yZas3gR2h8,1967
+h_ai/infrastructure/llm/ollama/ollama_generate_repository.py,sha256=nF-ahfH9AsMLz9ix2uqGo-A_zLJqldLT9RpdOIyky3g,2162
 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.21.dist-info/licenses/LICENSE,sha256=SbvpEU5JIU3yzMMkyzrI0dGqHDoJR_lMKGdl6GZHsy4,11558
-h_ai_brain-0.0.21.dist-info/licenses/NOTICE.txt,sha256=vxeIKUiGqAePLvDW4AVm3Xh-3BcsvMtCMn1tbsr9zsE,668
-h_ai_brain-0.0.21.dist-info/METADATA,sha256=FLwAOebiwpN55xVzDdMMjLtr98FGhqUi0FJRz6Ovn2k,531
-h_ai_brain-0.0.21.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-h_ai_brain-0.0.21.dist-info/top_level.txt,sha256=3MChDBWvDJV4cEHuZhzeODxQ4ewtw-arOuyaDOc6sIo,5
-h_ai_brain-0.0.21.dist-info/RECORD,,
+h_ai_brain-0.0.23.dist-info/licenses/LICENSE,sha256=SbvpEU5JIU3yzMMkyzrI0dGqHDoJR_lMKGdl6GZHsy4,11558
+h_ai_brain-0.0.23.dist-info/licenses/NOTICE.txt,sha256=vxeIKUiGqAePLvDW4AVm3Xh-3BcsvMtCMn1tbsr9zsE,668
+h_ai_brain-0.0.23.dist-info/METADATA,sha256=4Ca3XF-ypwR9giaqCPJ1Mo6FniMQFrUYRc-NTLEE6Lw,531
+h_ai_brain-0.0.23.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+h_ai_brain-0.0.23.dist-info/top_level.txt,sha256=3MChDBWvDJV4cEHuZhzeODxQ4ewtw-arOuyaDOc6sIo,5
+h_ai_brain-0.0.23.dist-info/RECORD,,

{h_ai_brain-0.0.21.dist-info → h_ai_brain-0.0.23.dist-info}/WHEEL

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