h-ai-brain 0.0.21__tar.gz → 0.0.23__tar.gz

{h_ai_brain-0.0.21/src/h_ai_brain.egg-info → h_ai_brain-0.0.23}/PKG-INFO

@@ -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 → h_ai_brain-0.0.23}/pyproject.toml

@@ -4,7 +4,7 @@
 
    [project]
    name = "h_ai_brain"
-   version = "0.0.21"
+   version = "0.0.23"
    authors = [
        {name = "shoebill", email = "shoebill.hai@gmail.com"},
    ]

{h_ai_brain-0.0.21 → h_ai_brain-0.0.23}/src/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_brain-0.0.21 → h_ai_brain-0.0.23}/src/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_brain-0.0.21 → h_ai_brain-0.0.23}/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.21 → h_ai_brain-0.0.23}/src/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 → h_ai_brain-0.0.23/src/h_ai_brain.egg-info}/PKG-INFO

@@ -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