sunholo 0.86.1__tar.gz → 0.88.0__tar.gz

{sunholo-0.86.1 → sunholo-0.88.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.86.1
+Version: 0.88.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.1.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.88.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -64,6 +64,7 @@ Requires-Dist: playwright; extra == "all"
 Requires-Dist: psutil; extra == "all"
 Requires-Dist: psycopg2-binary; extra == "all"
 Requires-Dist: pypdf; extra == "all"
+Requires-Dist: python-hcl2; extra == "all"
 Requires-Dist: python-socketio; extra == "all"
 Requires-Dist: pytesseract; extra == "all"
 Requires-Dist: rich; extra == "all"
@@ -135,6 +136,8 @@ Provides-Extra: excel
 Requires-Dist: xlwings; extra == "excel"
 Requires-Dist: requests; extra == "excel"
 Requires-Dist: rich; extra == "excel"
+Provides-Extra: iac
+Requires-Dist: python-hcl2; extra == "iac"
 
 ## Introduction
 This is the Sunholo Python project, a comprehensive toolkit for working with language models and vector stores on Google Cloud Platform. It provides a wide range of functionalities and utilities to facilitate the development and deployment of language model applications.

{sunholo-0.86.1 → sunholo-0.88.0}/setup.py

@@ -1,7 +1,6 @@
 from setuptools import setup, find_packages
 
-# Define your base version
-version = '0.86.1'
+version = '0.88.0'
 
 setup(
     name='sunholo',
@@ -29,7 +28,6 @@ setup(
     install_requires=[
         # Base dependencies
         "google-auth", # to check if on gcp
-        #"tenacity==8.3.0", #TODO: remove soon
         "ruamel.yaml",
         "langchain>=0.2.12",
         "langchain_experimental>=0.0.61",
@@ -78,6 +76,7 @@ setup(
             "psutil",
             "psycopg2-binary",
             "pypdf",
+            "python-hcl2",
             "python-socketio",
             "pytesseract",
             "rich",
@@ -160,6 +159,9 @@ setup(
             'xlwings',
             'requests',
             'rich'
+        ],
+        'iac':[
+            'python-hcl2'
         ]
 
     },

{sunholo-0.86.1 → sunholo-0.88.0}/sunholo/__init__.py

@@ -19,6 +19,7 @@ from . import patches
 from . import pubsub
 from . import qna
 from . import streaming
+from . import terraform
 from . import tools
 from . import utils
 from . import vertex
@@ -46,6 +47,7 @@ __all__ = ['agents',
            'pubsub',
            'qna', 
            'streaming', 
+           'terraform',
            'tools',
            'utils', 
            'vertex',

{sunholo-0.86.1 → sunholo-0.88.0}/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-0.86.1 → sunholo-0.88.0}/sunholo/cli/cli.py

@@ -12,6 +12,7 @@ from .swagger import setup_swagger_subparser
 from .vertex import setup_vertex_subparser
 from ..llamaindex import setup_llamaindex_subparser
 from ..excel import setup_excel_subparser
+from ..terraform import setup_tfvarseditor_subparser
 
 from ..utils import ConfigManager
 from ..utils.version import sunholo_version
@@ -65,13 +66,13 @@ def main(args=None):
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
     parser.add_argument('--project', default=default_project, help='GCP project to list Cloud Run services from.')
     parser.add_argument('--region', default=default_region, help='Region to list Cloud Run services from.')
-    parser.add_argument('--version', action='store_true', help='Show the version and exit') 
+    parser.add_argument('-v', '--version', action='store_true', help='Show the version and exit')
 
     subparsers = parser.add_subparsers(title='commands', 
                                        description='Valid commands', 
                                        help='Commands', 
                                        dest='command', 
-                                       required=True)
+                                       required=False)
 
     # deploy command
     setup_deploy_subparser(subparsers)
@@ -95,11 +96,18 @@ def main(args=None):
     setup_llamaindex_subparser(subparsers)
     # excel
     setup_excel_subparser(subparsers)
+    # terraform
+    setup_tfvarseditor_subparser(subparsers)
 
     #TODO: add database setup commands: alloydb and supabase
 
     args = parser.parse_args(args)
 
+    # Handle global flags
+    if args.version:
+        console.print(sunholo_version())
+        return
+
     if args.debug:
         log.setLevel(logging.DEBUG)
         logging.getLogger().setLevel(logging.DEBUG)
@@ -107,14 +115,9 @@ def main(args=None):
         log.setLevel(logging.WARNING)
         logging.getLogger().setLevel(logging.WARNING)
 
-    if args.version:
-        sunholo_version()
-        return
-
+    # Handle subcommand
     if hasattr(args, 'func'):
         args.func(args)
     else:
         parser.print_help()
 
-if __name__ == "__main__":
-    main()

{sunholo-0.86.1 → sunholo-0.88.0}/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-0.86.1 → sunholo-0.88.0}/sunholo/genai/process_funcs_cls.py

@@ -202,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:
@@ -284,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.88.0/sunholo/terraform/__init__.py

@@ -0,0 +1 @@
+from .tfvars_editor import setup_tfvarseditor_subparser, TerraformVarsEditor

sunholo-0.88.0/sunholo/terraform/tfvars_editor.py

@@ -0,0 +1,270 @@
+try:
+    import hcl2
+except ImportError:
+    hcl2 = None
+
+import json
+import subprocess
+import os
+from typing import Dict, Any
+from ..custom_logging import log
+
+try:
+    from ..cli.sun_rich import console
+except ImportError:
+    console = None
+
+class TerraformVarsEditor:
+    """
+    A class to manage and safely edit Terraform .tfvars files.
+
+    This class allows you to update specific keys in a .tfvars file with new data
+    and ensures that the changes only take effect if Terraform validation passes.
+
+    Attributes:
+    ----------
+    tfvars_file : str
+        The path to the .tfvars file to be edited.
+    terraform_dir : str
+        The directory where Terraform commands will be executed (default is current directory).
+    tfvars_data : dict
+        The content of the .tfvars file loaded into a dictionary.
+    
+    Methods:
+    -------
+    _load_tfvars() -> Dict[str, Any]
+        Loads the .tfvars file into a dictionary.
+    _save_tfvars() -> None
+        Saves the current state of the dictionary back to the .tfvars file.
+    _backup_tfvars() -> str
+        Creates a backup of the current .tfvars file.
+    _restore_tfvars(backup_file: str) -> None
+        Restores the .tfvars file from the backup.
+    update_or_add_instance(main_key: str, instance_name: str, instance_data: Dict[str, Any]) -> None
+        Adds or updates an instance under a specified top-level key in the .tfvars file.
+    validate_terraform() -> bool
+        Runs `terraform validate` in the specified directory.
+    update_from_json(json_file: str, main_key: str) -> None
+        Updates the .tfvars file based on the content of a JSON file and validates the changes.
+    """
+
+    def __init__(self, tfvars_file: str, terraform_dir: str = '.') -> None:
+        """
+        Initializes the TerraformVarsEditor with the given .tfvars file and Terraform directory.
+
+        Parameters:
+        ----------
+        tfvars_file : str
+            The path to the .tfvars file to be edited.
+        terraform_dir : str
+            The directory where Terraform commands will be executed (default is current directory).
+
+        Example:
+        -------
+        editor = TerraformVarsEditor('example.tfvars', '/path/to/terraform/config')
+        """
+        if hcl2 is None:
+            raise ImportError('hcl2 is required for parsing terraform files, install via `pip install sunholo[iac]`')
+        
+        self.tfvars_file = tfvars_file
+        self.terraform_dir = terraform_dir
+        self.tfvars_data = self._load_tfvars()
+
+    def _load_tfvars(self) -> Dict[str, Any]:
+        """
+        Loads the .tfvars file into a dictionary.
+
+        Returns:
+        -------
+        dict
+            The content of the .tfvars file.
+
+        Example:
+        -------
+        data = self._load_tfvars()
+        """
+        with open(self.tfvars_file, 'r') as file:
+            return hcl2.load(file)
+
+    def _save_tfvars(self) -> None:
+        """
+        Saves the current state of the dictionary back to the .tfvars file.
+
+        Example:
+        -------
+        self._save_tfvars()
+        """
+        with open(self.tfvars_file, 'w') as file:
+            for key, value in self.tfvars_data.items():
+                file.write(f'{key} = {json.dumps(value, indent=2)}\n')
+
+    def _backup_tfvars(self) -> str:
+        """
+        Creates a backup of the current .tfvars file.
+
+        Returns:
+        -------
+        str
+            The path to the backup file.
+
+        Example:
+        -------
+        backup_file = self._backup_tfvars()
+        """
+        backup_file = f"{self.tfvars_file}.bak"
+        os.rename(self.tfvars_file, backup_file)
+        return backup_file
+
+    def _restore_tfvars(self, backup_file: str) -> None:
+        """
+        Restores the .tfvars file from the backup.
+
+        Parameters:
+        ----------
+        backup_file : str
+            The path to the backup file to restore from.
+
+        Example:
+        -------
+        self._restore_tfvars('example.tfvars.bak')
+        """
+        os.rename(backup_file, self.tfvars_file)
+
+    def update_or_add_instance(self, main_key: str, instance_name: str, instance_data: Dict[str, Any]) -> None:
+        """
+        Adds or updates an instance under a specified top-level key in the .tfvars file.
+
+        Parameters:
+        ----------
+        main_key : str
+            The top-level key in the .tfvars file (e.g., "cloud_run").
+        instance_name : str
+            The name of the instance to add or update.
+        instance_data : dict
+            The dictionary containing the instance data.
+
+        Example:
+        -------
+        editor.update_or_add_instance('cloud_run', 'new_service', {'cpu': '1', 'memory': '2Gi'})
+        """
+        if main_key not in self.tfvars_data:
+            self.tfvars_data[main_key] = {}
+
+        self.tfvars_data[main_key][instance_name] = instance_data
+
+    def validate_terraform(self) -> bool:
+        """
+        Runs `terraform validate` in the specified directory.
+
+        Returns:
+        -------
+        bool
+            True if validation passes, False otherwise.
+
+        Example:
+        -------
+        if self.validate_terraform():
+            print("Validation passed.")
+        """
+        result = subprocess.run(['terraform', 'validate'], cwd=self.terraform_dir, capture_output=True, text=True)
+        
+        if result.returncode == 0:
+            log.info("Terraform validation passed.")
+            return True
+        else:
+            log.error("Terraform validation failed.")
+            print(result.stdout)
+            print(result.stderr)
+            return False
+
+    def update_from_json(self, json_file: str, main_key: str) -> None:
+        """
+        Updates the .tfvars file based on the content of a JSON file and validates the changes.
+
+        Parameters:
+        ----------
+        json_file : str
+            The path to the JSON file with the new instance data.
+        main_key : str
+            The top-level key in the .tfvars file (e.g., "cloud_run").
+
+        Example:
+        -------
+        editor.update_from_json('update.json', 'cloud_run')
+        """
+        with open(json_file, 'r') as file:
+            data = json.load(file)
+
+        # Update the tfvars data in memory
+        for instance_name, instance_data in data.get(main_key, {}).items():
+            self.update_or_add_instance(main_key, instance_name, instance_data)
+
+        # Backup the original .tfvars file
+        backup_file = self._backup_tfvars()
+
+        # Temporarily save the updated data to the original file location
+        self._save_tfvars()
+
+        # Attempt to validate the changes with Terraform
+        if not self.validate_terraform():
+            # If validation fails, restore the original file from the backup
+            self._restore_tfvars(backup_file)
+            log.error(f"Changes aborted, original {self.tfvars_file} restored.")
+        else:
+            log.info(f"Terraform validation passed, changes saved to {self.tfvars_file}.")
+            os.remove(backup_file)  # Remove the backup if validation passes
+
+def tfvars_command(args):
+    """
+    Executes the tfvars command based on parsed arguments.
+
+    Args:
+        args: The parsed command-line arguments.
+    """
+
+    if console is None:
+        raise ImportError("Need cli tools to use `sunholo tfvars` - install via `pip install sunholo[cli]`")
+    
+    # Parse the JSON string to a dictionary
+    try:
+        instance_data: Dict[str, Any] = json.loads(args.json_data)
+    except json.JSONDecodeError as e:
+        console.print(f"[bold red]Error parsing JSON data: {e}[/bold red]")
+        return
+
+    # Create an instance of TerraformVarsEditor
+    editor = TerraformVarsEditor(args.tfvars_file, args.terraform_dir)
+
+    # Add or update the instance
+    editor.update_or_add_instance(args.main_key, args.instance_name, instance_data)
+
+    # Validate the Terraform configuration
+    if editor.validate_terraform():
+        console.print(f"Successfully updated '{args.instance_name}' under '{args.main_key}' in '{args.tfvars_file}'.")
+    else:
+        console.print(f"[bold red]Failed to update '{args.instance_name}'. The changes have been rolled back.[/bold red]")
+
+def setup_tfvarseditor_subparser(subparsers):
+    """
+    Sets up an argparse subparser for the 'tfvars' command.
+
+    Args:
+        subparsers: The subparsers object from argparse.ArgumentParser().
+    """
+    # TFVars subparser setup
+    tfvars_parser = subparsers.add_parser('tfvars', help='Manage Terraform .tfvars files')
+    tfvars_subparsers = tfvars_parser.add_subparsers(dest='action', help='TFVars subcommands')
+
+    # TFVars add command
+    add_parser = tfvars_subparsers.add_parser('add', help='Add or update an instance in a .tfvars file')
+    add_parser.add_argument('tfvars_file', help='Path to the .tfvars file')
+    add_parser.add_argument('main_key', help='The main key under which the instance is added (e.g., "cloud_run")')
+    add_parser.add_argument('instance_name', help='The name of the instance to add or update')
+    add_parser.add_argument('json_data', help='JSON string representing the instance data')
+    add_parser.add_argument('--terraform-dir', default='.', help='The directory where Terraform is initialized')
+
+    tfvars_parser.set_defaults(func=tfvars_command)
+
+    # If no subcommand is provided, print the help message
+    tfvars_parser.set_defaults(func=lambda args: tfvars_parser.print_help() if args.action is None else tfvars_command)
+

{sunholo-0.86.1 → sunholo-0.88.0}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.86.1
+Version: 0.88.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.1.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.88.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -64,6 +64,7 @@ Requires-Dist: playwright; extra == "all"
 Requires-Dist: psutil; extra == "all"
 Requires-Dist: psycopg2-binary; extra == "all"
 Requires-Dist: pypdf; extra == "all"
+Requires-Dist: python-hcl2; extra == "all"
 Requires-Dist: python-socketio; extra == "all"
 Requires-Dist: pytesseract; extra == "all"
 Requires-Dist: rich; extra == "all"
@@ -135,6 +136,8 @@ Provides-Extra: excel
 Requires-Dist: xlwings; extra == "excel"
 Requires-Dist: requests; extra == "excel"
 Requires-Dist: rich; extra == "excel"
+Provides-Extra: iac
+Requires-Dist: python-hcl2; extra == "iac"
 
 ## Introduction
 This is the Sunholo Python project, a comprehensive toolkit for working with language models and vector stores on Google Cloud Platform. It provides a wide range of functionalities and utilities to facilitate the development and deployment of language model applications.

{sunholo-0.86.1 → sunholo-0.88.0}/sunholo.egg-info/SOURCES.txt

@@ -130,6 +130,8 @@ sunholo/streaming/stream_lookup.py
 sunholo/streaming/streaming.py
 sunholo/summarise/__init__.py
 sunholo/summarise/summarise.py
+sunholo/terraform/__init__.py
+sunholo/terraform/tfvars_editor.py
 sunholo/tools/__init__.py
 sunholo/tools/web_browser.py
 sunholo/utils/__init__.py

{sunholo-0.86.1 → sunholo-0.88.0}/sunholo.egg-info/requires.txt

@@ -45,6 +45,7 @@ playwright
 psutil
 psycopg2-binary
 pypdf
+python-hcl2
 python-socketio
 pytesseract
 rich
@@ -110,6 +111,9 @@ langfuse
 python-socketio
 requests
 
+[iac]
+python-hcl2
+
 [openai]
 langchain-openai
 tiktoken