sunholo 0.62.12__py3-none-any.whl → 0.62.14__py3-none-any.whl

sunholo/agents/flask/qna_routes.py

@@ -206,6 +206,8 @@ def prep_vac(request, vector_name):
     stream_wait_time = data.pop('stream_wait_time', 7)
     stream_timeout = data.pop('stream_timeout', 120)
     chat_history = data.pop('chat_history', None)
+    vector_name = data.pop('vector_name', vector_name)
+
     paired_messages = extract_chat_history(chat_history)
 
     all_input = {'user_input': user_input, 

sunholo/cli/run_proxy.py

@@ -277,7 +277,7 @@ def setup_proxy_subparser(subparsers):
     start_parser.add_argument('--port', type=int, help='Port to run the proxy on. Auto-assigns if not provided.')
     start_parser.add_argument('--local', action='store_true', help='Run the service locally instead of proxying to Cloud Run.')
     start_parser.add_argument('--app-type', choices=['flask', 'fastapi'], help='If local, type of the local app (flask or fastapi).')
-    start_parser.add_argument('--app-folder', help='If local, folder containing the local app.py')
+    start_parser.add_argument('--app-folder', default=".", help='If local, folder containing the local app.py')
     start_parser.add_argument('--log-file', action='store_true', help='Whether to create a file containing proxy logs.')
     start_parser.set_defaults(func=lambda args: start_proxy(args.service_name, 
                                                             args.region, 

sunholo/vertex/__init__.py

@@ -1,2 +1,3 @@
 from .init import init_vertex
-from .memory_tools import get_vertex_memories
+from .memory_tools import get_vertex_memories, print_grounding_response
+from .safety import vertex_safety

sunholo/vertex/memory_tools.py

@@ -1,6 +1,6 @@
 try:
     from vertexai.preview import rag
-    from vertexai.preview.generative_models import Tool, grounding
+    from vertexai.preview.generative_models import Tool, grounding, GenerationResponse
 except ImportError:
     rag = None
 
@@ -89,3 +89,53 @@ def get_vertex_memories(vector_name):
         log.warning("No llamaindex Vertex corpus configurations could be found")
     
     return tools
+
+def print_grounding_response(response):
+    """Prints Gemini response with grounding citations."""
+    grounding_metadata = response.candidates[0].grounding_metadata
+
+    # Citation indices are in byte units
+    ENCODING = "utf-8"
+    text_bytes = response.text.encode(ENCODING)
+
+    prev_index = 0
+    markdown_text = ""
+
+    sources: dict[str, str] = {}
+    footnote = 1
+    for attribution in grounding_metadata.grounding_attributions:
+        context = attribution.web or attribution.retrieved_context
+        if not context:
+            log.info(f"Skipping Grounding Attribution {attribution}")
+            continue
+
+        title = context.title
+        uri = context.uri
+        end_index = int(attribution.segment.end_index)
+
+        if uri not in sources:
+            sources[uri] = {"title": title, "footnote": footnote}
+            footnote += 1
+
+        text_segment = text_bytes[prev_index:end_index].decode(ENCODING)
+        markdown_text += f"{text_segment} [[{sources[uri]['footnote']}]]({uri})"
+        prev_index = end_index
+
+    if prev_index < len(text_bytes):
+        markdown_text += str(text_bytes[prev_index:], encoding=ENCODING)
+
+    markdown_text += "\n## Grounding Sources\n"
+
+    if grounding_metadata.web_search_queries:
+        markdown_text += (
+            f"\n**Web Search Queries:** {grounding_metadata.web_search_queries}\n"
+        )
+    elif grounding_metadata.retrieval_queries:
+        markdown_text += (
+            f"\n**Retrieval Queries:** {grounding_metadata.retrieval_queries}\n"
+        )
+
+    for uri, source in sources.items():
+        markdown_text += f"{source['footnote']}. [{source['title']}]({uri})\n"
+    
+    log.info(markdown_text)

sunholo/vertex/safety.py

@@ -0,0 +1,35 @@
+try:
+    from vertexai.generative_models import (
+        HarmCategory,
+        HarmBlockThreshold,
+    )
+except ImportError:
+    pass
+
+def vertex_safety(threshold: str = "BLOCK_ONLY_HIGH"):
+    """
+    BLOCK_ONLY_HIGH - block when high probability of unsafe content is detected
+    BLOCK_MEDIUM_AND_ABOVE - block when medium or high probability of content is detected
+    BLOCK_LOW_AND_ABOVE - block when low, medium, or high probability of unsafe content is detected
+    BLOCK_NONE - no block, but need to be on an allow list to use
+    """
+
+    if threshold == 'BLOCK_ONLY_HIGH':
+        thresh = HarmBlockThreshold.BLOCK_ONLY_HIGH
+    elif threshold == 'BLOCK_MEDIUM_AND_ABOVE':
+        thresh = HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE
+    elif threshold == 'BLOCK_LOW_AND_ABOVE':
+        thresh = HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
+    elif threshold == 'BLOCK_NONE':
+        thresh = HarmBlockThreshold.BLOCK_NONE
+    else:
+        raise ValueError("Invalid threshold")
+
+    safety_settings = {
+        HarmCategory.HARM_CATEGORY_HARASSMENT: thresh,
+        HarmCategory.HARM_CATEGORY_HATE_SPEECH: thresh,
+        HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: thresh,
+        HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: thresh,
+    }
+
+    return safety_settings

{sunholo-0.62.12.dist-info → sunholo-0.62.14.dist-info}/METADATA

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

{sunholo-0.62.12.dist-info → sunholo-0.62.14.dist-info}/RECORD

@@ -12,7 +12,7 @@ sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyo
 sunholo/agents/fastapi/qna_routes.py,sha256=DgK4Btu5XriOC1JaRQ4G_nWEjJfnQ0J5pyLanF6eF1g,3857
 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=t5BabGKjlK3sMcaXZywja47gtQRoROXXz6NMm8H-SSc,8561
+sunholo/agents/flask/qna_routes.py,sha256=x9QMY-z-1_ThCLAAtHQPC-oTmVulch3sTy_9KwsKHtI,8617
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -38,7 +38,7 @@ sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
 sunholo/cli/deploy.py,sha256=zxdwUsRTRMC8U5vyRv0JiKBLFn84Ug_Tc88-_h9hJSs,1609
 sunholo/cli/embedder.py,sha256=5m_FaAqF6bnLJQj93HGySC-OOCXo2NCUVG_ZBjE1oUM,6937
 sunholo/cli/merge_texts.py,sha256=U9vdMwKmcPoc6iPOWX5MKSxn49dNGbNzVLw8ui5PhEU,1823
-sunholo/cli/run_proxy.py,sha256=0ft_9FUL9d1NKM2ABMMPpvXRTRZd9f-lR2FCahiGzlU,11281
+sunholo/cli/run_proxy.py,sha256=5CihmxymaCSwu1U58ySux38T3CQhx_FZkGRJLs99ix4,11294
 sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
@@ -97,12 +97,13 @@ sunholo/utils/gcp_project.py,sha256=0ozs6tzI4qEvEeXb8MxLnCdEVoWKxlM6OH05htj7_tc,
 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/vertex/__init__.py,sha256=7B5Wf41da0dl9JOOrwq35Ob5jcKen_w5T-Tw5f4eoWE,75
+sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,136
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
-sunholo/vertex/memory_tools.py,sha256=AFiuUPeP35b2FtKIwB2hq7GvJCdhmqfsyrbxtzi5gZQ,3598
-sunholo-0.62.12.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.62.12.dist-info/METADATA,sha256=DAPURuKLUJOVKWPfQdfsGd4KycfCX4iL2OOB0T5ReYA,8059
-sunholo-0.62.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.62.12.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.62.12.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.62.12.dist-info/RECORD,,
+sunholo/vertex/memory_tools.py,sha256=PMMJa0ecb0GUavUX275lhJjhmelc7bEIoM81G_uH4ys,5306
+sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
+sunholo-0.62.14.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.62.14.dist-info/METADATA,sha256=fOpbqUK_ycWdrySd41SQ2xXuyLP79cnGzyyEefc3iHU,8059
+sunholo-0.62.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.62.14.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.62.14.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.62.14.dist-info/RECORD,,