sunholo 0.71.28__tar.gz → 0.72.0__tar.gz

{sunholo-0.71.28 → sunholo-0.72.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.71.28
+Version: 0.72.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.71.28.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.72.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -56,6 +56,7 @@ Requires-Dist: langchain-anthropic>=0.1.13; extra == "all"
 Requires-Dist: langfuse; extra == "all"
 Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
+Requires-Dist: pillow; extra == "all"
 Requires-Dist: playwright; extra == "all"
 Requires-Dist: psycopg2-binary; extra == "all"
 Requires-Dist: pypdf; extra == "all"
@@ -87,6 +88,8 @@ Requires-Dist: pytesseract; extra == "pipeline"
 Requires-Dist: tabulate; extra == "pipeline"
 Requires-Dist: unstructured[local-inference]; extra == "pipeline"
 Provides-Extra: gcp
+Requires-Dist: google-api-python-client; extra == "gcp"
+Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "gcp"
 Requires-Dist: google-auth-httplib2; extra == "gcp"
 Requires-Dist: google-auth-oauthlib; extra == "gcp"
 Requires-Dist: google-cloud-aiplatform; extra == "gcp"
@@ -100,8 +103,7 @@ Requires-Dist: google-cloud-discoveryengine; extra == "gcp"
 Requires-Dist: google-generativeai>=0.7.1; extra == "gcp"
 Requires-Dist: langchain-google-genai>=1.0.5; extra == "gcp"
 Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
-Requires-Dist: google-api-python-client; extra == "gcp"
-Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "gcp"
+Requires-Dist: pillow; extra == "gcp"
 Provides-Extra: openai
 Requires-Dist: langchain-openai; extra == "openai"
 Requires-Dist: tiktoken; extra == "openai"

{sunholo-0.71.28 → sunholo-0.72.0}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.71.28'
+version = '0.72.0'
 
 setup(
     name='sunholo',
@@ -71,6 +71,7 @@ setup(
             "langfuse",
             "pg8000",
             "pgvector",
+            "pillow",
             "playwright",
             "psycopg2-binary",
             "pypdf",
@@ -107,6 +108,8 @@ setup(
             "unstructured[local-inference]",
         ],
         'gcp': [
+            "google-api-python-client",
+            "google-cloud-alloydb-connector[pg8000]",
             "google-auth-httplib2",
             "google-auth-oauthlib",
             "google-cloud-aiplatform",
@@ -120,8 +123,8 @@ setup(
             "google-generativeai>=0.7.1",
             "langchain-google-genai>=1.0.5",
             "langchain_google_alloydb_pg>=0.2.2",
-            "google-api-python-client",
-            "google-cloud-alloydb-connector[pg8000]",
+            "pillow",
+
         ],
         'openai': [
             "langchain-openai",

{sunholo-0.71.28 → sunholo-0.72.0}/sunholo/gcs/__init__.py

@@ -1 +1 @@
-from .download_url import construct_download_link, get_bytes_from_gcs
+from .download_url import construct_download_link, get_bytes_from_gcs, get_image_from_gcs

{sunholo-0.71.28 → sunholo-0.72.0}/sunholo/gcs/download_url.py

@@ -14,12 +14,27 @@ except ImportError:
 
 from ..logging import log
 from ..utils.gcp import is_running_on_gcp
+from io import BytesIO
+try:
+    from PIL import Image
+except ImportError:
+    Image = None
 
 gcs_credentials = None
 project_id = None
 gcs_client = None
 gcs_bucket_cache = {}
 
+def get_image_from_gcs(gs_uri: str):
+    """Converts image bytes from GCS to a PIL Image object."""
+    image_bytes = get_bytes_from_gcs(gs_uri)
+    if not Image:
+        raise ImportError('Could not import PIL (pillow) - install via `pip install sunholo[gcp]`')
+    try:
+        img = Image.open(BytesIO(image_bytes))
+        return img
+    except IOError as e:
+        raise ValueError("Unable to open image from bytes:", e)
 
 def get_bytes_from_gcs(gs_uri):
     """

sunholo-0.72.0/sunholo/utils/__init__.py

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

sunholo-0.72.0/sunholo/utils/config_class.py

@@ -0,0 +1,207 @@
+import os
+import json
+import yaml
+from datetime import datetime, timedelta
+from collections import defaultdict
+from .timedelta import format_timedelta
+
+class ConfigManager:
+    def __init__(self, vector_name: str):
+        """
+        Initialize the ConfigManager with a vector name.
+
+        Args:
+            vector_name (str): The name of the vector in the configuration files.
+        
+        Example:
+        ```python
+        # Usage example:
+        config = ConfigManager("myVector")
+        agent = config.vacConfig("agent")
+        ```
+        """
+        self.vector_name = vector_name
+        self.config_cache = {}
+        self.config_folder = os.getenv("VAC_CONFIG_FOLDER", os.getcwd())
+        self.local_config_folder = os.path.join(os.getcwd(), "config")
+        self.configs_by_kind = self.load_all_configs()
+
+    def load_all_configs(self):
+        """
+        Load all configuration files from the specified directories into a dictionary.
+        Caching is used to avoid reloading files within a 5-minute window.
+
+        Returns:
+            dict: A dictionary of configurations grouped by their 'kind' key.
+        """
+        from ..logging import log
+
+        log.debug(f"Loading all configs from folder: {self.config_folder} and local folder: {self.local_config_folder}")
+        global_configs_by_kind = self._load_configs_from_folder(self.config_folder)
+        local_configs_by_kind = self._load_configs_from_folder(self.local_config_folder)
+
+        # Merge local configs into global configs
+        for kind, local_config in local_configs_by_kind.items():
+            if kind in global_configs_by_kind:
+                global_configs_by_kind[kind] = self._merge_dicts(global_configs_by_kind[kind], local_config)
+            else:
+                global_configs_by_kind[kind] = local_config
+
+        return global_configs_by_kind
+
+    def _load_configs_from_folder(self, folder):
+        """
+        Load all configuration files from a specific folder into a dictionary.
+
+        Args:
+            folder (str): The path of the folder to load configurations from.
+
+        Returns:
+            dict: A dictionary of configurations grouped by their 'kind' key.
+        """
+        from ..logging import log
+
+        configs_by_kind = defaultdict(dict)
+        current_time = datetime.now()
+        
+        for filename in os.listdir(folder):
+            if filename in ["cloudbuild.yaml", "cloud_run_urls.json"]:
+                continue
+            if filename.endswith(('.yaml', '.yml', '.json')):
+                config_file = os.path.join(folder, filename)
+                if filename in self.config_cache:
+                    cached_config, cache_time = self.config_cache[filename]
+                    time_to_recache = (current_time - cache_time)
+                    if time_to_recache < timedelta(minutes=5):
+                        config = cached_config
+                    else:
+                        config = self._reload_config_file(config_file, filename, folder == self.local_config_folder)
+                else:
+                    config = self._reload_config_file(config_file, filename, folder == self.local_config_folder)
+                kind = config.get('kind')
+                if kind:
+                    configs_by_kind[kind] = config
+                else:
+                    log.warning(f"No 'kind' found in {filename}")
+        return configs_by_kind
+
+    def _reload_config_file(self, config_file, filename, is_local=False):
+        """
+        Helper function to load a config file and update the cache.
+
+        Args:
+            config_file (str): The path to the configuration file.
+            filename (str): The name of the configuration file.
+            is_local (bool): Indicates if the config file is from the local folder.
+
+        Returns:
+            dict: The loaded configuration.
+        """
+        from ..logging import log
+        with open(config_file, 'r') as file:
+            if filename.endswith('.json'):
+                config = json.load(file)
+            else:
+                config = yaml.safe_load(file)
+        self.config_cache[filename] = (config, datetime.now())
+        log.debug(f"Loaded and cached {config_file}")
+        if is_local:
+            log.warning(f"Local configuration override for {filename}")
+        return config
+
+    def _check_and_reload_configs(self):
+        """
+        Check if configurations are older than 5 minutes and reload if necessary.
+        """
+        current_time = datetime.now()
+        for filename, (config, cache_time) in list(self.config_cache.items()):
+            if (current_time - cache_time) >= timedelta(minutes=5):
+                config_file_main = os.path.join(self.config_folder, filename)
+                config_file_local = os.path.join(self.local_config_folder, filename)
+                if os.path.exists(config_file_local):
+                    self._reload_config_file(config_file_local, filename, is_local=True)
+                if os.path.exists(config_file_main):
+                    self._reload_config_file(config_file_main, filename, is_local=False)
+        self.configs_by_kind = self.load_all_configs()
+
+    def _merge_dicts(self, dict1, dict2):
+        """
+        Recursively merge two dictionaries. Local values in dict2 will overwrite global values in dict1.
+
+        Args:
+            dict1 (dict): The global dictionary.
+            dict2 (dict): The local dictionary.
+
+        Returns:
+            dict: The merged dictionary.
+        """
+        for key, value in dict2.items():
+            if isinstance(value, dict) and key in dict1 and isinstance(dict1[key], dict):
+                dict1[key] = self._merge_dicts(dict1[key], value)
+            else:
+                dict1[key] = value
+        return dict1
+
+    def vacConfig(self, key: str):
+        """
+        Fetch a key from 'vacConfig' kind configuration.
+
+        Args:
+            key (str): The key to fetch from the configuration.
+
+        Returns:
+            str: The value associated with the specified key.
+        """
+        self._check_and_reload_configs()
+        config = self.configs_by_kind.get('vacConfig')
+        if not config:
+            return None
+        if self.vector_name == 'global':
+            return config.get(key)
+        vac = config['vac']
+
+        vac_config = vac.get(self.vector_name)
+        if not vac_config:
+            return None
+        return vac_config.get(key)
+
+    def promptConfig(self, key: str):
+        """
+        Fetch a key from 'promptConfig' kind configuration.
+
+        Args:
+            key (str): The key to fetch from the configuration.
+
+        Returns:
+            str: The value associated with the specified key.
+        """
+        self._check_and_reload_configs()
+        config = self.configs_by_kind.get('promptConfig')
+        if not config:
+            return None
+        prompts = config['prompts']
+        prompt_for_vector_name = prompts.get(self.vector_name)
+        if not prompt_for_vector_name:
+            return None
+        return prompt_for_vector_name.get(key)
+
+    def agentConfig(self, key: str):
+        """
+        Fetch a key from 'agentConfig' kind configuration.
+
+        Args:
+            key (str): The key to fetch from the configuration.
+
+        Returns:
+            str: The value associated with the specified key.
+        """
+        self._check_and_reload_configs()
+        config = self.configs_by_kind.get('agentConfig')
+        if not config:
+            return None
+        agents = config.get('agents')
+        if key in agents:
+            return agents[key]
+        else:
+            return agents.get("default")
+

{sunholo-0.71.28 → sunholo-0.72.0}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.71.28
+Version: 0.72.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.71.28.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.72.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -56,6 +56,7 @@ Requires-Dist: langchain-anthropic>=0.1.13; extra == "all"
 Requires-Dist: langfuse; extra == "all"
 Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
+Requires-Dist: pillow; extra == "all"
 Requires-Dist: playwright; extra == "all"
 Requires-Dist: psycopg2-binary; extra == "all"
 Requires-Dist: pypdf; extra == "all"
@@ -87,6 +88,8 @@ Requires-Dist: pytesseract; extra == "pipeline"
 Requires-Dist: tabulate; extra == "pipeline"
 Requires-Dist: unstructured[local-inference]; extra == "pipeline"
 Provides-Extra: gcp
+Requires-Dist: google-api-python-client; extra == "gcp"
+Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "gcp"
 Requires-Dist: google-auth-httplib2; extra == "gcp"
 Requires-Dist: google-auth-oauthlib; extra == "gcp"
 Requires-Dist: google-cloud-aiplatform; extra == "gcp"
@@ -100,8 +103,7 @@ Requires-Dist: google-cloud-discoveryengine; extra == "gcp"
 Requires-Dist: google-generativeai>=0.7.1; extra == "gcp"
 Requires-Dist: langchain-google-genai>=1.0.5; extra == "gcp"
 Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
-Requires-Dist: google-api-python-client; extra == "gcp"
-Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "gcp"
+Requires-Dist: pillow; extra == "gcp"
 Provides-Extra: openai
 Requires-Dist: langchain-openai; extra == "openai"
 Requires-Dist: tiktoken; extra == "openai"

{sunholo-0.71.28 → sunholo-0.72.0}/sunholo.egg-info/SOURCES.txt

@@ -113,6 +113,7 @@ sunholo/utils/__init__.py
 sunholo/utils/api_key.py
 sunholo/utils/big_context.py
 sunholo/utils/config.py
+sunholo/utils/config_class.py
 sunholo/utils/config_schema.py
 sunholo/utils/gcp.py
 sunholo/utils/gcp_project.py

{sunholo-0.71.28 → sunholo-0.72.0}/sunholo.egg-info/requires.txt

@@ -37,6 +37,7 @@ langchain-anthropic>=0.1.13
 langfuse
 pg8000
 pgvector
+pillow
 playwright
 psycopg2-binary
 pypdf
@@ -67,6 +68,8 @@ lancedb
 tantivy
 
 [gcp]
+google-api-python-client
+google-cloud-alloydb-connector[pg8000]
 google-auth-httplib2
 google-auth-oauthlib
 google-cloud-aiplatform
@@ -80,8 +83,7 @@ google-cloud-discoveryengine
 google-generativeai>=0.7.1
 langchain-google-genai>=1.0.5
 langchain_google_alloydb_pg>=0.2.2
-google-api-python-client
-google-cloud-alloydb-connector[pg8000]
+pillow
 
 [http]
 fastapi

sunholo-0.71.28/sunholo/utils/__init__.py

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