sunholo 0.84.5__tar.gz → 0.84.8__tar.gz

{sunholo-0.84.5 → sunholo-0.84.8}/PKG-INFO

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

{sunholo-0.84.5 → sunholo-0.84.8}/setup.py

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

sunholo-0.84.8/sunholo/genai/__init__.py

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

{sunholo-0.84.5 → sunholo-0.84.8}/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,28 +24,26 @@ 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:
-        # Subclassing GenAIFunctionProcessor for a specific application (e.g., AlloyDB)
-        class AlloyDBFunctionProcessor(GenAIFunctionProcessor):
-            def construct_tools(self) -> dict:
-                # Implement function mapping specific to AlloyDB
-                ...
 
-        # Creating an instance of the subclass and using it
-        config = ConfigManager()
-        alloydb_processor = AlloyDBFunctionProcessor(config)
+    ```python
+    class AlloyDBFunctionProcessor(GenAIFunctionProcessor):
+        def construct_tools(self) -> dict:
+            pass
 
-        # Processing functions based on a generative AI response
-        results = alloydb_processor.process_funcs(full_response)
+    config = ConfigManager()
+    alloydb_processor = AlloyDBFunctionProcessor(config)
 
-        # Getting the configured model
-        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."
-        )
+    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):
@@ -60,6 +58,7 @@ class GenAIFunctionProcessor:
         
         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:
@@ -70,7 +69,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.
@@ -93,7 +92,7 @@ class GenAIFunctionProcessor:
                 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:
+    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.
 
@@ -109,8 +108,12 @@ class GenAIFunctionProcessor:
             list[Part] | str: A list of Part objects or a formatted string with the results.
 
         Example usage:
-            results = alloydb_processor.process_funcs(full_response)
+        ```python
+        results = alloydb_processor.process_funcs(full_response)
+        ```
         """
+        from google.generativeai.protos import Part
+        
         api_requests_and_responses = []
 
         # Loop through each part in the response to handle multiple function calls
@@ -164,7 +167,7 @@ class GenAIFunctionProcessor:
 
         return strings
 
-    def get_model(self, model_name: str, system_instruction: str, generation_config=None):
+    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.
 
@@ -180,10 +183,13 @@ class GenAIFunctionProcessor:
             GenerativeModel: An instance of the GenerativeModel configured with the provided tools.
 
         Example usage:
-            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."
-            )
+
+        ```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 = {
@@ -196,7 +202,7 @@ class GenAIFunctionProcessor:
 
         try:
             model = genai.GenerativeModel(
-                model_name=model_name,
+                model_name=model_name or self.model_name,
                 tools=tools,
                 generation_config=generation_config,
                 safety_settings=genai_safety(),

{sunholo-0.84.5 → sunholo-0.84.8}/sunholo.egg-info/PKG-INFO

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