sunholo 0.86.0__py3-none-any.whl → 0.87.0__py3-none-any.whl

sunholo/agents/flask/vac_routes.py

@@ -53,10 +53,11 @@ if __name__ == "__main__":
 ```
     
     """
-    def __init__(self, app, stream_interpreter, vac_interpreter):
+    def __init__(self, app, stream_interpreter, vac_interpreter, additional_routes=None):
         self.app = app
         self.stream_interpreter = stream_interpreter
         self.vac_interpreter = vac_interpreter
+        self.additional_routes = additional_routes if additional_routes is not None else []
         self.register_routes()
 
     def register_routes(self):
@@ -82,6 +83,47 @@ if __name__ == "__main__":
         # OpenAI compatible endpoint
         self.app.route('/openai/v1/chat/completions', methods=['POST'])(self.handle_openai_compatible_endpoint)
         self.app.route('/openai/v1/chat/completions/<vector_name>', methods=['POST'])(self.handle_openai_compatible_endpoint)
+        # Register additional routes
+        self.register_additional_routes()
+
+    def register_additional_routes(self):
+        """
+        Registers additional custom routes provided during initialization.
+
+        Example:
+        ```python
+        from flask import Flask, jsonify
+        from agents.flask import VACRoutes
+
+        app = Flask(__name__)
+
+        def stream_interpreter(question, vector_name, chat_history, **kwargs):
+            # Implement your streaming logic
+            ...
+
+        def vac_interpreter(question, vector_name, chat_history, **kwargs):
+            # Implement your static VAC logic
+            ...
+
+        def custom_handler():
+            return jsonify({"message": "Custom route!"})
+
+        custom_routes = [
+            {
+                "rule": "/custom",
+                "methods": ["GET"],
+                "handler": custom_handler
+            }
+        ]
+
+        vac_routes = VACRoutes(app, stream_interpreter, vac_interpreter, additional_routes=custom_routes)
+
+        if __name__ == "__main__":
+            app.run(debug=True)
+        ```
+        """
+        for route in self.additional_routes:
+            self.app.route(route["rule"], methods=route["methods"])(route["handler"])
 
     def home(self):
         return jsonify("OK")
@@ -121,7 +163,7 @@ if __name__ == "__main__":
     def handle_stream_vac(self, vector_name):
         observed_stream_interpreter = observe()(self.stream_interpreter)
         prep = self.prep_vac(request, vector_name)
-        log.debug(f"Processing prep: {prep}")
+        log.info(f"Processing prep: {prep}")
         trace = prep["trace"]
         span = prep["span"]
         command_response = prep["command_response"]
@@ -438,8 +480,10 @@ if __name__ == "__main__":
                         data["image_uri"] = image_uri
                         data["mime"] = mime_type
                     except Exception as e:
+                        log.error(traceback.format_exc())
                         return jsonify({'error': str(e), 'traceback': traceback.format_exc()}), 500
                 else:
+                    log.error("No file selected")
                     return jsonify({"error": "No file selected"}), 400
         else:
             return jsonify({"error": "Unsupported content type"}), 400

sunholo/gcs/add_file.py

@@ -70,6 +70,8 @@ def handle_base64_image(base64_data: str, vector_name: str, extension: str):
 
 
 def resolve_bucket(vector_name):
+    bucket_name = None
+
     if os.getenv('EXTENSIONS_BUCKET'):
         log.warning('Resolving to EXTENSIONS_BUCKET environment variable')
         return os.getenv('EXTENSIONS_BUCKET')
@@ -144,6 +146,7 @@ def add_file_to_gcs(filename: str,
     hour_prev = (now - datetime.timedelta(hours=1)).strftime("%H")
 
     if os.getenv('EXTENSIONS_BUCKET'):
+        log.warning(f"setting {bucket_filepath=} to {os.path.basename(filename)} basename due to EXTENSIONS_BUCKET setting")
         bucket_filepath = os.path.basename(filename)
 
     if not vector_name:

sunholo/genai/process_funcs_cls.py

@@ -6,6 +6,8 @@ from .safety import genai_safety
 
 from typing import TYPE_CHECKING, Union
 
+import json
+
 try:
     import google.generativeai as genai
 except ImportError:
@@ -111,7 +113,7 @@ class GenAIFunctionProcessor:
                 Part(
                     function_response=genai.protos.FunctionResponse(
                         name=part[0],
-                        response={"result": part[2]}
+                        response={"result": part[2], "args": json.dumps(part[1])}
                     )
                 )
             )
@@ -146,6 +148,13 @@ class GenAIFunctionProcessor:
                 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 isinstance(result, dict) and isinstance(target_value, dict):
+                    for key, expected_value in target_value.items():
+                        if key in result:
+                            if result[key] == expected_value:
+                                log.info(f"The key '{key}' has the same value in both dictionaries.")
+                                return True
+                    return False
                 elif result == target_value:
                     log.info(f"Target value '{target_value}' found in the result of function '{function_name}'.")
                     return True
@@ -193,6 +202,10 @@ class GenAIFunctionProcessor:
         """
         api_requests_and_responses = []
 
+        if not full_response:
+            log.info("No response was found to process")
+            return 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:
@@ -275,7 +288,7 @@ class GenAIFunctionProcessor:
         if generation_config is None:
             generation_config = {
                 "temperature": 0.1,
-                "max_output_tokens": 4000,
+                "max_output_tokens": 8000,
             }
 
         # Extract the functions from the dictionary to pass into the model

{sunholo-0.86.0.dist-info → sunholo-0.87.0.dist-info}/METADATA

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

{sunholo-0.86.0.dist-info → sunholo-0.87.0.dist-info}/RECORD

@@ -14,7 +14,7 @@ sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhB
 sunholo/agents/flask/__init__.py,sha256=poJDKMr2qj8qMb99JqCvCPSiEt1tj2tLQ3hKW3f2aVw,107
 sunholo/agents/flask/base.py,sha256=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
 sunholo/agents/flask/qna_routes.py,sha256=uwUD1yrzOPH27m2AXpiQrPk_2VfJOQOM6dAynOWQtoQ,22532
-sunholo/agents/flask/vac_routes.py,sha256=aHVaWCfdOTMdtlbCdRbxn0cPQ1YZkUF0lG0xfNbbZUw,19575
+sunholo/agents/flask/vac_routes.py,sha256=aZ69r4V5s5EHzJ8Tht0KTuEiHrSPHFiwF8XYPOA_7Q0,21034
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
@@ -80,13 +80,13 @@ sunholo/embedder/embed_chunk.py,sha256=MCbTePWjUbIRVDFFhHJ94BvOZvIom62-mTr0PmfQy
 sunholo/excel/__init__.py,sha256=AqTMN9K4qJYi4maEgoORc5oxDVGO_eqmwzDaVP37JgY,56
 sunholo/excel/plugin.py,sha256=rl3FoECZ6Ts8KKExPrbPwr3u3CegZfsevmcjgUXAlhE,4033
 sunholo/gcs/__init__.py,sha256=SZvbsMFDko40sIRHTHppA37IijvJTae54vrhooEF5-4,90
-sunholo/gcs/add_file.py,sha256=TRbdEd3j-lFnyC7kqs5IWEPMPlDMFLR68fdTWga06Wo,8096
+sunholo/gcs/add_file.py,sha256=oSUCrTS_bdKJ-WcK8SAUCGEkS2noVbBhUBLwJRNxtpQ,8245
 sunholo/gcs/download_folder.py,sha256=ijJTnS595JqZhBH8iHFErQilMbkuKgL-bnTCMLGuvlA,1614
 sunholo/gcs/download_url.py,sha256=q1NiJSvEhdNrmU5ZJ-sBCMC_J5CxzrajY8LRgdPOV_M,6130
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/genai/__init__.py,sha256=dBl6IA3-Fx6-Vx81r0XqxHlUq6WeW1iDX188dpChu8s,115
 sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
-sunholo/genai/process_funcs_cls.py,sha256=8wLO45x6FTNbbTbNtgK8Xa_bm1mLyn5vOqoE9RPvE78,11839
+sunholo/genai/process_funcs_cls.py,sha256=lvbbUveb3h7h58hNyOK_-cchd7iobqhIRVD199isGHI,12449
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=bELcqIjzKvaupcIN5OQmDgGx_8jARtH9T6PCe8UgcvE,99
 sunholo/invoke/async_class.py,sha256=vmLT6DqE1YaPd4W88_QzPQvSzsjwLUAwt23vGZm-BEs,5767
@@ -141,9 +141,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=q_phxgGX2TG2j2MXNULF2xGzQnQPENwjPN9nZ_A9Gh0,7526
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.86.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.86.0.dist-info/METADATA,sha256=65x3Mmm4bllUh35pA4bDP7XDlfgVmZ1L_OdXX29fhIs,7598
-sunholo-0.86.0.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-sunholo-0.86.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.86.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.86.0.dist-info/RECORD,,
+sunholo-0.87.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.87.0.dist-info/METADATA,sha256=Sy38TeVoPDo6SPuonnZiDu9__xGrBb-rVPaHpUvToVc,7598
+sunholo-0.87.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+sunholo-0.87.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.87.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.87.0.dist-info/RECORD,,

{sunholo-0.86.0.dist-info → sunholo-0.87.0.dist-info}/WHEEL

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