sunholo 0.84.11__tar.gz → 0.85.2__tar.gz

{sunholo-0.84.11 → sunholo-0.85.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.84.11
+Version: 0.85.2
 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.84.11.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.85.2.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -72,6 +72,7 @@ Requires-Dist: tabulate; extra == "all"
 Requires-Dist: tantivy; extra == "all"
 Requires-Dist: tiktoken; extra == "all"
 Requires-Dist: unstructured[local-inference]==0.14.9; extra == "all"
+Requires-Dist: xlwings; extra == "all"
 Provides-Extra: azure
 Requires-Dist: azure-identity; extra == "azure"
 Requires-Dist: azure-storage-blob; extra == "azure"
@@ -130,6 +131,10 @@ Requires-Dist: httpx; extra == "http"
 Requires-Dist: langfuse; extra == "http"
 Requires-Dist: python-socketio; extra == "http"
 Requires-Dist: requests; extra == "http"
+Provides-Extra: excel
+Requires-Dist: xlwings; extra == "excel"
+Requires-Dist: requests; extra == "excel"
+Requires-Dist: rich; extra == "excel"
 
 ## Introduction
 This is the Sunholo Python project, a comprehensive toolkit for working with language models and vector stores on Google Cloud Platform. It provides a wide range of functionalities and utilities to facilitate the development and deployment of language model applications.

{sunholo-0.84.11 → sunholo-0.85.2}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.84.11'
+version = '0.85.2'
 
 setup(
     name='sunholo',
@@ -86,7 +86,7 @@ setup(
             "tantivy",
             "tiktoken",
             "unstructured[local-inference]==0.14.9",
-
+            "xlwings"
         ],
         'azure': [
             "azure-identity",
@@ -155,7 +155,13 @@ setup(
             "langfuse",
             "python-socketio",
             "requests"
+        ],
+        'excel': [
+            'xlwings',
+            'requests',
+            'rich'
         ]
+
     },
     classifiers=[
         'Development Status :: 3 - Alpha',      # Chose either "3 - Alpha", "4 - Beta" or "5 - Production/Stable" as the current state of your package

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo/__init__.py

@@ -8,6 +8,7 @@ from . import components
 from . import database
 from . import discovery_engine
 from . import embedder
+from . import excel
 from . import gcs
 from . import genai
 from . import invoke
@@ -34,6 +35,7 @@ __all__ = ['agents',
            'database', 
            'discovery_engine',
            'embedder', 
+           'excel',
            'gcs', 
            'genai',
            'invoke',

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo/chunker/loaders.py

@@ -185,7 +185,7 @@ def read_file_to_documents(gs_file: pathlib.Path, metadata: dict = None):
             return []
 
     log.info(f"Sending {pdf_path} to UnstructuredAPIFileLoader")
-    UNSTRUCTURED_URL = os.getenv("UNSTRUCTURED_URL", None)
+    UNSTRUCTURED_URL = os.getenv("UNSTRUCTURED_URL")
     unstructured_kwargs = {"pdf_infer_table_structure": True,
                             "extract_image_block_types":  ["Image", "Table"]
                             }

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo/cli/cli.py

@@ -11,6 +11,7 @@ from .embedder import setup_embedder_subparser
 from .swagger import setup_swagger_subparser
 from .vertex import setup_vertex_subparser
 from ..llamaindex import setup_llamaindex_subparser
+from ..excel import setup_excel_subparser
 
 from ..utils import ConfigManager
 from ..utils.version import sunholo_version
@@ -92,6 +93,8 @@ def main(args=None):
     setup_vertex_subparser(subparsers)
     # llamaindex
     setup_llamaindex_subparser(subparsers)
+    # excel
+    setup_excel_subparser(subparsers)
 
     #TODO: add database setup commands: alloydb and supabase
 

sunholo-0.85.2/sunholo/excel/__init__.py

@@ -0,0 +1 @@
+from .plugin import excel_plugin, setup_excel_subparser

sunholo-0.85.2/sunholo/excel/plugin.py

@@ -0,0 +1,97 @@
+import os
+import sys
+import subprocess
+import shutil
+from ..custom_logging import log
+from ..invoke import direct_vac
+
+def setup_excel_plugin(args):
+    """
+    Sets up the Excel plugin by copying the VBA file and creating the xlwings.conf file 
+    with the correct Python interpreter path.
+    """
+    from rich.panel import Panel
+    from ..cli.sun_rich import console
+
+    # Define the source directory (where the sunholo.excel package is located)
+    library_folder = os.path.dirname(__file__)
+    
+    # Define the destination directory (current working directory)
+    destination_folder = os.getcwd()
+    
+    # Define the paths
+    vba_file_template = "call_vac.vba.template"  # A template file with a placeholder for the path
+    vba_file_output = "call_vac.vba"
+    source_vba_file = os.path.join(library_folder, vba_file_template)
+    destination_vba_file = os.path.join(destination_folder, vba_file_output)
+    
+    # Ensure the .venv directory exists
+    if not os.path.exists(os.path.join(destination_folder, ".venv")):
+        console.print(f"ERROR: Virtual environment not found in {destination_folder}. "
+                      "Please ensure you are working in correct folder. " 
+                      " This command needs to be run from location where venv is created via `python -m venv .venv`"
+                      " and has installed this library via `pip install sunholo[excel]`")
+        return None
+
+    # Create the xlwings.conf file with the correct Python interpreter path
+    conf_file_path = os.path.join(destination_folder, "xlwings.conf")
+    python_executable = sys.executable
+
+    # Ensure the .venv directory exists
+    if not os.path.exists(os.path.dirname(python_executable)):
+        console.print(f"[bold red]ERROR: Python environment not found at {python_executable}. Please ensure it is created.[/bold red]")
+        return None
+
+    # Check if xlwings is installed
+    try:
+        subprocess.run([python_executable, "-c", "import xlwings"], check=True, capture_output=True)
+        console.print("xlwings is installed in the Python environment.")
+    except subprocess.CalledProcessError:
+        console.print("[bold red]WARNING: xlwings is not installed in the Python environment. Please install it using 'pip install sunholo\[excel]'[/bold red]")
+
+    
+    # Write the xlwings.conf file
+    try:
+        with open(conf_file_path, "w") as conf_file:
+            conf_file.write("[Interpreter]\n")
+            conf_file.write(f"PYTHONPATH={python_executable}\n")
+        console.print(f"Created {conf_file_path} with PYTHONPATH set to {python_executable}")
+    except IOError as e:
+        console.print(f"[bold red]ERROR:[/bold red] Failed to create xlwings.conf: {e}")
+        return None
+
+    # Copy the VBA template file to the destination as the VBA file
+    try:
+        shutil.copy2(source_vba_file, destination_vba_file)
+        console.print(f"Created {destination_vba_file}")
+    except IOError as e:
+        console.print(f"[bold red]ERROR:[/bold red] Failed to copy VBA file: {e}")
+        return None
+    
+    console.print(
+        Panel(("1. Open your Excel workbook.\n"
+                "2. Press Alt + F11 to open the VBA editor.\n"
+                "3. Insert a new module (Insert -> Module).\n"
+                f"4. Add the VBA code from {destination_vba_file} into the module.\n"
+                "5. Use =MULTIVAC() within your Excel cells"), 
+        title="Next Steps")
+        )
+    
+
+def excel_plugin(input_data, vac_name):
+    log.info(f"Calling multivac plugin for {vac_name} with {input_data}")
+    response = direct_vac(input_data, vac_name=vac_name)
+    log.info(f"Plugin got {response}")
+    return response['answer']
+
+def setup_excel_subparser(subparsers):
+    """
+    Sets up an argparse subparser for the 'excel' command.
+
+    Example command:
+    ```bash
+    sunholo excel-init
+    ```
+    """
+    deploy_parser = subparsers.add_parser('excel-init', help='Create Excel integrations with Sunholo VACs')
+    deploy_parser.set_defaults(func=setup_excel_plugin)

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo/invoke/async_class.py

@@ -8,7 +8,8 @@ logger = logging.getLogger(__name__)
 
 class AsyncTaskRunner:
     """
-    # Example async functions for testing
+    Example async functions for testing
+    ```python
     async def api_call_1(url, params):
         await asyncio.sleep(1)
         if "fail" in params:
@@ -44,6 +45,64 @@ class AsyncTaskRunner:
         results = runner.run_sync()
         for result in results:
             print(result)
+    ```
+
+    Example streaming fast and slow
+    
+    ```python
+    import asyncio
+    from typing import AsyncGenerator
+
+    # Example streaming function that simulates yielding chunks of data
+    async def stream_chunks(url: str, params: dict) -> AsyncGenerator[str, None]:
+        # Simulate streaming with a series of chunks
+        for i in range(5):
+            await asyncio.sleep(1)  # Simulate delay between chunks
+            yield f"Chunk {i+1} from {url} with params {params}"
+
+    # Example slow API call function
+    async def slow_api_call(url: str, params: dict) -> str:
+        await asyncio.sleep(5)  # Simulate a slow API response
+        return f"Slow API response from {url} with params {params}"
+
+    # Function to manage streaming and slow API call
+    async def process_api_calls(stream_url: str, stream_params: dict, slow_url: str, slow_params: dict) -> AsyncGenerator[str, None]:
+        # Create the AsyncTaskRunner instance
+        runner = AsyncTaskRunner()
+
+        # Add the slow API call as a task
+        runner.add_task(slow_api_call, slow_url, slow_params)
+
+        # Run the slow API call concurrently with the streaming
+        slow_api_result_task = asyncio.create_task(runner.run_async())
+
+        # Process the streaming chunks and yield them
+        async for chunk in stream_chunks(stream_url, stream_params):
+            yield chunk
+
+        # Wait for the slow API call to complete and get the result
+        slow_api_results = await slow_api_result_task
+
+        # Yield the slow API response after streaming is finished
+        for result in slow_api_results:
+            yield result
+
+    # Example usage in an existing async function
+    async def example_usage():
+        # Define the URLs and parameters for the calls
+        stream_url = "http://streaming.example.com"
+        stream_params = {"key": "stream_value"}
+        slow_url = "http://slowapi.example.com"
+        slow_params = {"key": "slow_value"}
+
+        # Process the API calls and stream the results
+        async for output in process_api_calls(stream_url, stream_params, slow_url, slow_params):
+            print(output)
+
+    # Running the example usage
+    if __name__ == "__main__":
+        asyncio.run(example_usage())
+    ```
     """
     def __init__(self):
         self.tasks = []

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo/invoke/direct_vac_func.py

@@ -13,11 +13,7 @@ def direct_vac(vac_input: dict, vac_name: str, chat_history=[]):
     log.info(f"Invoking VAC Q&A endpoints for {vac_name}")
 
     if 'user_input' not in vac_input:
-        raise ValueError('vac_input must contain at least "user_input" key - got {vac_input}')
-
-    user_id = vac_input.get('user_id')
-    session_id = vac_input.get('session_id')
-    image_uri = vac_input.get('image_url') or vac_input.get('image_uri')
+        raise ValueError(f'vac_input must contain at least "user_input" key - got {vac_input}')
 
     global_config = ConfigManager('global')
     config = ConfigManager(vac_name)
@@ -41,28 +37,29 @@ def direct_vac(vac_input: dict, vac_name: str, chat_history=[]):
     override_endpoint = agent_url or override_endpoint
 
     print(f"Using {override_endpoint=}")
-    log.warning(f'Batch invoke_vac_qa {vac_name} with {vac_input=}')
-    vac_response = send_to_qa(
-        vac_input["user_input"],
-        vector_name=vac_name,
-        chat_history=chat_history,
-        message_author=user_id,
-        #TODO: populate these
-        image_url=image_uri,
-        source_filters=None,
-        search_kwargs=None,
-        private_docs=None,
-        whole_document=False,
-        source_filters_and_or=False,
-        # system kwargs
-        configurable={
+    
+    # Prepare the kwargs for send_to_qa by copying vac_input and adding more values
+    qa_kwargs = vac_input.copy()
+
+    # Add additional arguments
+    qa_kwargs.update({
+        'vector_name': vac_name,
+        'chat_history': chat_history,
+        'image_url': vac_input.get('image_url') or vac_input.get('image_uri'),
+        'override_endpoint': override_endpoint,
+        'message_source': "sunholo.invoke_vac_qa.invoke",
+        'stream': False,
+        'configurable': {
             "vector_name": vac_name,
         },
-        user_id=user_id,
-        session_id=session_id, 
-        message_source="sunholo.invoke_vac_qa.invoke",
-        override_endpoint=override_endpoint,
-        stream=False)
+    })
+
+    log.info(f'Batch invoke_vac_qa {vac_name} with {qa_kwargs=}')
+
+    vac_response = send_to_qa(
+        vac_input["user_input"],
+        **qa_kwargs
+    )
         
     # ensures {'answer': answer}
     answer = parse_output(vac_response)

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo/qna/parsers.py

@@ -44,6 +44,14 @@ def parse_output(bot_output):
 
         return bot_output
     
+    elif isinstance(bot_output, dict) and 'output' in bot_output and isinstance(bot_output['output'], dict) and 'content' in bot_output['output']:
+        the_output = bot_output['output']
+
+        return {
+            'answer': the_output.get('content'),
+            'metadata': the_output.get('metadata')
+        }
+    
     elif isinstance(bot_output, dict):
         if not bot_output.get("answer"):
             raise ValueError(f"VAC output was not a string or a dict with the key 'answer' - got: {bot_output}")

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo/utils/config_class.py

@@ -26,6 +26,8 @@ class ConfigManager:
         agent = config.vacConfig("agent")
         ```
         """
+        if os.getenv("VAC_CONFIG_FOLDER") is None:
+            print("WARNING: No VAC_CONFIG_FOLDER environment variable was specified")
         local_config_folder = os.path.join(os.getcwd(), "config")
         if os.path.isdir(local_config_folder):
             print(f"Found local config folder {local_config_folder} - will overwrite any global configurations")

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.84.11
+Version: 0.85.2
 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.84.11.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.85.2.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -72,6 +72,7 @@ Requires-Dist: tabulate; extra == "all"
 Requires-Dist: tantivy; extra == "all"
 Requires-Dist: tiktoken; extra == "all"
 Requires-Dist: unstructured[local-inference]==0.14.9; extra == "all"
+Requires-Dist: xlwings; extra == "all"
 Provides-Extra: azure
 Requires-Dist: azure-identity; extra == "azure"
 Requires-Dist: azure-storage-blob; extra == "azure"
@@ -130,6 +131,10 @@ Requires-Dist: httpx; extra == "http"
 Requires-Dist: langfuse; extra == "http"
 Requires-Dist: python-socketio; extra == "http"
 Requires-Dist: requests; extra == "http"
+Provides-Extra: excel
+Requires-Dist: xlwings; extra == "excel"
+Requires-Dist: requests; extra == "excel"
+Requires-Dist: rich; extra == "excel"
 
 ## Introduction
 This is the Sunholo Python project, a comprehensive toolkit for working with language models and vector stores on Google Cloud Platform. It provides a wide range of functionalities and utilities to facilitate the development and deployment of language model applications.

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo.egg-info/SOURCES.txt

@@ -88,6 +88,8 @@ sunholo/discovery_engine/discovery_engine_client.py
 sunholo/discovery_engine/get_ai_search_chunks.py
 sunholo/embedder/__init__.py
 sunholo/embedder/embed_chunk.py
+sunholo/excel/__init__.py
+sunholo/excel/plugin.py
 sunholo/gcs/__init__.py
 sunholo/gcs/add_file.py
 sunholo/gcs/download_folder.py

{sunholo-0.84.11 → sunholo-0.85.2}/sunholo.egg-info/requires.txt

@@ -53,6 +53,7 @@ tabulate
 tantivy
 tiktoken
 unstructured[local-inference]==0.14.9
+xlwings
 
 [anthropic]
 langchain-anthropic>=0.1.13
@@ -75,6 +76,11 @@ psycopg2-binary
 lancedb
 tantivy
 
+[excel]
+xlwings
+requests
+rich
+
 [gcp]
 google-api-python-client
 google-cloud-alloydb-connector[pg8000]