h-ai-brain 0.0.22__py3-none-any.whl → 0.0.24__py3-none-any.whl

h_ai/infrastructure/llm/ollama/ollama_http_client.py

@@ -0,0 +1,54 @@
+import requests
+from typing import Dict, Any, Optional
+
+
+class OllamaHttpClient:
+    """
+    Base HTTP client for the Ollama API.
+    Handles authentication and common request functionality.
+    """
+    
+    def __init__(self, api_url: str, api_token: str = None):
+        """
+        Initialize a new OllamaHttpClient.
+        
+        Args:
+            api_url: The base URL of the Ollama API.
+            api_token: Optional API token for authentication.
+        """
+        self.api_url = api_url.rstrip('/')
+        self.api_token = api_token
+    
+    def _get_headers(self) -> Dict[str, str]:
+        """
+        Get the headers for the request, including authentication if available.
+        
+        Returns:
+            Dict[str, str]: The headers for the request.
+        """
+        headers = {}
+        if self.api_token:
+            headers["Authorization"] = f"Bearer {self.api_token}"
+        return headers
+    
+    def post(self, endpoint: str, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
+        """
+        Send a POST request to the Ollama API.
+        
+        Args:
+            endpoint: The endpoint to send the request to (without the base URL).
+            payload: The payload to send with the request.
+            
+        Returns:
+            Optional[Dict[str, Any]]: The JSON response from the API, or None if the request failed.
+        """
+        url = f"{self.api_url}/{endpoint}"
+        headers = self._get_headers()
+        
+        try:
+            response = requests.post(url, json=payload, headers=headers)
+            response.raise_for_status()
+            return response.json()
+        except requests.exceptions.RequestException as e:
+            print(f"Error during Ollama API call to {endpoint}: {e}")
+            return None

h_ai/infrastructure/llm/prompt_loader.py

@@ -1,18 +1,53 @@
 import json
-import os
+from .json_resource_loader import JsonResourceLoader
 
 
 class PromptLoader:
-    def __init__(self, file_path):
-        # Resolve a relative path to an absolute path
-        absolute_file_path = os.path.abspath(file_path)
+    """
+    Loader for prompt configuration files.
 
-        with open(absolute_file_path, "r") as file:
-            self.config = json.load(file)
+    This class provides functionality to load prompt configuration files from JSON resources.
+    It uses JsonResourceLoader to handle loading from either a package or the file system.
+
+    Usage:
+        # Create a prompt loader for a specific file
+        loader = PromptLoader("autonomous_agent")
+
+        # Get a specific config value
+        system_prompt = loader.get_config_value("system_prompt")
+
+        # Get the entire config as a JSON string
+        config_json = loader.get_entire_config()
+    """
+
+    def __init__(self, resource_name):
+        """
+        Initialize a new PromptLoader.
+
+        Args:
+            resource_name: Name of the JSON resource file (with or without .json extension).
+        """
+        # Use JsonResourceLoader to load the resource
+        json_loader = JsonResourceLoader()
+        self.config = json_loader.load_json_resource(resource_name)
 
     def get_config_value(self, key):
+        """
+        Get a specific value from the config.
+
+        Args:
+            key: The key to look up in the config.
+
+        Returns:
+            The value associated with the key, or None if the key doesn't exist.
+        """
         return self.config.get(key)
 
     def get_entire_config(self):
-        return json.dumps(self.config, indent=2)
+        """
+        Get the entire config as a JSON string.
 
+        Returns:
+            str: The entire config as a formatted JSON string.
+        """
+        return json.dumps(self.config, indent=2)

h_ai/infrastructure/llm/template_loader.py

@@ -0,0 +1,146 @@
+import os
+import importlib.util
+from typing import Dict, Any, Optional, List
+from jinja2 import Environment, FileSystemLoader, PackageLoader, ChoiceLoader, select_autoescape
+
+
+class TemplateLoader:
+    """
+    Loader for Jinja2 templates.
+
+    This class provides functionality to load and render Jinja2 templates for model-specific prompt formatting.
+
+    Templates are stored in the resources/templates directory and should have a .j2 extension.
+    Different models can have different templates to format prompts according to their specific requirements.
+
+    The default template (default.j2) is used for models without specific formatting needs.
+    Model-specific templates (like granite3.j2) provide tailored formatting for particular models.
+
+    Usage:
+        # Create a template loader
+        loader = TemplateLoader()
+
+        # Get a list of available templates
+        templates = loader.get_template_names()
+
+        # Render a template with context
+        context = {
+            "System": "You are a helpful assistant.",
+            "Messages": [
+                {"Role": "user", "Content": "Hello!"}
+            ]
+        }
+        formatted_prompt = loader.render_template("default.j2", context)
+
+        # Get the appropriate template for a model
+        template_name = loader.get_model_template("granite3.3:8b")
+    """
+
+    def __init__(self, templates_dir: str = None, package_name: str = None, package_path: str = None):
+        """
+        Initialize a new TemplateLoader.
+
+        Args:
+            templates_dir: Directory containing Jinja2 templates. If None, defaults to 'resources/templates'.
+            package_name: Python package name containing templates. If None, defaults to 'h_ai'.
+            package_path: Path within the package to templates. If None, defaults to 'resources/templates'.
+        """
+        # Get the base directory of the package
+        base_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+        # Set default directories if not provided
+        if templates_dir is None:
+            templates_dir = os.path.join(base_dir, 'resources', 'templates')
+        if package_name is None:
+            package_name = 'h_ai'
+        if package_path is None:
+            package_path = 'resources/templates'
+
+        # Create a list of loaders to try in order
+        loaders = []
+
+        # First try to load from package
+        try:
+            # Check if the package exists and has the specified path
+            if importlib.util.find_spec(package_name) is not None:
+                loaders.append(PackageLoader(package_name, package_path))
+        except (ImportError, ModuleNotFoundError):
+            # If package loading fails, we'll fall back to file system
+            pass
+
+        # Then try to load from file system
+        if os.path.exists(templates_dir):
+            loaders.append(FileSystemLoader(templates_dir))
+
+        # If no loaders were added, raise an error
+        if not loaders:
+            raise ValueError(f"No valid template sources found. Tried package '{package_name}' and directory '{templates_dir}'")
+
+        # Initialize Jinja2 environment with a ChoiceLoader
+        self.env = Environment(
+            loader=ChoiceLoader(loaders),
+            autoescape=select_autoescape(['html', 'xml']),
+            trim_blocks=True,
+            lstrip_blocks=True
+        )
+
+        self.templates_dir = templates_dir
+        self.package_name = package_name
+        self.package_path = package_path
+
+    def get_template_names(self) -> list[str]:
+        """
+        Get a list of available template names.
+
+        Returns:
+            list[str]: List of template filenames.
+        """
+        return self.env.list_templates()
+
+    def render_template(self, template_name: str, context: Dict[str, Any]) -> str:
+        """
+        Render a template with the given context.
+
+        Args:
+            template_name: Name of the template file.
+            context: Dictionary of variables to pass to the template.
+
+        Returns:
+            str: The rendered template.
+        """
+        template = self.env.get_template(template_name)
+        return template.render(**context)
+
+
+    def get_model_template(self, model_name: str) -> Optional[str]:
+        """
+        Get the appropriate template name for a given model.
+
+        Args:
+            model_name: The name of the model.
+
+        Returns:
+            Optional[str]: The template name for the model, or None if no specific template exists.
+        """
+        # Map model names to template names
+        model_templates = {
+            "granite3.3:8b": "granite3.j2",
+            # Add more model-to-template mappings as needed
+        }
+
+        # Check if there's a specific template for this model
+        template_name = model_templates.get(model_name)
+
+        # If no specific template, use default
+        if template_name is None:
+            template_name = "default.j2"
+
+        # Verify the template exists
+        if template_name in self.get_template_names():
+            return template_name
+
+        # Fall back to default if the specific template doesn't exist
+        if "default.j2" in self.get_template_names():
+            return "default.j2"
+
+        return None

{h_ai_brain-0.0.22.dist-info → h_ai_brain-0.0.24.dist-info}/METADATA

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

h_ai_brain-0.0.24.dist-info/RECORD

@@ -0,0 +1,43 @@
+h_ai/__init__.py,sha256=xPmyEAMjUDrEbH2ECOfNuDg1n_ILOUFo6E2gJJpmBF8,510
+h_ai/application/__init__.py,sha256=mw3Zk9ONVHmZouknalYI4lPOBecjbXn1XVmD6OxhR0I,437
+h_ai/application/hai_service.py,sha256=JtxlxmBIr5cPzdEfowTM4Kzs5-mlAqaNswL1clXwm9A,394
+h_ai/application/services/__init__.py,sha256=0Gm07RkBplyPStFYtBNOG3GxFZEj0IkhUfnzht5CvaQ,329
+h_ai/application/services/base_model_service.py,sha256=Ep3z_-xg9iaT5yIt9yovQwxSHUe148KVo0W_Z4Zsdrw,2468
+h_ai/application/services/granite_service.py,sha256=Fh0yYzTCxmv9F8xxqsrK-pNlL22WbsYUMHMhQdbbcW8,5481
+h_ai/application/services/nomic_service.py,sha256=LOt-3pKRXftx2Fp8lIUFhRsPRKtYrLUzA8I9_rPBa_k,3988
+h_ai/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+h_ai/domain/llm_config.py,sha256=gclk53-NCtljTr14y4P9TCuG2aHW1--4GHm0dbitTRg,810
+h_ai/domain/model_factory.py,sha256=bEWbtUHu-_a7ZAdAjf6CszigMb04QFsUXThRNXkqxWA,1493
+h_ai/domain/reasoning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+h_ai/domain/reasoning/llm_chat_repository.py,sha256=zNwzONyLf7YFhBUk6o0SMMR-0kocCmKbw-xNriDSwyI,1427
+h_ai/domain/reasoning/llm_embedding_repository.py,sha256=Q3e2hyD-q89HZuOaVyK6I6OWMtbL3I3k5zWB85Qamzg,533
+h_ai/domain/reasoning/llm_generate_respository.py,sha256=20yd1gXbOcCX5Y9KjhAt__xiBtDNxyFQPxBpeFWUfiA,690
+h_ai/domain/reasoning/llm_tool_repository.py,sha256=VNMwbyhlHVJOSihVJwivVMYaT6xZbubPxfKxmiVcV_I,1099
+h_ai/domain/reasoning/text_analysis.py,sha256=rmCUHWzJ3muFBorVXx7HcU2Sw-UfXFOuAVXRAPkqS8E,5183
+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=9wAxF5v409DGu7hn_4MGubGe0XyiowYtC30ftvnRDdE,1198
+h_ai/infrastructure/llm/json_resource_loader.py,sha256=dCghy0kZMjqgtj3eFu7NifyaY4d0M6K7EaVtGs5JxEY,4109
+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=kwi5JrMfq5IpKV0RiTNrOTwFFtnDnw-pFwVcsutvbhQ,1624
+h_ai/infrastructure/llm/template_loader.py,sha256=iVQUT9Y7DePbW-ZoS1Zzvcat4C4VXlUobn3Zwra7V9g,5414
+h_ai/infrastructure/llm/ollama/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+h_ai/infrastructure/llm/ollama/ollama_chat_repository.py,sha256=eTfeKWaMqJdnwQN5wfz46ZNMAZp7NMw2MaYDAvLIQ_8,7872
+h_ai/infrastructure/llm/ollama/ollama_embed_repository.py,sha256=ITGDG6oGGAD8xjURYEOjHUa7noGVSWUtlqoJWon7wWI,1373
+h_ai/infrastructure/llm/ollama/ollama_generate_repository.py,sha256=koDRoU6LKBtMmq4sNstA5oJKJHM3UAYnLBErNmF2cUs,4795
+h_ai/infrastructure/llm/ollama/ollama_http_client.py,sha256=sSnxkjR8eGEI7gG97vu8-A2GOPoJ3XML5AlIVSD0qLI,1837
+h_ai/infrastructure/llm/ollama/ollama_tool_repository.py,sha256=7UZ-qsgXQUcJFx1qY7SVI7p3FhIy0Drdqs7jZIp42Ag,4683
+h_ai/infrastructure/llm/ollama/factories/__init__.py,sha256=UL6WBv4BtKrx59yr5X2Ddt-r0t_KHfgPjo9dZ5zZ3sc,82
+h_ai/infrastructure/llm/ollama/factories/granite_factory.py,sha256=RL796T8JBv_HG4sjVvPAZLxXrkcH5b-z72767IGEhCk,3462
+h_ai/infrastructure/llm/ollama/factories/nomic_factory.py,sha256=_yJYNbF738ugJ1ZN6pqmttTBk2tTwk6NJpMs4Yeq8pY,2081
+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.24.dist-info/licenses/LICENSE,sha256=SbvpEU5JIU3yzMMkyzrI0dGqHDoJR_lMKGdl6GZHsy4,11558
+h_ai_brain-0.0.24.dist-info/licenses/NOTICE.txt,sha256=vxeIKUiGqAePLvDW4AVm3Xh-3BcsvMtCMn1tbsr9zsE,668
+h_ai_brain-0.0.24.dist-info/METADATA,sha256=ALGHTKK8mNI4EHw1ouKS5Dz505_wa-Uu1z9rmPDxEi0,561
+h_ai_brain-0.0.24.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+h_ai_brain-0.0.24.dist-info/top_level.txt,sha256=3MChDBWvDJV4cEHuZhzeODxQ4ewtw-arOuyaDOc6sIo,5
+h_ai_brain-0.0.24.dist-info/RECORD,,

{h_ai_brain-0.0.22.dist-info → h_ai_brain-0.0.24.dist-info}/WHEEL

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

h_ai_brain-0.0.22.dist-info/RECORD

@@ -1,30 +0,0 @@
-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/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
-h_ai/domain/reasoning/llm_tool_repository.py,sha256=nFwqtrJ0Gw8XUFX0uuO7-UejtgoqNuGeT51qZPQtxas,401
-h_ai/domain/reasoning/text_analysis.py,sha256=rmCUHWzJ3muFBorVXx7HcU2Sw-UfXFOuAVXRAPkqS8E,5183
-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=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=np6vYfn9sVrf_oKMN0y1QLdf7X2seWBOjvPS8OQghkc,1969
-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.22.dist-info/licenses/LICENSE,sha256=SbvpEU5JIU3yzMMkyzrI0dGqHDoJR_lMKGdl6GZHsy4,11558
-h_ai_brain-0.0.22.dist-info/licenses/NOTICE.txt,sha256=vxeIKUiGqAePLvDW4AVm3Xh-3BcsvMtCMn1tbsr9zsE,668
-h_ai_brain-0.0.22.dist-info/METADATA,sha256=1qw7KdgK6bWTAEZVsfqGpjEe-94RVtApgK6e67EnqUs,531
-h_ai_brain-0.0.22.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-h_ai_brain-0.0.22.dist-info/top_level.txt,sha256=3MChDBWvDJV4cEHuZhzeODxQ4ewtw-arOuyaDOc6sIo,5
-h_ai_brain-0.0.22.dist-info/RECORD,,