sunholo 0.84.3__tar.gz → 0.84.7__tar.gz

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.84.3
+Version: 0.84.7
 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.3.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.7.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

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

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

{sunholo-0.84.3 → sunholo-0.84.7}/sunholo/__init__.py

@@ -9,6 +9,7 @@ from . import database
 from . import discovery_engine
 from . import embedder
 from . import gcs
+from . import genai
 from . import invoke
 from . import langfuse
 from . import llamaindex
@@ -34,6 +35,7 @@ __all__ = ['agents',
            'discovery_engine',
            'embedder', 
            'gcs', 
+           'genai',
            'invoke',
            'langfuse', 
            'llamaindex',

{sunholo-0.84.3 → sunholo-0.84.7}/sunholo/database/alloydb_client.py

@@ -71,7 +71,9 @@ class AlloyDBClient:
         if ALLOYDB_DB is None and alloydb_config.get("database") is None:
             log.warning("Could not locate ALLOYDB_DB environment variable or 'alloydb_config.database'")
         
-        self.database = db or alloydb_config.get("database") or ALLOYDB_DB
+        self.database = alloydb_config.get("database") or ALLOYDB_DB or db
+        if not self.database:
+            raise ValueError("Could not derive a database to query")
 
         self.user = user
         self.password = password
@@ -213,7 +215,7 @@ class AlloyDBClient:
 
         query = f"""
             SELECT page_content, source, langchain_metadata, images_gsurls, doc_id::text as doc_id
-            FROM {table_name}
+            FROM "{table_name}"
             WHERE doc_id = '{doc_id}'
             LIMIT 1;
         """

sunholo-0.84.7/sunholo/genai/__init__.py

@@ -0,0 +1,2 @@
+from .process_funcs_cls import GenAIFunctionProcessor
+from .safety import genai_safety

sunholo-0.84.7/sunholo/genai/process_funcs_cls.py

@@ -0,0 +1,210 @@
+import traceback
+
+from ..custom_logging import log
+from ..utils import ConfigManager
+from .safety import genai_safety
+
+from typing import TYPE_CHECKING
+
+try:
+    import google.generativeai as genai
+except ImportError:
+    genai = None
+
+if TYPE_CHECKING:
+    from google.generativeai.protos import Part
+
+class GenAIFunctionProcessor:
+    """
+    A generic class for processing function calls from google.generativeai function calling models.
+
+    This class provides a framework for handling multiple function calls in responses
+    from generative AI systems. Users of this class should subclass it and provide
+    their own implementation of the `construct_tools` method, which returns a dictionary
+    of function names mapped to their implementations.
+
+    Attributes:
+        config (ConfigManager): Configuration manager instance.
+        funcs (dict): A dictionary of function names mapped to their implementations.
+
+    Example usage:
+    ```python
+    class AlloyDBFunctionProcessor(GenAIFunctionProcessor):
+        def construct_tools(self) -> dict:
+            ...
+
+    config = ConfigManager()
+    alloydb_processor = AlloyDBFunctionProcessor(config)
+
+    results = alloydb_processor.process_funcs(full_response)
+
+    alloydb_model = alloydb_processor.get_model(
+        model_name="gemini-1.5-pro",
+        system_instruction="You are a helpful AlloyDB agent that helps users search and extract documents from the database."
+    )
+    ```
+    """
+
+    def __init__(self, config: ConfigManager):
+        """
+        Initializes the GenAIFunctionProcessor with the given configuration.
+
+        Args:
+            config (ConfigManager): The configuration manager instance.
+        """
+        if not genai:
+            raise ImportError("import google.generativeai as genai is required, import via `pip install sunholo[gcp]`")
+        
+        self.config = config
+        self.funcs = self.construct_tools()
+        self.model_name = config.vacConfig("model") or "gemini-1.5-flash"
+        self._validate_functions()
+
+    def construct_tools(self) -> dict:
+        """
+        Constructs a dictionary of tools (functions) specific to the application.
+
+        This method should be overridden in subclasses to provide the specific
+        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}
+
+        Raises:
+            NotImplementedError: If the method is not overridden in a subclass.
+        """
+        raise NotImplementedError("Subclasses must implement this method to return a dictionary of functions.")
+
+    def _validate_functions(self):
+        """
+        Validates that all functions in the `funcs` dictionary have docstrings.
+
+        This method checks each function in the `funcs` dictionary to ensure it has
+        a docstring. If a function is missing a docstring, an error is logged, and
+        a `ValueError` is raised.
+
+        Raises:
+            ValueError: If any function is missing a docstring.
+        """
+        for func_name, func in self.funcs.items():
+            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 process_funcs(self, full_response, output_parts=True) -> list['Part'] | str:
+        """
+        Processes the functions based on the full_response from the generative model.
+
+        This method iterates through each part of the response, extracts function
+        calls and their parameters, and executes the corresponding functions defined
+        in the `funcs` dictionary.
+
+        Args:
+            full_response: The response object containing function calls.
+            output_parts (bool): Indicates whether to return structured parts or plain strings.
+
+        Returns:
+            list[Part] | str: A list of Part objects or a formatted string with the results.
+
+        Example usage:
+        ```python
+        results = alloydb_processor.process_funcs(full_response)
+        ```
+        """
+        api_requests_and_responses = []
+
+        # Loop through each part in the response to handle multiple function calls
+        #TODO: async
+        for part in full_response.candidates[0].content.parts:
+            if fn := part.function_call:
+                # Extract parameters for the function call
+                function_name = fn.name
+                params = {key: val for key, val in fn.args.items()}
+                log.info(f"Executing {function_name} with params {params}")
+
+                # Check if the function is in our dictionary of available functions
+                if function_name in self.funcs:
+                    try:
+                        # Execute the function with the provided parameters
+                        result = self.funcs[function_name](**params)
+                        log.info(f"Got result from {function_name}: {result}")
+                    except Exception as err:
+                        error_message = f"Error in {function_name}: {str(err)}"
+                        traceback_details = traceback.format_exc()
+                        log.warning(f"{error_message}\nTraceback: {traceback_details}")
+                        result = [f"{error_message}\n{traceback_details}"]
+
+                    api_requests_and_responses.append(
+                        [function_name, params, result]
+                    )
+                else:
+                    log.error(f"Function {function_name} is not recognized")
+
+        log.info(f"{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
+
+        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>"
+            )
+
+        return strings
+
+    def get_model(self, system_instruction: str, generation_config=None, model_name: str=None):
+        """
+        Constructs and returns the generative AI model configured with the tools.
+
+        This method creates a generative AI model using the tools defined in the
+        `funcs` dictionary and the provided configuration options.
+
+        Args:
+            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.
+
+        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",
+            system_instruction="You are a helpful AlloyDB agent that helps users search and extract documents from the database."
+        )
+        ```
+        """
+        if generation_config is None:
+            generation_config = {
+                "temperature": 0.1,
+                "max_output_tokens": 4000,
+            }
+
+        # Extract the functions from the dictionary to pass into the model
+        tools = list(self.funcs.values())
+
+        try:
+            model = genai.GenerativeModel(
+                model_name=model_name or self.model_name,
+                tools=tools,
+                generation_config=generation_config,
+                safety_settings=genai_safety(),
+                system_instruction=system_instruction,
+            )
+            return model
+        except Exception as err:
+            log.error(f"Error initializing model: {str(err)}")
+            return None

sunholo-0.84.7/sunholo/genai/safety.py

@@ -0,0 +1,32 @@
+
+def genai_safety(threshold: str = "BLOCK_ONLY_HIGH"):
+    """
+    BLOCK_ONLY_HIGH - block when high probability of unsafe content is detected
+    BLOCK_MEDIUM_AND_ABOVE - block when medium or high probability of content is detected
+    BLOCK_LOW_AND_ABOVE - block when low, medium, or high probability of unsafe content is detected
+    BLOCK_NONE - no block, but need to be on an allow list to use
+    """
+    from google.generativeai.types import (
+        HarmCategory,
+        HarmBlockThreshold
+    )
+
+    if threshold == 'BLOCK_ONLY_HIGH':
+        thresh = HarmBlockThreshold.BLOCK_ONLY_HIGH
+    elif threshold == 'BLOCK_MEDIUM_AND_ABOVE':
+        thresh = HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE
+    elif threshold == 'BLOCK_LOW_AND_ABOVE':
+        thresh = HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
+    elif threshold == 'BLOCK_NONE':
+        thresh = HarmBlockThreshold.BLOCK_NONE
+    else:
+        raise ValueError("Invalid threshold")
+
+    safety_settings = {
+        HarmCategory.HARM_CATEGORY_HARASSMENT: thresh,
+        HarmCategory.HARM_CATEGORY_HATE_SPEECH: thresh,
+        HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: thresh,
+        HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: thresh,
+    }
+
+    return safety_settings

{sunholo-0.84.3 → sunholo-0.84.7}/sunholo/utils/parsers.py

@@ -181,9 +181,14 @@ def escape_braces(text):
     Returns:
         str: The modified string with single braces converted to double braces.
     """
-    # Replace single braces with double braces
-    text = re.sub(r'(?<!{){(?!{)', '{{', text)  # Replace '{' with '{{' if not already double braced
-    text = re.sub(r'(?<!})}(?!})', '}}', text)  # Replace '}' with '}}' if not already double braced
+    # First, handle cases where there might be a mix of braces
+    # Replace all `{` that are not followed by another `{` with `{{`
+    text = re.sub(r'(?<!{){(?!{)', '{{', text)
+    
+    # Replace all `}` that are not preceded by another `}` with `}}`
+    text = re.sub(r'(?<!})}(?!})', '}}', text)
+
+    # After escaping single braces, return the modified text
     return text
 
 def get_clean_website_name(url: str):

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.84.3
+Version: 0.84.7
 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.3.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.7.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.84.3 → sunholo-0.84.7}/sunholo.egg-info/SOURCES.txt

@@ -93,6 +93,9 @@ sunholo/gcs/add_file.py
 sunholo/gcs/download_folder.py
 sunholo/gcs/download_url.py
 sunholo/gcs/metadata.py
+sunholo/genai/__init__.py
+sunholo/genai/process_funcs_cls.py
+sunholo/genai/safety.py
 sunholo/invoke/__init__.py
 sunholo/invoke/async_class.py
 sunholo/invoke/direct_vac_func.py