sunholo 0.82.1__py3-none-any.whl → 0.83.0__py3-none-any.whl

sunholo/agents/flask/qna_routes.py

@@ -23,6 +23,7 @@ from ...streaming import start_streaming_chat
 from ...archive import archive_qa
 from ...custom_logging import log
 from ...utils.config import load_config
+from ...utils import ConfigManager
 from ...utils.version import sunholo_version
 import os
 from ...gcs.add_file import add_file_to_gcs, handle_base64_image
@@ -183,6 +184,15 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
             generation.end(output=response)
             span.end(output=response)
             trace.update(output=response)
+        
+        #if 'user_id' in all_input["kwargs"]:
+        #    kwargs = all_input["kwargs"]
+        #    config = ConfigManager(vector_name)
+        #    add_user_history_rag(kwargs.pop('user_id'), 
+        #                         config, 
+        #                         question=all_input.pop("user_input"), 
+        #                         answer=response.get('answer'), 
+        #                         metadata=all_input)
 
         return response
 

sunholo/cli/chat_vac.py

@@ -411,7 +411,7 @@ def resolve_service_url(args, no_config=False):
 
 def vac_command(args):
 
-    config = ConfigManager(args.vac_name)
+    
 
     if args.action == 'list':
 
@@ -426,6 +426,7 @@ def vac_command(args):
         return
     
     elif args.action == 'chat':
+        config = ConfigManager(args.vac_name)
         service_url = resolve_service_url(args)
         agent_name   = config.vacConfig("agent")
 
@@ -466,7 +467,6 @@ def vac_command(args):
 
         invoke_vac(service_url, args.data, is_file=args.is_file)
 
-
 def list_cloud_run_services(project, region):
     """
     Lists all Cloud Run services the user has access to in a specific project and region.
@@ -583,4 +583,5 @@ def setup_vac_subparser(subparsers):
     invoke_parser.add_argument('data', help='Data to send to the VAC service (as JSON string).')
     invoke_parser.add_argument('--is-file', action='store_true', help='Indicate if the data argument is a file path')
 
-    vac_parser.set_defaults(func=vac_command)
+    # If no subcommand is provided, print the help message
+    vac_parser.set_defaults(func=lambda args: vac_parser.print_help() if args.action is None else vac_command(args))

sunholo/cli/cli.py

@@ -13,6 +13,7 @@ from .vertex import setup_vertex_subparser
 from ..llamaindex import setup_llamaindex_subparser
 
 from ..utils import ConfigManager
+from ..utils.version import sunholo_version
 
 from ..custom_logging import log
 
@@ -63,7 +64,8 @@ def main(args=None):
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
     parser.add_argument('--project', default=default_project, help='GCP project to list Cloud Run services from.')
     parser.add_argument('--region', default=default_region, help='Region to list Cloud Run services from.')
-    
+    parser.add_argument('--version', action='store_true', help='Show the version and exit') 
+
     subparsers = parser.add_subparsers(title='commands', 
                                        description='Valid commands', 
                                        help='Commands', 
@@ -102,6 +104,10 @@ def main(args=None):
         log.setLevel(logging.WARNING)
         logging.getLogger().setLevel(logging.WARNING)
 
+    if args.version:
+        sunholo_version()
+        return
+
     if hasattr(args, 'func'):
         args.func(args)
     else:

sunholo/database/alloydb_client.py

@@ -152,6 +152,20 @@ class AlloyDBClient:
         documents = await self.execute_sql_async(query)
         return documents
 
+    def get_sources_from_docstore(self, sources, vector_name, search_type="OR", just_source_name=False):
+        """Fetches sources from the docstore asynchronously."""
+        if just_source_name:
+            query = self._list_sources_from_docstore(sources, vector_name=vector_name, search_type=search_type)
+        else:
+            query = self._get_sources_from_docstore(sources, vector_name=vector_name, search_type=search_type)
+
+        if not query:
+            return []
+
+        documents = self.execute_sql(query)
+        
+        return documents
+
     def _get_sources_from_docstore(self, sources, vector_name, search_type="OR"):
         """Helper function to build the SQL query for fetching sources."""
         if not sources:

sunholo/streaming/streaming.py

@@ -22,7 +22,7 @@ from .content_buffer import ContentBuffer, BufferStreamingStdOutCallbackHandler
 from ..qna.parsers import parse_output
 
 from ..custom_logging import log
-from ..utils import load_config_key
+from ..utils import load_config_key, ConfigManager
 from ..utils.parsers import check_kwargs_support
 
 from .langserve import parse_langserve_token, parse_langserve_token_async
@@ -248,8 +248,9 @@ def generate_proxy_stream(stream_to_f, user_input, vector_name, chat_history, ge
         ):
             print(output)  # Process each streaming output chunk
     """
