sunholo 0.70.4__tar.gz → 0.70.6__tar.gz

{sunholo-0.70.4 → sunholo-0.70.6}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.70.4
+Version: 0.70.6
 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.70.4.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.70.6.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.70.4 → sunholo-0.70.6}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.70.4'
+version = '0.70.6'
 
 setup(
     name='sunholo',

{sunholo-0.70.4 → sunholo-0.70.6}/sunholo/agents/flask/qna_routes.py

@@ -46,7 +46,7 @@ cache_duration = timedelta(minutes=5)  # Cache duration
 
 def make_openai_response(user_message, vector_name, answer):
     response_id = str(uuid.uuid4())
-    log.info("openai response: Q: {user_message} to VECTOR_NAME: {vector_name} - A: {answer}")
+    log.info(f"openai response: Q: {user_message} to VECTOR_NAME: {vector_name} - A: {answer}")
     openai_response = {
         "id": response_id,
         "object": "chat.completion",
@@ -63,9 +63,9 @@ def make_openai_response(user_message, vector_name, answer):
             "finish_reason": "stop"
         }],
         "usage": {
-            "prompt_tokens": len(user_message.split()),
-            "completion_tokens": len(answer.split()),
-            "total_tokens": len(user_message.split()) + len(answer.split())
+            "prompt_tokens": 0,
+            "completion_tokens": 0,
+            "total_tokens": 0
         }
     }
 

sunholo-0.70.6/sunholo/vertex/extensions.py

