sunholo 0.56.2__tar.gz → 0.56.5__tar.gz

{sunholo-0.56.2 → sunholo-0.56.5}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.56.2
+Version: 0.56.5
 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.56.2.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.56.5.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -27,6 +27,7 @@ Requires-Dist: flask; extra == "all"
 Requires-Dist: google-cloud-aiplatform; extra == "all"
 Requires-Dist: google-api-python-client; extra == "all"
 Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "all"
+Requires-Dist: google-cloud-build; extra == "all"
 Requires-Dist: google-cloud-logging; extra == "all"
 Requires-Dist: google-cloud-storage; extra == "all"
 Requires-Dist: google-cloud-pubsub; extra == "all"
@@ -52,6 +53,7 @@ Requires-Dist: pg8000; extra == "database"
 Requires-Dist: lancedb; extra == "database"
 Provides-Extra: gcp
 Requires-Dist: google-cloud-aiplatform; extra == "gcp"
+Requires-Dist: google-cloud-build; extra == "gcp"
 Requires-Dist: google-cloud-storage; extra == "gcp"
 Requires-Dist: google-cloud-logging; extra == "gcp"
 Requires-Dist: google-cloud-pubsub; extra == "gcp"

{sunholo-0.56.2 → sunholo-0.56.5}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.56.2'
+version = '0.56.5'
 
 setup(
     name='sunholo',
@@ -40,6 +40,7 @@ setup(
             "google-cloud-aiplatform",
             "google-api-python-client",
             "google-cloud-alloydb-connector[pg8000]",
+            "google-cloud-build",
             "google-cloud-logging",
             "google-cloud-storage",
             "google-cloud-pubsub",
@@ -67,6 +68,7 @@ setup(
         ],
         'gcp': [
             "google-cloud-aiplatform",
+            "google-cloud-build",
             "google-cloud-storage",
             "google-cloud-logging",
             "google-cloud-pubsub",

sunholo-0.56.5/sunholo/cli/cli.py

@@ -0,0 +1,82 @@
+import argparse
+try:
+    from google.cloud import build_v1
+except ImportError:
+    build_v1 = None
+
+from ..logging import log
+
+def trigger_build(args):
+    """
+    Triggers a Google Cloud Build using an existing build trigger configured in GCP.
+
+    Args:
+        args: argparse.Namespace containing the command line arguments specified for the 'deploy' command.
+
+    Example:
+        trigger_build(args) where args contains project_id, trigger_id, repo_name, and branch_name.
+    """
+    if not build_v1:
+        log.warning("Can't deploy - google-cloud-build not installed, enable via `pip install sunholo[gcp]")
+
+        return None
+
+    client = build_v1.services.cloud_build.CloudBuildClient()
+    # Assuming the build source uses the path to the cloudbuild.yaml if specified.
+    source = build_v1.RepoSource(
+        project_id=args.project_id, 
+        repo_name=args.repo_name, 
+        branch_name=args.branch_name,
+        substitutions=args.substitutions,
+        dir=args.config_path  # Path to directory containing cloudbuild.yaml
+    )
+    request = build_v1.RunBuildTriggerRequest(
+        project_id=args.project_id, 
+        trigger_id=args.trigger_id, 
+        source=source
+    )
+    operation = client.run_build_trigger(request)
+    print(f"Triggered build with id: {operation.metadata.build.id}")
+
+def setup_deploy_subparser(subparsers):
+    """
+    Sets up an argparse subparser for the 'deploy' command.
+
+    Example command:
+    ```bash
+    sunholo deploy --project_id "my-gcp-project" --trigger_id "my-trigger-id" --repo_name "my-repo"
+    ```
+    """
+    deploy_parser = subparsers.add_parser('deploy', help='Triggers a deployment using an existing Google Cloud Build trigger.')
+    deploy_parser.add_argument('--project_id', required=True, help='Google Cloud Project ID required for deployment.')
+    deploy_parser.add_argument('--trigger_id', required=True, help='Google Cloud Build Trigger ID required for deployment.')
+    deploy_parser.add_argument('--repo_name', required=True, help='Name of the linked repository in Google Cloud Source Repositories required for deployment.')
+    deploy_parser.add_argument('--branch_name', default='main', help='Branch name to trigger the build from, defaults to "main".')
+    deploy_parser.add_argument('--config_path', default='.', help='Path to the directory containing the cloudbuild.yaml file, defaults to current directory.')
+    deploy_parser.set_defaults(func=trigger_build)
+
+def main(args=None):
+    """
+    Entry point for the sunholo console script. This function parses command line arguments
+    and invokes the appropriate functionality based on the user input.
+
+    Example commands:
+    ```bash
+    sunholo deploy --project_id "my-gcp-project" --trigger_id "my-trigger-id" --repo_name "my-repo" --branch_name "dev" --config_path "app/vac/my_vac/"
+    ```
+    """
+    parser = argparse.ArgumentParser(description="sunholo CLI tool for deploying applications using Google Cloud Build.")
+    subparsers = parser.add_subparsers(title='commands', description='Valid commands', help='`sunholo deploy --help`', dest='command', required=True)
+
+    # Setup deploy command
+    setup_deploy_subparser(subparsers)
+
+    args = parser.parse_args(args)
+
+    if hasattr(args, 'func'):
+        args.func(args)
+    else:
+        parser.print_help()
+
+if __name__ == "__main__":
+    main()

{sunholo-0.56.2 → sunholo-0.56.5}/sunholo/logging.py

@@ -214,9 +214,6 @@ def setup_logging(logger_name=None, log_level=logging.INFO, project_id=None):
     if is_logging_setup(logger):
         return logger
     
-    if project_id is None:
-        project_id = get_gcp_project()
-
     if logger_name is None:
         logger_name = "sunholo"
 
@@ -227,6 +224,8 @@ def setup_logging(logger_name=None, log_level=logging.INFO, project_id=None):
         print("Found GOOGLE_CLOUD_LOGGING=1 but no GCP Client available, install via `pip install sunholo[gcp]` and/or authenticate")
 
     if Client and os.environ.get('GOOGLE_CLOUD_LOGGING') == "1":
+        if project_id is None:
+            project_id = get_gcp_project()
         # Instantiate the GoogleCloudLogging class
         gc_logger = GoogleCloudLogging(project_id, log_level=log_level, logger_name=logger_name)
     else:

{sunholo-0.56.2 → sunholo-0.56.5}/sunholo/qna/retry.py

@@ -33,7 +33,7 @@ def retry_qna(qa_function, question, max_retries=1, initial_delay=5):
             except ReadTimeout:
                 if retry == max_retries - 1:
                     raise
-        except Exception as err:
+        except Exception:
             delay = initial_delay * (retry + 1)
             log.error(f"General error: {traceback.format_exc()}")
             time.sleep(delay)

{sunholo-0.56.2 → sunholo-0.56.5}/sunholo/streaming/streaming.py

@@ -23,6 +23,7 @@ from ..qna.parsers import parse_output
 
 from ..logging import log
 from ..utils import load_config_key
+from ..utils.parsers import check_kwargs_support
 
 from .langserve import parse_langserve_token, parse_langserve_token_async
 
@@ -34,6 +35,9 @@ def start_streaming_chat(question,
                          wait_time=2,
                          timeout=120, # Timeout in seconds (2 minutes)
                          **kwargs): 
+    
+    if not check_kwargs_support(qna_func):
+        yield "No **kwargs in qna_func - please add it"
 
     # Immediately yield to indicate the process has started.
     yield "Thinking...\n"
@@ -49,7 +53,10 @@ def start_streaming_chat(question,
     def start_chat(stop_event, result_queue, exception_queue):
         # autogen_qna(user_input, vector_name, chat_history=None):
         try:
-            final_result = qna_func(question, vector_name, chat_history, callback=chat_callback_handler, **kwargs)
+            final_result = qna_func(question=question, 
+                                    vector_name=vector_name, 
+                                    chat_history=chat_history, 
+                                    callback=chat_callback_handler, **kwargs)
             result_queue.put(final_result)
         except Exception as e:
             exception_queue.put(e)

sunholo-0.56.5/sunholo/utils/__init__.py

@@ -0,0 +1 @@
+from .config import load_config_key, load_config

{sunholo-0.56.2 → sunholo-0.56.5}/sunholo/utils/config.py

@@ -18,54 +18,6 @@ import yaml
 from datetime import datetime, timedelta
 from collections import defaultdict
 
-try:
-    from google.cloud import storage
-except ImportError:
-    storage = None
-
-def fetch_config(bucket_name: str, blob_name: str):
-    """
-    Fetch the configuration file from a Google Cloud Storage bucket.
-
-    Args:
-        bucket_name (str): The name of the GCS bucket.
-        blob_name (str): The name of the blob/file to fetch.
-
-    Returns:
-        datetime or None: The last modified time of the file, or None if the blob does not exist.
-
-    Example:
-    ```python
-    last_updated = fetch_config('my-bucket', 'config.yaml')
-    if last_updated:
-        print(f'Configuration file was last updated on {last_updated}')
-    else:
-        print('Configuration file not found in the specified bucket.')
-    ```
-    """
-    from ..logging import log
-
-    if not storage:
-        log.debug("No google.cloud.storage client installed. Skipping config load from bucket")
-        return None
-    
-    storage_client = storage.Client()
-
-    bucket = storage_client.bucket(bucket_name)
-    blob = storage.Blob(blob_name, bucket)
-
-    # Check if the file exists
-    if not blob.exists():
-        log.info(f"The blob {blob_name} does not exist in the bucket {bucket_name}")
-        return None
-
-    # Download the file to a local file
-    blob.download_to_filename(blob_name)
-
-    # Get the blob's updated time
-    updated_time = blob.updated
-
-    return updated_time
 
 def get_module_filepath(filepath: str):
     """
@@ -105,11 +57,14 @@ def load_all_configs():
     from ..logging import log
 
     config_folder = os.getenv("_CONFIG_FOLDER", os.getcwd())
-    log.debug(f"Loading all configs from folder: {config_folder}")
+    config_folder = os.path.join(config_folder, "config")
+
+    log.info(f"Loading all configs from folder: {config_folder}")
     current_time = datetime.now()
 
     configs_by_kind = defaultdict(dict)
     for filename in os.listdir(config_folder):
+        log.info(f"config file: {filename}")
         if filename.endswith(('.yaml', '.yml', '.json')):
             config_file = os.path.join(config_folder, filename)
             
@@ -117,7 +72,7 @@ def load_all_configs():
             if filename in config_cache:
                 cached_config, cache_time = config_cache[filename]
                 if (current_time - cache_time) < timedelta(minutes=5):
-                    log.debug(f"Returning cached config for {filename}")
+                    log.info(f"Returning cached config for {filename}")
                     config = cached_config
                 else:
                     config = reload_config_file(config_file, filename)
@@ -234,6 +189,17 @@ def load_config_key(key: str, vector_name: str, filename: str=None, kind: str=No
     assert isinstance(vector_name, str), f"vector_name must be a string, got a {type(vector_name)}"
     
     configs_by_kind = load_all_configs()
+    log.info(f"configs by kind: {configs_by_kind}")
+
+    if kind:
+        log.info(f"Got kind: {kind} - applying to configs")
+    
+    if filename:
+        log.warning(f"Got filename argument: {filename} for config - deprecated - use `kind='vacConfig'` instead")
+    
+    if not configs_by_kind:
+        log.warning("Did not load configs via folder")
+             
     if kind and configs_by_kind.get(kind):
         config = configs_by_kind[kind]
         filename = kind

{sunholo-0.56.2 → sunholo-0.56.5}/sunholo/utils/parsers.py

@@ -118,4 +118,22 @@ def remove_whitespace(page_content: str):
     print(cleaned_text)  # Outputs 'Hello, world! This is an example.'
     ```
     """
-    return page_content.replace("\n", " ").replace("\r", " ").replace("\t", " ").replace("  ", " ")
+    return page_content.replace("\n", " ").replace("\r", " ").replace("\t", " ").replace("  ", " ")
+
+def check_kwargs_support(func):
+    """
+    Check if the function 'func' accepts arbitrary keyword arguments (**kwargs).
+
+    Args:
+    func (callable): The function to check.
+
+    Returns:
+    bool: True if **kwargs is accepted, False otherwise.
+    """
+    import inspect
+    
+    sig = inspect.signature(func)
+    for param in sig.parameters.values():
+        if param.kind == param.VAR_KEYWORD:
+            return True
+    return False

{sunholo-0.56.2 → sunholo-0.56.5}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.56.2
+Version: 0.56.5
 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.56.2.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.56.5.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -27,6 +27,7 @@ Requires-Dist: flask; extra == "all"
 Requires-Dist: google-cloud-aiplatform; extra == "all"
 Requires-Dist: google-api-python-client; extra == "all"
 Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "all"
+Requires-Dist: google-cloud-build; extra == "all"
 Requires-Dist: google-cloud-logging; extra == "all"
 Requires-Dist: google-cloud-storage; extra == "all"
 Requires-Dist: google-cloud-pubsub; extra == "all"
@@ -52,6 +53,7 @@ Requires-Dist: pg8000; extra == "database"
 Requires-Dist: lancedb; extra == "database"
 Provides-Extra: gcp
 Requires-Dist: google-cloud-aiplatform; extra == "gcp"
+Requires-Dist: google-cloud-build; extra == "gcp"
 Requires-Dist: google-cloud-storage; extra == "gcp"
 Requires-Dist: google-cloud-logging; extra == "gcp"
 Requires-Dist: google-cloud-pubsub; extra == "gcp"

{sunholo-0.56.2 → sunholo-0.56.5}/sunholo.egg-info/requires.txt

@@ -8,6 +8,7 @@ flask
 google-cloud-aiplatform
 google-api-python-client
 google-cloud-alloydb-connector[pg8000]
+google-cloud-build
 google-cloud-logging
 google-cloud-storage
 google-cloud-pubsub
@@ -38,6 +39,7 @@ lancedb
 
 [gcp]
 google-cloud-aiplatform
+google-cloud-build
 google-cloud-storage
 google-cloud-logging
 google-cloud-pubsub

sunholo-0.56.2/sunholo/__init__.py

@@ -1,34 +0,0 @@
-from . import agents
-from . import archive
-from . import auth
-from . import bots
-from . import chunker
-from . import components
-from . import database
-from . import embedder
-from . import gcs
-from . import langfuse
-from . import lookup
-from . import patches
-from . import qna
-from . import streaming
-from . import utils
-import logging
-
-__all__ = ['agents', 
-           'archive', 
-           'auth',
-           'bots',
-           'chunker', 
-           'components', 
-           'database', 
-           'embedder', 
-           'gcs', 
-           'langfuse', 
-           'lookup', 
-           'patches', 
-           'qna', 
-           'streaming', 
-           'utils', 
-           'logging']
-

sunholo-0.56.2/sunholo/cli/cli.py

@@ -1,12 +0,0 @@
-# sunholo/cli/cli.py
-import argparse
-
-def main():
-    parser = argparse.ArgumentParser(description="sunholo CLI tool.")
-    parser.add_argument('--echo', help='Echo the string you use here')
-    args = parser.parse_args()
-    if args.echo:
-        print(args.echo)
-
-if __name__ == "__main__":
-    main()

sunholo-0.56.2/sunholo/utils/__init__.py

@@ -1 +0,0 @@
-from .config import fetch_config, load_config_key, load_config