-    agent = load_config_key("agent", vector_name=vector_name, kind="vacConfig")
-    agent_type = load_config_key("agent_type", vector_name=vector_name, kind="vacConfig")
+    config = ConfigManager(vector_name)
+    agent = config.vacConfig("agent")
+    agent_type = config.vacConfig("agent_type")
 
     def generate():
         json_buffer = ""
@@ -306,9 +307,10 @@ async def generate_proxy_stream_async(stream_to_f, user_input, vector_name, chat
         ):
             print(output)  # Process each streaming output chunk
     """
-    agent = load_config_key("agent", vector_name=vector_name, kind="vacConfig")
-    agent_type = load_config_key("agent_type", vector_name=vector_name, kind="vacConfig")
-
+    config = ConfigManager(vector_name)
+    agent = config.vacConfig("agent")
+    agent_type = config.vacConfig("agent_type")
+    
     async def generate():
         json_buffer = ""
         inside_json = False

{sunholo-0.82.1.dist-info → sunholo-0.83.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.82.1
+Version: 0.83.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.82.1.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.83.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -21,7 +21,7 @@ License-File: LICENSE.txt
 Requires-Dist: google-auth
 Requires-Dist: ruamel.yaml
 Requires-Dist: langchain >=0.2.12
-Requires-Dist: langchain-experimental >0.0.60
+Requires-Dist: langchain-experimental >=0.0.61
 Requires-Dist: langchain-community >=0.2.11
 Provides-Extra: all
 Requires-Dist: asyncpg ; extra == 'all'
@@ -32,7 +32,7 @@ Requires-Dist: flask ; extra == 'all'
 Requires-Dist: google-auth ; extra == 'all'
 Requires-Dist: google-auth-httplib2 ; extra == 'all'
 Requires-Dist: google-auth-oauthlib ; extra == 'all'
-Requires-Dist: google-cloud-aiplatform ; extra == 'all'
+Requires-Dist: google-cloud-aiplatform >=1.58.0 ; extra == 'all'
 Requires-Dist: google-api-python-client ; extra == 'all'
 Requires-Dist: google-cloud-alloydb-connector[pg8000] ; extra == 'all'
 Requires-Dist: google-cloud-bigquery ; extra == 'all'
@@ -48,11 +48,11 @@ Requires-Dist: httpcore ; extra == 'all'
 Requires-Dist: httpx ; extra == 'all'
 Requires-Dist: jsonschema ; extra == 'all'
 Requires-Dist: lancedb ; extra == 'all'
-Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: langchain-experimental ; extra == 'all'
-Requires-Dist: langchain-community ; extra == 'all'
-Requires-Dist: langchain-openai ; extra == 'all'
-Requires-Dist: langchain-google-genai ; extra == 'all'
+Requires-Dist: langchain >=0.2.12 ; extra == 'all'
+Requires-Dist: llangchain-experimental >=0.0.61 ; extra == 'all'
+Requires-Dist: langchain-community >=0.2.11 ; extra == 'all'
+Requires-Dist: langchain-openai >=0.1.20 ; extra == 'all'
+Requires-Dist: langchain-google-genai >=1.0.5 ; extra == 'all'
 Requires-Dist: langchain-google-alloydb-pg ; extra == 'all'
 Requires-Dist: langchain-anthropic >=0.1.13 ; extra == 'all'
 Requires-Dist: langchain-google-vertexai ; extra == 'all'

{sunholo-0.82.1.dist-info → sunholo-0.83.0.dist-info}/RECORD

@@ -13,7 +13,7 @@ sunholo/agents/fastapi/base.py,sha256=W-cyF8ZDUH40rc-c-Apw3-_8IIi2e4Y9qRtnoVnsc1
 sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhBlV3to-s,3864
 sunholo/agents/flask/__init__.py,sha256=uqfHNw2Ru3EJ4dJEcbp86h_lkquBQPMxZbjhV_xe3rs,72
 sunholo/agents/flask/base.py,sha256=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
-sunholo/agents/flask/qna_routes.py,sha256=pSXAipANqoE4wgDv4YD2_Sd7GvpGmFcj4Quslf4FKTM,22057
+sunholo/agents/flask/qna_routes.py,sha256=uwUD1yrzOPH27m2AXpiQrPk_2VfJOQOM6dAynOWQtoQ,22532
 sunholo/agents/flask/vac_routes.py,sha256=JHBrz9URmRzxoNAiqEeI-5qWyKfVSZ1Ix__1t19p6HI,19527
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
@@ -42,8 +42,8 @@ sunholo/chunker/publish.py,sha256=AX5u-fcyDytED67IfizMzvOMcYPXEo6XBJvyk_7maK8,29
 sunholo/chunker/pubsub.py,sha256=48bhuAcszN7LGe3-ksPSLHHhq0uKxiXOrizck5qpcP0,1012
 sunholo/chunker/splitter.py,sha256=QLAEsJOpEYFZr9-UGZUuAlNVyjfCWb8jvzCHg0rVShE,6751
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/cli/chat_vac.py,sha256=UNLzZYAejjEvMR0EjpxIHXyvUpBDoqThohzzFL_m3Yg,23026
-sunholo/cli/cli.py,sha256=yuY7SLFiYDUKqJDOXy7jL1l6P0UVPMuAZK9bXXTG8ck,3939
+sunholo/cli/chat_vac.py,sha256=jTmCt62U4uqJjeGp_XfIbxnafAAOhQAJMi8TxSkeKlM,23164
+sunholo/cli/cli.py,sha256=tnavBrQruyB-G56hGIQ86YkQbpCQQ4K3zvnoP8GrgCU,4135
 sunholo/cli/cli_init.py,sha256=JMZ9AX2cPDZ-_mv3adiv2ToFVNyRPtjk9Biszl1kiR0,2358
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
 sunholo/cli/deploy.py,sha256=zxdwUsRTRMC8U5vyRv0JiKBLFn84Ug_Tc88-_h9hJSs,1609
@@ -59,7 +59,7 @@ sunholo/components/retriever.py,sha256=bKIVT7_18Ut3OJd0E0jyiISPnD9qkHWVjcQPT4i1_
 sunholo/components/vectorstore.py,sha256=xKk7micTRwZckaI7U6PxvFz_ZSjCH48xPTDYiDcv2tc,5913
 sunholo/database/__init__.py,sha256=bpB5Nk21kwqYj-qdVnvNgXjLsbflnH4g-San7OHMqR4,283
 sunholo/database/alloydb.py,sha256=YH8wNPS8gN-TDZEXQcVHxwd1NScHRfAxma3gK4R6KCk,11740
-sunholo/database/alloydb_client.py,sha256=vZu7m3n1TrGFqQ_F4kGgDEC-v_tnlJfByDGuI_4rrfw,11051
+sunholo/database/alloydb_client.py,sha256=7qO_WMTIDGK9KMZEtF00Ov7y73qTx8vSX76qObNGjgA,11611
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -109,7 +109,7 @@ sunholo/streaming/__init__.py,sha256=MpbydI2UYo_adttPQFkxNM33b-QRyNEbrKJx0C2AGPc
 sunholo/streaming/content_buffer.py,sha256=A9rVhlmLZxaFPvGYjVqCs5GfIsA1EMl_tyk-0VCDvo4,6462
 sunholo/streaming/langserve.py,sha256=hi7q8WY8DPKrALl9m_dOMxWOdE-iEuk7YW05SVDFIX8,6514
 sunholo/streaming/stream_lookup.py,sha256=hYg1DbdSE_QNJ8ZB-ynXJlWgvFjrGvwoUsGJu_E0pRQ,360
-sunholo/streaming/streaming.py,sha256=9YpU8FchLz1rx-wQWFxeEueguKo9VatzJxTCGL4tWbw,16412
+sunholo/streaming/streaming.py,sha256=5dRXo1wHYE0E91gll-939RShYTYxQMeVwAVCqFR13h0,16343
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=95A-6PXFGanjona8DvZPnnIHLbzZ2ip5hO0wOAJQhfw,3791
 sunholo/tools/__init__.py,sha256=5NuYpwwTX81qGUWvgwfItoSLXteNnp7KjgD7IPZUFjI,53
@@ -134,9 +134,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=pgSahVDh7GPEulu3nl-w0jb5lTClb4TCnVxPnMokNZY,7533
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.82.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.82.1.dist-info/METADATA,sha256=araDojOf0d7xxwCeVn6OKRDMu6m7LTjP-Ay4631gU2E,7358
-sunholo-0.82.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.82.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.82.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.82.1.dist-info/RECORD,,
+sunholo-0.83.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.83.0.dist-info/METADATA,sha256=SfRk-Y5FsBylKffBnHxxoURZxAHFfhl5SfC7JAnO-fg,7413
+sunholo-0.83.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.83.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.83.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.83.0.dist-info/RECORD,,