sunholo 0.64.13__tar.gz → 0.64.16__tar.gz

{sunholo-0.64.13 → sunholo-0.64.16}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.64.13
+Version: 0.64.16
 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.64.13.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.64.16.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -20,6 +20,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: google-auth
 Requires-Dist: tenacity==8.3.0
+Requires-Dist: ruamel.yaml
 Requires-Dist: langchain
 Requires-Dist: langchain_experimental
 Requires-Dist: langchain-community

{sunholo-0.64.13 → sunholo-0.64.16}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.64.13'
+version = '0.64.16'
 
 setup(
     name='sunholo',
@@ -30,6 +30,7 @@ setup(
         # Base dependencies
         "google-auth", # to check if on gcp
         "tenacity==8.3.0",
+        "ruamel.yaml",
         "langchain",
         "langchain_experimental",
         "langchain-community",
@@ -135,7 +136,7 @@ setup(
         'Intended Audience :: Developers',      # Define that your audience are developers
         'Topic :: Software Development :: Build Tools',
         'License :: OSI Approved :: Apache Software License', 
-        'Programming Language :: Python :: 3',      #Specify which pyhton versions that you want to support
+        'Programming Language :: Python :: 3',      #Specify which python versions that you want to support
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12'

{sunholo-0.64.13 → sunholo-0.64.16}/sunholo/agents/swagger.py

@@ -1,10 +1,9 @@
-import yaml
 import copy
-
 from ..utils.config import load_all_configs
 from .route import route_vac
 from ..logging import log
-from ..utils.parsers import format_long_yaml
+from ruamel.yaml import YAML
+from io import StringIO
 
 def config_to_swagger():
     """
@@ -161,7 +160,7 @@ def generate_swagger(vac_config, agent_config):
                     'summary': f"{method.capitalize()} {vector_name}",
                     'operationId': f"{method}_{agent_type}_{endpoint_key}",
                     'x-google-backend': {
-                        'address': format_long_yaml(endpoint_address),
+                        'address': endpoint_address,
                         'protocol': 'h2'
                     },
                     'responses': copy.deepcopy(agent_config_paths.get('response', {}).get(endpoint_key, {
@@ -203,7 +202,7 @@ def generate_swagger(vac_config, agent_config):
                     'summary': f"{method.capitalize()} {agent_type}",
                     'operationId': f"{method}_{agent_type}_{endpoint_key}",
                     'x-google-backend': {
-                        'address': format_long_yaml(endpoint_address),
+                        'address': endpoint_address,
                         'protocol': 'h2'
                     },
                     'responses': copy.deepcopy(default_agent_config.get('response', {}).get(endpoint_key, {
@@ -215,5 +214,14 @@ def generate_swagger(vac_config, agent_config):
                         }
                     }))
                 }
-    
-    return yaml.dump(swagger_template, default_flow_style=False, width=999999)
+
+    yaml = YAML()
+    yaml.width = 4096 # to avoid breaking urls
+
+    # Capture YAML output in a string buffer
+    string_stream = StringIO()
+    yaml.dump(swagger_template, string_stream)
+    yaml_string = string_stream.getvalue()
+
+    return yaml_string
+    

{sunholo-0.64.13 → sunholo-0.64.16}/sunholo/cli/swagger.py

@@ -16,7 +16,7 @@ def cli_swagger(args):
     
     swag = generate_swagger(vac_config, agent_config)
 
-    console.print(swag)
+    console.print(swag, width=8000)
 
     return swag
 
@@ -35,4 +35,3 @@ def setup_swagger_subparser(subparsers):
     deploy_parser.add_argument('--vac_config_path', help='Path to the vacConfig file.  Set _CONFIG_FOLDER env var and place file in there to change default config location.')
     deploy_parser.add_argument('--agent_config_path', help='Path to agentConfig file. Set _CONFIG_FOLDER env var and place file in there to change default config location.')
     deploy_parser.set_defaults(func=cli_swagger)
-    

{sunholo-0.64.13 → sunholo-0.64.16}/sunholo/utils/parsers.py

@@ -13,29 +13,6 @@
 #   limitations under the License.
 import re
 import hashlib
-import textwrap  # For wrapping text
-
-def format_long_yaml(x, max_width=70):
-    """Formats the endpoint address, adding >- and line breaks if necessary.
-# Example usage:
-endpoint_template = "https://edmonbrain-blqtqfexwa-ew.a.run.app/openai/v1/chat/completions/{stem}/{vector_name}"
-
-formatted_address = format_long_yaml(x)
-print(formatted_address)
-    
-    """
-    if len(x) < max_width: 
-        return x
-    
-    # Wrap the URL if it's too long
-    wrapped_x = textwrap.wrap(x, width=max_width)
-    output = ">-\n  " + "\n  ".join(wrapped_x)
-
-    return output
-
-
-
-
 
 def contains_url(message_data):
     """

{sunholo-0.64.13 → sunholo-0.64.16}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.64.13
+Version: 0.64.16
 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.64.13.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.64.16.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -20,6 +20,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: google-auth
 Requires-Dist: tenacity==8.3.0
+Requires-Dist: ruamel.yaml
 Requires-Dist: langchain
 Requires-Dist: langchain_experimental
 Requires-Dist: langchain-community

{sunholo-0.64.13 → sunholo-0.64.16}/sunholo.egg-info/requires.txt

@@ -1,5 +1,6 @@
 google-auth
 tenacity==8.3.0
+ruamel.yaml
 langchain
 langchain_experimental
 langchain-community