@@ -0,0 +1,326 @@
+# https://cloud.google.com/vertex-ai/generative-ai/docs/extensions/create-extension
+# https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/extension#python
+from vertexai.preview import extensions
+from .init import init_vertex
+from ..logging import log
+from ..utils.gcp_project import get_gcp_project
+from ..utils.parsers import validate_extension_id
+
+# https://github.com/GoogleCloudPlatform/applied-ai-engineering-samples/blob/main/genai-on-vertex-ai/vertex_ai_extensions/notebooks/pandas_code_interpreter.ipynb
+import base64
+import json
+import pprint
+import pandas
+from io import StringIO
+
+global CODE_INTERPRETER_WRITTEN_FILES
+CODE_INTERPRETER_WRITTEN_FILES = []
+
+def get_extension_import_config(
+        display_name: str, 
+        description: str,
+        api_spec_gcs: dict,
+        service_account_name: dict,
+        tool_use_examples: list):
+
+    tool_use_examples = [
+        {
+            "extensionOperation": {
+                "operationId": "say_hello",
+            },
+            "displayName": "Say hello in the requested language",
+            "query": "Say hello in French",
+            "requestParams": {
+                "fields": [
+                {
+                    "key": "apiServicePrompt",
+                    "value": {
+                    "string_value": "French",
+                    }
+                }
+                ]
+            },
+            "responseParams": {
+                "fields": [
+                {
+                    "key": "apiServiceOutput",
+                    "value": {
+                    "string_value": "bonjour",
+                    },
+                }
+                ],
+            },
+            "responseSummary": "Bonjour"
+            }
+    ]
+
+    
+    return {
+        "displayName":  display_name,
+        "description": description,
+        "manifest": {
+            "name": "EXTENSION_NAME_LLM",
+            "description": "DESCRIPTION_LLM",
+            "apiSpec": {
+                "openApiGcsUri": api_spec_gcs,
+            },
+            "authConfig": {
+                "authType": "OAUTH",
+                "oauthConfig": {"service_account": service_account_name}
+            }
+        },
+        "toolUseExamples": tool_use_examples, 
+        }
+
+# once an extension is available, call it in code here
+def create_extension_instance(
+        display_name: str,
+        description: str,
+        open_api_gcs_uri: str,
+        llm_name: str=None,
+        llm_description: str=None,
+        runtime_config: dict=None,
+        service_account: str=None,
+):
+    """
+    Args:
+    - display_name: for the human. parsed to be used as extension_name
+    - description: for the human
+    - open_api_gcs_uri: location on GCS where open_ai yaml spec is
+    - llm_name: for the model.  If None, uses display_name
+    - llm_description: for the model.  If None, uses description
+    - service_account: If not specified, the Vertex AI Extension Service Agent is used to execute the extension.
+    
+    """
+    project_id = get_gcp_project()
+    extension_name = f"projects/{project_id}/locations/us-central1/extensions/{validate_extension_id(display_name)}"
+
+    extension = extensions.Extension.create(
+        extension_name=extension_name,
+        display_name=display_name,
+        description=description,
+        runtime_config=runtime_config or None,
+        manifest={
+            "name": llm_name or display_name,
+            "description": llm_description or description,
+            "api_spec": {
+                "open_api_gcs_uri": open_api_gcs_uri
+            },
+            "auth_config": {
+                "auth_type": "GOOGLE_SERVICE_ACCOUNT_AUTH",
+                "google_service_account_config": service_account or {},
+            },
+        },
+    )
+    log.info(f"Created Vertex Extension: {extension_name}")
+
+    return extension
+
+
+
+def create_extension_code_interpreter(
+        code_artifacts_bucket=None
+):
+
+    # only us-central for now
+    location = "us-central1"
+    init_vertex(location=location)
+
+    runtime_config=None
+    if code_artifacts_bucket:
+        runtime_config = {"codeInterpreterRuntimeConfig": 
+                            {
+                                "fileInputGcsBucket": code_artifacts_bucket,
+                                "fileOutputGcsBucket": code_artifacts_bucket
+                            }
+                        }
+
+    llm_description="""
+Tool to generate and execute valid Python code from a natural
+  language description, or to execute custom Python code.
+  Use this tool to:
+  - generate and/or execute code for various tasks:
+    - perform a wide variety of mathematical calculations, for example, add,
+      subtract, multiply, divide, average, power, factorial, quotient,
+      formulae, logarithms, random numbers, trigonometric functions, and
+      equations;
+    - sort, filter, select top results, and otherwise analyze data (including
+      data acquired from other tools and Extensions);
+    - create visualizations, plot charts, draw graphs, shapes, print results,
+      etc.
+  - execute custom code and get results and output files.
+"""
+
+    code_extension = create_extension_instance(
+        display_name="Code Interpreter",
+        description="This extension generates and executes code in the specified language",
+        open_api_gcs_uri="gs://vertex-extension-public/code_interpreter.yaml",
+        llm_name="code_interpreter_tool",
+        llm_description=llm_description,
+        runtime_config=runtime_config
+        )
+    log.info(f"Created code extension: {code_extension=}")
+
+    return code_extension
+
+def execute_extension(operation_id: str,
+                      operation_params: dict,
+                      extension_id: str):
+
+    # only us-central for now
+    location = "us-central1"
+    init_vertex(location=location)
+
+    if not extension_id.startswith("projects/"):
+        project_id=get_gcp_project()
+        extension_name = f"projects/{project_id}/locations/{location}/extensions/{extension_id}"
+    else:
+        extension_name=extension_id
+    
+    extension = extensions.Extension(extension_name)
+
+    response = extension.execute(
+        operation_id=operation_id,
+        # {"query": "find the max value in the list: [1,2,3,4,-5]"}
+        operation_params=operation_params,
+    )
+
+    return response
+
+def execute_code_extension(query:str, filenames: list[str]=None, gcs_files: list[str]=None):
+
+    if filenames and gcs_files:
+        raise ValueError("Can't specify both filenames and gcs_files")
+    
+    extension_code_interpreter = extensions.Extension.from_hub("code_interpreter")
+
+    file_arr=None
+    if filenames:
+        file_arr = [
+            {
+                "name": filename,
+                "contents":  base64.b64encode(open(filename, "rb").read()).decode()
+            }
+            for filename in filenames
+        ]
+
+    response = extension_code_interpreter.execute(
+        operation_id = "generate_and_execute",
+        operation_params={
+            "query": query,
+            "files": file_arr,
+            "file_gcs_uris": gcs_files
+        })
+    
+    CODE_INTERPRETER_WRITTEN_FILES.extend(
+        [item['name'] for item in response['output_files']])
+
+    if response.get('execution_error'):
+        log.error(f"Code Execution Response failed with: {response.get('execution_error')} - maybe retry?")
+    
+    return response
+
+css_styles = """
+<style>
+.main_summary {
+  font-weight: bold;
+  font-size: 14px; color: #4285F4;
+  background-color:rgba(221, 221, 221, 0.5); padding:8px;}
+</style>
+        """
+
+# Parser to visualise the content of returned files as HTML.
+def parse_files_to_html(outputFiles, save_files_locally = True):
+    IMAGE_FILE_EXTENSIONS = set(["jpg", "jpeg", "png"])
+    file_list = []
+    details_tml = """<details><summary>{name}</summary><div>{html_content}</div></details>"""
+
+    if not outputFiles:
+      return "No Files generated from the code"
+    # Sort output_files so images are displayed before other files such as JSON.
+    for output_file in sorted(
+        outputFiles,
+        key=lambda x: x["name"].split(".")[-1] not in IMAGE_FILE_EXTENSIONS,
+    ):
+        file_name = output_file.get("name")
+        file_contents = base64.b64decode(output_file.get("contents"))
+        if save_files_locally:
+          open(file_name,"wb").write(file_contents)
+
+        if file_name.split(".")[-1] in IMAGE_FILE_EXTENSIONS:
+            # Render Image
+            file_html_content = ('<img src="data:image/png;base64, '
+                                f'{output_file.get("contents")}" />')
+        elif file_name.endswith(".json"):
+            # Pretty print JSON
+            json_pp = pprint.pformat(
+                        json.loads(file_contents.decode()),
+                        compact=False,
+                        width=160)
+            file_html_content =  (f'<span>{json_pp}</span>')
+        elif file_name.endswith(".csv"):
+            # CSV
+            csv_md = pandas.read_csv(
+                  StringIO(file_contents.decode())).to_markdown(index=False)
+            file_html_content = f'<span>{csv_md}</span>'
+        elif file_name.endswith(".pkl"):
+            # PKL
+            file_html_content = f'<span>Preview N/A</span>'
+        else:
+            file_html_content = f"<span>{file_contents.decode()}</span>"
+
+        file_list.append({'name': file_name, "html_content": file_html_content})
+
+    buffer_html = [ details_tml.format(**_file) for _file in file_list ]
+    return "".join(buffer_html)
+
+# Processing code interpreter response to html visualization.
+def process_response(response: dict, save_files_locally = None) -> None:
+
+    result_template = """
+    <details open>
+        <summary class='main_summary'>{summary}:</summary>
+        <div><pre>{content}</pre></div>
+    </details>
+    """
+
+    result = ""
+    code = response.get('generated_code')
+    if 'execution_result' in response and response['execution_result']!="":
+        result = result_template.format(
+            summary="Executed Code Output",
+            content=response.get('execution_result'))
+    else:
+        result = result_template.format(
+        summary="Executed Code Output",
+        content="Code does not produce printable output.")
+
+    if response.get('execution_error', None):
+        result += result_template.format(
+            summary="Generated Code Raised a (Possibly Non-Fatal) Exception",
+            content=response.get('execution_error', None))
+
+    result += result_template.format(
+        summary="Files Created <u>(Click on filename to view content)</u>",
+        content=parse_files_to_html(
+            response.get('output_files', []),
+            save_files_locally = True))
+
+    html_content = f"""
+{css_styles}
+<div id='main'>
+    <div id="right">
+      <h3>Generated Code by Code Interpreter</h3>
+      <pre><code>{code}</code></pre>
+    </div>
+    <div id="left">
+      <h3>Code Execution Results</h3>
+      {result}
+    </div>
+</div>
+"""
+    if save_files_locally:
+        # write to local file
+        pass
+  
+    return html_content

