sunholo 0.84.7__tar.gz → 0.84.9__tar.gz

{sunholo-0.84.7 → sunholo-0.84.9}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.84.7
+Version: 0.84.9
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.7.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.9.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.84.7 → sunholo-0.84.9}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.84.7'
+version = '0.84.9'
 
 setup(
     name='sunholo',

{sunholo-0.84.7 → sunholo-0.84.9}/sunholo/genai/process_funcs_cls.py

@@ -4,7 +4,7 @@ from ..custom_logging import log
 from ..utils import ConfigManager
 from .safety import genai_safety
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
 
 try:
     import google.generativeai as genai
@@ -24,14 +24,15 @@ class GenAIFunctionProcessor:
     of function names mapped to their implementations.
 
     Attributes:
-        config (ConfigManager): Configuration manager instance.
+        config (ConfigManager): Configuration manager instance. Reach values via self.config within your own construct_tools() method
         funcs (dict): A dictionary of function names mapped to their implementations.
 
     Example usage:
+
     ```python
     class AlloyDBFunctionProcessor(GenAIFunctionProcessor):
         def construct_tools(self) -> dict:
-            ...
+            pass
 
     config = ConfigManager()
     alloydb_processor = AlloyDBFunctionProcessor(config)
@@ -58,6 +59,7 @@ class GenAIFunctionProcessor:
         self.config = config
         self.funcs = self.construct_tools()
         self.model_name = config.vacConfig("model") or "gemini-1.5-flash"
+        self.last_api_requests_and_responses = []
         self._validate_functions()
 
     def construct_tools(self) -> dict:
@@ -68,7 +70,7 @@ class GenAIFunctionProcessor:
         function implementations required for the application.
 
         Returns:
-            dict: A dictionary where keys are function names and values are function objects. e.g. {"my_func": my_func}
+            dict: A dictionary where keys are function names and values are function objects
 
         Raises:
             NotImplementedError: If the method is not overridden in a subclass.
@@ -90,8 +92,86 @@ class GenAIFunctionProcessor:
             if not func.__doc__:
                 log.error(f"Function {func_name} is missing a docstring.")
                 raise ValueError(f"Function {func_name} must have a docstring to be used as a genai tool.")
+    
+
+    def parse_as_parts(self, api_requests_and_responses=[]):
+        if not api_requests_and_responses and not self.last_api_requests_and_responses:
+            log.info("No api_requests_and_responses found to parse to parts")
+            return None
+
+        if api_requests_and_responses:
+            self.last_api_requests_and_responses = api_requests_and_responses
+        
+        from google.generativeai.protos import Part
+
+        work_on = api_requests_and_responses or self.last_api_requests_and_responses
+        parts = []
+        for part in work_on:
+            parts.append(
+                Part(
+                    function_response=genai.protos.FunctionResponse(
+                        name=part[0],
+                        response={"result": part[2]}
+                    )
+                )
+            )
+
+        return parts
+
+    def check_function_result(self, function_name, target_value, api_requests_and_responses=[]):
+        """
+        Checks if a specific function result in the api_requests_and_responses contains a certain value.
 
-    def process_funcs(self, full_response, output_parts=True) -> list['Part'] | str:
+        Args:
+            function_name (str): The name of the function to check.
+            target_value: The value to look for in the function result.
+            api_requests_and_responses (list, optional): List of function call results to check. 
+                                                        If not provided, the method will use `self.last_api_requests_and_responses`.
+
+        Returns:
+            bool: True if the target_value is found in the specified function's result, otherwise False.
+        """
+        if not api_requests_and_responses:
+            api_requests_and_responses = self.last_api_requests_and_responses
+
+        if not api_requests_and_responses:
+            log.info("No api_requests_and_responses found to check.")
+            return False
+
+        for part in api_requests_and_responses:
+            func_name = part[0]
+            result = part[2]
+
+            if func_name == function_name:
+                if isinstance(result, list) and target_value in result:
+                    log.info(f"Target value '{target_value}' found in the result of function '{function_name}'.")
+                    return True
+                elif result == target_value:
+                    log.info(f"Target value '{target_value}' found in the result of function '{function_name}'.")
+                    return True
+
+        log.info(f"Target value '{target_value}' not found in the result of function '{function_name}'.")
+        return False
+    
+    def parse_as_string(self, api_requests_and_responses=[]):
+        if not api_requests_and_responses and not self.last_api_requests_and_responses:
+            log.info("No api_requests_and_response found to parse to string")
+            return None
+        
+        if api_requests_and_responses:
+            self.last_api_requests_and_responses = api_requests_and_responses
+        
+        work_on = api_requests_and_responses or self.last_api_requests_and_responses
+        strings = []
+        for part in work_on:
+            strings.append(
+                f"function tool {part[0]} was called with arguments: {part[1]} and got this result:\n"
+                f"<{part[0]}_result>{part[2]}</{part[0]}_result>"
+            )
+
+        return strings
+
+    def process_funcs(self, full_response, output_parts=True) -> Union[list['Part'], str]:
         """
         Processes the functions based on the full_response from the generative model.
 
@@ -141,30 +221,28 @@ class GenAIFunctionProcessor:
                     log.error(f"Function {function_name} is not recognized")
 
         log.info(f"{api_requests_and_responses=}")
+        self.last_api_requests_and_responses = api_requests_and_responses
 
         if output_parts:
-            parts = []
-            for part in api_requests_and_responses:
-                parts.append(
-                    Part(
-                        function_response=genai.protos.FunctionResponse(
-                            name=part[0],
-                            response={"result": part[2]}
-                        )
-                    )
-                )
-            return parts
+            return self.parse_as_parts()
+        
+        return self.parse_as_string()
+    
+    def tool_config_setting(self, mode:str):
+        from google.generativeai.types import content_types
 
-        strings = []
-        for part in api_requests_and_responses:
-            strings.append(
-                f"function tool {part[0]} was called with arguments: {part[1]} and got this result:\n"
-                f"<{part[0]}_result>{part[2]}</{part[0]}_result>"
-            )
+        fns = list(self.funcs.keys())
 
-        return strings
+        return content_types.to_tool_config(
+                {"function_calling_config": {"mode": mode, "allowed_function_names": fns}}
+            )
 
-    def get_model(self, system_instruction: str, generation_config=None, model_name: str=None):
+    def get_model(
+            self, 
+            system_instruction: str, 
+            generation_config=None, 
+            model_name: str=None,
+            tool_config: str="auto"):
         """
         Constructs and returns the generative AI model configured with the tools.
 
@@ -175,11 +253,13 @@ class GenAIFunctionProcessor:
             model_name (str): The name of the model to use.
             system_instruction (str): Instructions for the AI system.
             generation_config (dict, optional): Configuration for generation, such as temperature.
+            tool_config (str, optional): Configuration for tool behaviour: 'auto' it decides, 'none' no tools, 'any' always use tools
 
         Returns:
             GenerativeModel: An instance of the GenerativeModel configured with the provided tools.
 
         Example usage:
+
         ```python
         alloydb_model = alloydb_processor.get_model(
             model_name="gemini-1.5-pro",
@@ -200,6 +280,7 @@ class GenAIFunctionProcessor:
             model = genai.GenerativeModel(
                 model_name=model_name or self.model_name,
                 tools=tools,
+                tool_config=self.tool_config_setting(tool_config),
                 generation_config=generation_config,
                 safety_settings=genai_safety(),
                 system_instruction=system_instruction,

{sunholo-0.84.7 → sunholo-0.84.9}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.84.7
+Version: 0.84.9
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.7.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.9.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0