sunholo 0.64.13__py3-none-any.whl → 0.64.16__py3-none-any.whl

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/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/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.dist-info → sunholo-0.64.16.dist-info}/METADATA

@@ -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.dist-info → sunholo-0.64.16.dist-info}/RECORD

@@ -7,7 +7,7 @@ sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
 sunholo/agents/route.py,sha256=V1HKXTvaNuYgjmT5_QgIQum4O7O0Mw497m6YiMpEzX0,2383
 sunholo/agents/special_commands.py,sha256=ecD5jrBVXo170sdgPILi0m_m_4nRFEv6qKn5zYEvEK8,6494
-sunholo/agents/swagger.py,sha256=zaBuN9kCvgMzzSPSl-zoD4y0j8ze_GDLuQHX1xpD4j4,9217
+sunholo/agents/swagger.py,sha256=jxQ-NeKJ5BGQS29SiIbFhS_drb4_R5ahdR3m8-jDzWk,9354
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
 sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyoE,2514
 sunholo/agents/fastapi/qna_routes.py,sha256=DgK4Btu5XriOC1JaRQ4G_nWEjJfnQ0J5pyLanF6eF1g,3857
@@ -41,7 +41,7 @@ sunholo/cli/embedder.py,sha256=w7LT1CANSoQbOz8xAP3Zt4C_hP4lzGJOf8XD2jY5jBQ,7291
 sunholo/cli/merge_texts.py,sha256=U9vdMwKmcPoc6iPOWX5MKSxn49dNGbNzVLw8ui5PhEU,1823
 sunholo/cli/run_proxy.py,sha256=8mrZj0GPYO1q5e6cxej-PHdns5pGguWoDrX7RFg0FWo,11581
 sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
-sunholo/cli/swagger.py,sha256=Sa4FuWifyoPow_3DrqvfVIbmaZwGnPmLY1XQjOs7M1g,1397
+sunholo/cli/swagger.py,sha256=mvgk7UK2AYeWSJ5EbxtRxjAJ4Qnny-z6xxY8G6UrbPU,1405
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
 sunholo/components/retriever.py,sha256=jAgcmEM_D2Qfb3hYqHVZMZMLUEUqUbqmhD6G5czmEas,3820
@@ -96,7 +96,7 @@ sunholo/utils/config.py,sha256=xwI-3Ire8vGzvUydokfNz4Ubolxy4tA_4DNGcyGPO90,8951
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
 sunholo/utils/gcp_project.py,sha256=0ozs6tzI4qEvEeXb8MxLnCdEVoWKxlM6OH05htj7_tc,1325
-sunholo/utils/parsers.py,sha256=vLLIZ__rooA-QwM5pRFggt9tQ4hsuPW5lpz-kdq9uqo,4410
+sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
 sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,493
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/utils/version.py,sha256=jjU_4anXBikJxPg0Wur0X-B7-ec1tC7jToykAnAG9Dg,108
@@ -104,9 +104,9 @@ sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,13
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
 sunholo/vertex/memory_tools.py,sha256=8F1iTWnqEK9mX4W5RzCVKIjydIcNp6OFxjn_dtQ3GXo,5379
 sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
-sunholo-0.64.13.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.64.13.dist-info/METADATA,sha256=51XxuyA4IFJwuW7gUXrcJRI1pYRAbjq7NAKXbd934Y8,5973
-sunholo-0.64.13.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.64.13.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.64.13.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.64.13.dist-info/RECORD,,
+sunholo-0.64.16.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.64.16.dist-info/METADATA,sha256=evzJvbRliMZ7e4Wh0_8R2cisKvQRnE6pYxT_KBFhw6I,6000
+sunholo-0.64.16.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.64.16.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.64.16.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.64.16.dist-info/RECORD,,