sunholo-0.70.6/sunholo/vertex/extensions_class.py

@@ -0,0 +1,241 @@
+from vertexai.preview import extensions
+from .init import init_vertex
+from ..logging import log
+from ..utils.gcp_project import get_gcp_project
+from ..utils.parsers import validate_extension_id
+import base64
+import json
+from io import StringIO
+
+class VertexAIExtensions:
+    def __init__(self):
+        self.CODE_INTERPRETER_WRITTEN_FILES = []
+        self.css_styles = """
+        <style>
+        .main_summary {
+          font-weight: bold;
+          font-size: 14px; color: #4285F4;
+          background-color:rgba(221, 221, 221, 0.5); padding:8px;}
+        </style>
+        """
+        self.IMAGE_FILE_EXTENSIONS = set(["jpg", "jpeg", "png"])
+        self.location = "us-central1"
+
+    def get_extension_import_config(self, display_name: str, description: str,
+                                    api_spec_gcs: dict, service_account_name: dict, tool_use_examples: list):
+        tool_use_examples = [
+            {
+                "extensionOperation": {
+                    "operationId": "say_hello",
+                },
+                "displayName": "Say hello in the requested language",
+                "query": "Say hello in French",
+                "requestParams": {
+                    "fields": [
+                        {
+                            "key": "apiServicePrompt",
+                            "value": {
+                                "string_value": "French",
+                            }
+                        }
+                    ]
+                },
+                "responseParams": {
+                    "fields": [
+                        {
+                            "key": "apiServiceOutput",
+                            "value": {
+                                "string_value": "bonjour",
+                            },
+                        }
+                    ],
+                },
+                "responseSummary": "Bonjour"
+            }
+        ]
+
+        return {
+            "displayName": display_name,
+            "description": description,
+            "manifest": {
+                "name": "EXTENSION_NAME_LLM",
+                "description": "DESCRIPTION_LLM",
+                "apiSpec": {
+                    "openApiGcsUri": api_spec_gcs,
+                },
+                "authConfig": {
+                    "authType": "OAUTH",
+                    "oauthConfig": {"service_account": service_account_name}
+                }
+            },
+            "toolUseExamples": tool_use_examples,
+        }
+
+    def create_extension_instance(self, display_name: str, description: str, open_api_gcs_uri: str,
+                                  llm_name: str = None, llm_description: str = None, runtime_config: dict = None, service_account: str = None):
+        project_id = get_gcp_project()
+        extension_name = f"projects/{project_id}/locations/us-central1/extensions/{validate_extension_id(display_name)}"
+
+        extension = extensions.Extension.create(
+            extension_name=extension_name,
+            display_name=display_name,
+            description=description,
+            runtime_config=runtime_config or None,
+            manifest={
+                "name": llm_name or display_name,
+                "description": llm_description or description,
+                "api_spec": {
+                    "open_api_gcs_uri": open_api_gcs_uri
+                },
+                "auth_config": {
+                    "auth_type": "GOOGLE_SERVICE_ACCOUNT_AUTH",
+                    "google_service_account_config": service_account or {},
+                },
+            },
+        )
+        log.info(f"Created Vertex Extension: {extension_name}")
+
+        return extension
+
+    def execute_extension(self, operation_id: str, operation_params: dict, extension_id: str):
+        init_vertex(location=self.location)
+
+        if not extension_id.startswith("projects/"):
+            project_id = get_gcp_project()
+            extension_name = f"projects/{project_id}/locations/{self.location}/extensions/{extension_id}"
+        else:
+            extension_name = extension_id
+
+        extension = extensions.Extension(extension_name)
+
+        response = extension.execute(
+            operation_id=operation_id,
+            operation_params=operation_params,
+        )
+
+        return response
+
+    def execute_code_extension(self, query: str, filenames: list[str] = None, gcs_files: list[str] = None):
+        if filenames and gcs_files:
+            raise ValueError("Can't specify both filenames and gcs_files")
+
+        extension_code_interpreter = extensions.Extension.from_hub("code_interpreter")
+
+        file_arr = None
+        if filenames:
+            file_arr = [
+                {
+                    "name": filename,
+                    "contents": base64.b64encode(open(filename, "rb").read()).decode()
+                }
+                for filename in filenames
+            ]
+
+        response = extension_code_interpreter.execute(
+            operation_id="generate_and_execute",
+            operation_params={
+                "query": query,
+                "files": file_arr,
+                "file_gcs_uris": gcs_files
+            })
+
+        self.CODE_INTERPRETER_WRITTEN_FILES.extend(
+            [item['name'] for item in response['output_files']])
+
+        if response.get('execution_error'):
+            log.error(f"Code Execution Response failed with: {response.get('execution_error')} - maybe retry?")
+
+        return response
+
+    def parse_files_to_html(self, outputFiles, save_files_locally=True):
+        file_list = []
+        details_tml = """<details><summary>{name}</summary><div>{html_content}</div></details>"""
+
+        if not outputFiles:
+            return "No Files generated from the code"
+        # Sort output_files so images are displayed before other files such as JSON.
+        for output_file in sorted(
+                outputFiles,
+                key=lambda x: x["name"].split(".")[-1] not in self.IMAGE_FILE_EXTENSIONS,
+        ):
+            file_name = output_file.get("name")
+            file_contents = base64.b64decode(output_file.get("contents"))
+            if save_files_locally:
+                open(file_name, "wb").write(file_contents)
+
+            if file_name.split(".")[-1] in self.IMAGE_FILE_EXTENSIONS:
+                # Render Image
+                file_html_content = ('<img src="data:image/png;base64, '
+                                     f'{output_file.get("contents")}" />')
+            elif file_name.endswith(".json"):
+                import pprint
+                # Pretty print JSON
+                json_pp = pprint.pformat(
+                    json.loads(file_contents.decode()),
+                    compact=False,
+                    width=160)
+                file_html_content = (f'<span>{json_pp}</span>')
+            elif file_name.endswith(".csv"):
+                # CSV
+                try:
+                    import pandas
+                except ImportError:
+                    log.error("Need pandas for csv processing")
+                csv_md = pandas.read_csv(
+                    StringIO(file_contents.decode())).to_markdown(index=False)
+                file_html_content = f'<span>{csv_md}</span>'
+            elif file_name.endswith(".pkl"):
+                # PKL
+                file_html_content = f'<span>Preview N/A</span>'
+            else:
+                file_html_content = f"<span>{file_contents.decode()}</span>"
+
+            file_list.append({'name': file_name, "html_content": file_html_content})
+
+        buffer_html = [details_tml.format(**_file) for _file in file_list]
+        return "".join(buffer_html)
+    
+    def process_response(self, response: dict, save_files_locally=None) -> str:
+        result_template = """
+        <details open>
+            <summary class='main_summary'>{summary}:</summary>
+            <div><pre>{content}</pre></div>
+        </details>
+        """
+
+        result = ""
+        code = response.get('generated_code')
+        if 'execution_result' in response and response['execution_result'] != "":
+            result = result_template.format(
+                summary="Executed Code Output",
+                content=response.get('execution_result'))
+        else:
+            result = result_template.format(
+                summary="Executed Code Output",
+                content="Code does not produce printable output.")
+
+        if response.get('execution_error', None):
+            result += result_template.format(
+                summary="Generated Code Raised a (Possibly Non-Fatal) Exception",
+                content=response.get('execution_error', None))
+
+        result += result_template.format(
+            summary="Files Created <u>(Click on filename to view content)</u>",
+            content=self.parse_files_to_html(
+                response.get('output_files', []),
+                save_files_locally=True))
+
+        html_content = f"""
+{self.css_styles}
+<div id='main'>
+    <h3>Generated Code by Code Interpreter</h3>
+    <pre><code>{code}</code></pre>
+    <h3>Code Execution Results</h3>
+    {result}
+</div>
+"""
+        if save_files_locally:
+            with open('code_execution_results.html', 'w') as file:
+                file.write(html_content)
+
+        return html_content

