h-ai-brain 0.0.20__tar.gz → 0.0.22__tar.gz

{h_ai_brain-0.0.20/src/h_ai_brain.egg-info → h_ai_brain-0.0.22}/PKG-INFO

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

{h_ai_brain-0.0.20 → h_ai_brain-0.0.22}/pyproject.toml

@@ -4,7 +4,7 @@
 
    [project]
    name = "h_ai_brain"
-   version = "0.0.20"
+   version = "0.0.22"
    authors = [
        {name = "shoebill", email = "shoebill.hai@gmail.com"},
    ]
@@ -17,7 +17,6 @@
        "Operating System :: OS Independent",
    ]
    dependencies = [
-       "h_message_bus~=0.0.22",
        "requests~=2.32.3"
    ]
 

{h_ai_brain-0.0.20 → h_ai_brain-0.0.22}/src/h_ai/application/hai_service.py

@@ -1,12 +1,9 @@
-from h_message_bus import NatsPublisherAdapter
-
 from ..domain.llm_config import LLMConfig
 from ..infrastructure.llm.ollama.ollama_generate_repository import OllamaGenerateRepository
 
 
 class HaiService:
-    def __init__(self, nats_publisher_adapter: NatsPublisherAdapter, llm_config: LLMConfig):
-        self.nats_publisher_adapter = nats_publisher_adapter
+    def __init__(self, llm_config: LLMConfig):
         self.llm_config = llm_config
         self.llm_generate_repository = OllamaGenerateRepository(
             self.llm_config.url,

{h_ai_brain-0.0.20 → h_ai_brain-0.0.22}/src/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_brain-0.0.20 → h_ai_brain-0.0.22}/src/h_ai/infrastructure/llm/ollama/ollama_generate_repository.py

@@ -42,11 +42,11 @@ class OllamaGenerateRepository(LlmGenerateRepository):
             payload["num_ctx"] = f"{max_tokens}"
 
         try:
-            print(payload)
+            #print(payload)
             response = requests.post(url, json=payload)
             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.20 → h_ai_brain-0.0.22/src/h_ai_brain.egg-info}/PKG-INFO

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

{h_ai_brain-0.0.20 → h_ai_brain-0.0.22}/src/h_ai_brain.egg-info/requires.txt

@@ -1,4 +1,3 @@
-h_message_bus~=0.0.22
 requests~=2.32.3
 
 [dev]