sunholo 0.58.5__tar.gz → 0.59.1__tar.gz

{sunholo-0.58.5 → sunholo-0.59.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.58.5
+Version: 0.59.1
 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.58.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.59.1.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: jsonschema
 Requires-Dist: langchain
 Requires-Dist: langchain_experimental
 Requires-Dist: langchain-community

{sunholo-0.58.5 → sunholo-0.59.1}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.58.5'
+version = '0.59.1'
 
 setup(
     name='sunholo',
@@ -27,6 +27,7 @@ setup(
     },
     install_requires=[
         # Base dependencies
+        "jsonschema",
         "langchain",
         "langchain_experimental",
         "langchain-community",

sunholo-0.59.1/sunholo/cli/configs.py

@@ -0,0 +1,124 @@
+import sys
+from ..utils.config import load_all_configs
+from ..utils.config_schema import SCHEMAS, VAC_SUBCONFIG_SCHEMA
+
+from jsonschema import validate, ValidationError
+from pprint import pprint
+
+def validate_config(config, schema):
+    try:
+        validate(instance=config, schema=schema)
+        print("OK: Validated schema")
+        return True
+    except ValidationError as err:
+        error_path = " -> ".join(map(str, err.path))
+        #print(f"ERROR: Validation error at '{error_path}': {err.message}")
+        raise ValidationError(f"Validation error at '{error_path}': {err.message}")
+
+def list_configs(args):
+    """
+    Lists configuration files, filtered by kind or VAC name if specified, and optionally validates them.
+
+    Args:
+        args: Command-line arguments including 'kind', 'vac', and 'validate' for filtering and validation.
+
+    Examples:
+        # List all configurations
+        list_configs(args)
+
+        # List configurations filtered by kind
+        args.kind = 'vacConfig'
+        list_configs(args)
+
+        # List configurations filtered by VAC name
+        args.vac = 'edmonbrain'
+        list_configs(args)
+
+        # List configurations filtered by both kind and VAC name
+        args.kind = 'vacConfig'
+        args.vac = 'edmonbrain'
+        list_configs(args)
+
+        # Validate configurations
+        args.validate = True
+        list_configs(args)
+    """
+    print("Listing configuration files")
+    configs = load_all_configs()
+    filtered_configs = {}
+
+    if args.kind and args.vac:
+        if args.kind in configs:
+            kind_config = configs[args.kind]
+            vac_config = kind_config.get('vac', {}).get(args.vac)
+            if vac_config:
+                filtered_configs[args.kind] = {args.vac: vac_config}
+            else:
+                print(f"No configurations found for kind: {args.kind} with VAC: {args.vac}")
+        else:
+            print(f"No configurations found for kind: {args.kind}")
+    elif args.kind:
+        if args.kind in configs:
+            filtered_configs[args.kind] = configs[args.kind]
+        else:
+            print(f"No configurations found for kind: {args.kind}")
+    elif args.vac:
+        for kind, config in configs.items():
+            vac_config = config.get('vac', {}).get(args.vac)
+            if vac_config:
+                if kind not in filtered_configs:
+                    filtered_configs[kind] = {}
+                filtered_configs[kind][args.vac] = vac_config
+        if not filtered_configs:
+            print(f"No configurations found with VAC: {args.vac}")
+    else:
+        filtered_configs = configs
+
+    for kind, config in filtered_configs.items():
+        print(f"## Config kind: {kind}")
+        pprint(config)
+
+    if args.validate:
+        validation_failed = False
+        for kind, config in filtered_configs.items():
+            print(f"Validating configuration for kind: {kind}")
+            if args.kind == "vacConfig" and args.vac:
+                print(f"Validating vacConfig for {args.vac}")
+                try:
+                    validate_config(config[args.vac], VAC_SUBCONFIG_SCHEMA)
+                except ValidationError as e:
+                    print(f"Validation failed for sub-kind: {args.vac} - {str(e)}")
+                    validation_failed = True
+            elif kind in SCHEMAS:
+                try:
+                    validate_config(config, SCHEMAS[kind])
+                except ValidationError as e:
+                    print(f"FAIL: Validation failed for kind: {kind} - - {str(e)}")
+                    validation_failed = True
+            else:
+                print(f"No schema available to validate configuration for kind: {kind}")
+
+        if validation_failed:
+            print("Validation failed for one or more configurations")
+
+            sys.exit(1)
+
+
+def setup_list_configs_subparser(subparsers):
+    """
+    Sets up an argparse subparser for the 'list-configs' command.
+
+    Args:
+        subparsers: The subparsers object from argparse.ArgumentParser().
+
+    Examples:
+        # Set up the subparser for the 'list-configs' command
+        parser = argparse.ArgumentParser()
+        subparsers = parser.add_subparsers()
+        setup_list_configs_subparser(subparsers)
+    """
+    list_configs_parser = subparsers.add_parser('list-configs', help='Lists all configuration files and their details e.g. `sunholo list-configs --kind=vacConfig --vac=edmonbrain`')
+    list_configs_parser.add_argument('--kind', help='Filter configurations by kind e.g. `--kind=vacConfig`')
+    list_configs_parser.add_argument('--vac', help='Filter configurations by VAC name e.g. `--vac=edmonbrain`')
+    list_configs_parser.add_argument('--validate', action='store_true', help='Validate the configuration files.')
+    list_configs_parser.set_defaults(func=list_configs)

{sunholo-0.58.5 → sunholo-0.59.1}/sunholo/gcs/download_url.py

@@ -2,12 +2,13 @@ import os
 from urllib.parse import quote
 from datetime import datetime, timedelta
 
-import google.auth # needs to be in minimal to check gcp
+# needs to be in minimal to check gcp
+import google.auth 
+from google.auth.transport import requests
+from google.auth.exceptions import RefreshError
 
 try:
-    from google.cloud import storage     
-    from google.auth.transport import requests
-    from google.auth.exceptions import RefreshError
+    from google.cloud import storage 
 except ImportError:
     storage = None
 

sunholo-0.59.1/sunholo/utils/config_schema.py

@@ -0,0 +1,121 @@
+VAC_SUBCONFIG_SCHEMA = {
+    "type": "object",
+    "properties": {
+        "llm": {"type": "string"},
+        "agent": {"type": "string"},
+        "model": {"type": "string"},
+        "prompt": {"type": "string"},
+        "chunker": {
+            "type": "object",
+            "properties": {
+                "type": {"type": "string"},
+                "llm": {"type": "string"},
+                "chunk_size": {"type": "integer"},
+                "overlap": {"type": "integer"}
+            },
+            "additionalProperties": False
+        },
+        "memory": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "patternProperties": {
+                    ".*-vectorstore": {
+                        "type": "object",
+                        "properties": {
+                            "vectorstore": {"type": "string"},
+                            "self_query": {"type": "boolean"},
+                            "provider": {"type": "string"},
+                            "k": {"type": "integer"},
+                            "vector_name": {"type": "string"},
+                            "read_only": {"type": "boolean"},
+                            "llm": {"type": "string"}
+                        },
+                        "required": ["vectorstore"]
+                    }
+                }
+            }
+        },
+        "gcp_config": {
+            "type": "object",
+            "properties": {
+                "project_id": {"type": "string"},
+                "endpoint_id": {"type": "integer"},
+                "location": {"type": "string"}
+            }
+        },
+        "alloydb_config": {
+            "type": "object",
+            "properties": {
+                "project_id": {"type": "string"},
+                "region": {"type": "string"},
+                "cluster": {"type": "string"},
+                "instance": {"type": "string"},
+                "database": {"type": "string"}
+            }
+        },
+        "secrets": {
+            "type": "array",
+            "items": {"type": "string"}
+        },
+        "display_name": {"type": "string"},
+        "avatar_url": {"type": "string"},
+        "description": {"type": "string"},
+        "memory_k": {"type": "integer"}
+    },
+    "required": ["llm", "agent"]
+}
+
+
+VAC_CONFIG_SCHEMA = {
+    "type": "object",
+    "properties": {
+        "kind": {"type": "string"},
+        "apiVersion": {"type": "string"},
+        "gcp_config": {
+            "type": "object",
+            "properties": {
+                "project_id": {"type": "string"},
+                "location": {"type": "string"}
+            },
+            "required": ["project_id", "location"]
+        },
+        "vac": {
+            "type": "object",
+            "patternProperties": {
+                ".*": VAC_SUBCONFIG_SCHEMA
+            }
+        }
+    },
+    "required": ["kind", "apiVersion", "gcp_config", "vac"]
+}
+
+PROMPT_CONFIG_SCHEMA = {
+    "type": "object",
+    "properties": {
+        "kind": {"type": "string"},
+        "apiVersion": {"type": "string"},
+        "prompts": {
+            "type": "object",
+            "patternProperties": {
+                ".*": {
+                    "type": "object",
+                    "properties": {
+                        "chunk_summary": {"type": "string"},
+                        "intro": {"type": "string"},
+                        "template": {"type": "string"},
+                        "chat_summary": {"type": "string"},
+                        "summarise_known_question": {"type": "string"}
+                    }
+                }
+            }
+        }
+    },
+    "required": ["kind", "apiVersion", "prompts"]
+}
+
+SCHEMAS = {
+    "vacConfig": VAC_CONFIG_SCHEMA,
+    "promptConfig": PROMPT_CONFIG_SCHEMA
+}
+

{sunholo-0.58.5 → sunholo-0.59.1}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.58.5
+Version: 0.59.1
 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.58.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.59.1.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: jsonschema
 Requires-Dist: langchain
 Requires-Dist: langchain_experimental
 Requires-Dist: langchain-community

{sunholo-0.58.5 → sunholo-0.59.1}/sunholo.egg-info/SOURCES.txt

@@ -96,6 +96,7 @@ sunholo/summarise/summarise.py
 sunholo/utils/__init__.py
 sunholo/utils/big_context.py
 sunholo/utils/config.py
+sunholo/utils/config_schema.py
 sunholo/utils/gcp.py
 sunholo/utils/parsers.py
 sunholo/vertex/__init__.py

{sunholo-0.58.5 → sunholo-0.59.1}/sunholo.egg-info/requires.txt

@@ -1,3 +1,4 @@
+jsonschema
 langchain
 langchain_experimental
 langchain-community

sunholo-0.58.5/sunholo/cli/configs.py

@@ -1,29 +0,0 @@
-from ..utils.config import load_all_configs
-
-from pprint import pprint
-
-def list_configs(args):
-    """
-    Lists configuration files, filtered by kind if specified.
-    """
-    print("Listing configuration files")
-    configs = load_all_configs()
-
-    if args.kind:
-        if args.kind in configs:
-            print(f"## Config kind: {args.kind}")
-            pprint(configs[args.kind])
-        else:
-            print(f"No configurations found for kind: {args.kind}")
-    else:
-        for kind, config in configs.items():
-            pprint(f"## Config kind: {kind}") 
-            pprint(config)
-
-def setup_list_configs_subparser(subparsers):
-    """
-    Sets up an argparse subparser for the 'list-configs' command.
-    """
-    list_configs_parser = subparsers.add_parser('list-configs', help='Lists all configuration files and their details.')
-    list_configs_parser.add_argument('--kind', help='Filter configurations by kind.')
-    list_configs_parser.set_defaults(func=list_configs)