{sunholo-0.70.4 → sunholo-0.70.6}/sunholo/vertex/memory_tools.py

@@ -90,13 +90,13 @@ def get_vertex_memories(vector_name):
                     de = DiscoveryEngineClient(vector_name, project_id=get_gcp_project())
                     log.info(f"Found vectorstore {vectorstore}")
 
-                    data_store_path = de.data_store_path()
+                    data_store_path = f"{de.data_store_path()}/dataStores/{vector_name}"
                     corpus_tool = Tool.from_retrieval(
                         grounding.Retrieval(grounding.VertexAISearch(datastore=data_store_path))
                     )
                     tools.append(corpus_tool)
                 except Exception as err:
-                    log.error(f"Failed to fetch DiscoveryEngine groudning - {str(err)} - skipping")
+                    log.error(f"Failed to fetch DiscoveryEngine grounding - {str(err)} - skipping")
                     continue
                 
 

{sunholo-0.70.4 → sunholo-0.70.6}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.70.4
+Version: 0.70.6
 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.70.4.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.70.6.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.70.4 → sunholo-0.70.6}/sunholo.egg-info/SOURCES.txt

@@ -120,6 +120,7 @@ sunholo/utils/user_ids.py
 sunholo/utils/version.py
 sunholo/vertex/__init__.py
 sunholo/vertex/extensions.py
+sunholo/vertex/extensions_class.py
 sunholo/vertex/init.py
 sunholo/vertex/memory_tools.py
 sunholo/vertex/safety.py