sunholo 0.109.5__py3-none-any.whl → 0.110.1__py3-none-any.whl

sunholo/discovery_engine/chunker_handler.py

@@ -36,10 +36,18 @@ def do_discovery_engine(message_data:str, metadata:dict, config:ConfigManager=No
                 log.info(f"Found vectorstore {vectorstore}")
                 if value.get('read_only'):
                     continue
+                gcp_config = config.vacConfig("gcp_config")
+                if not gcp_config:
+                    project_id = get_gcp_project()
+                else:
+                    project_id = gcp_config.get("project_id")
+
+                if not project_id:
+                    raise ValueError("Couldn't retrieve project_id for vertex_ai_search")        
                 #location = gcp_config.get('location') 
                 corpus = DiscoveryEngineClient(
                     data_store_id=config.vector_name, 
-                    project_id=get_gcp_project(),
+                    project_id=project_id
                     # location needs to be 'eu' or 'us' which doesn't work with other configurations
                     #location=location or global_location
                     )

sunholo/discovery_engine/create_new.py

@@ -11,7 +11,8 @@ def create_new_discovery_engine(config:ConfigManager):
         if "chunk_size" in chunker_config:
             chunk_size = chunker_config["chunk_size"]    
 
-    project_id = get_gcp_project()
+    gcp_config = config.vacConfig("gcp_config")
+    project_id = gcp_config.get("project_id") or get_gcp_project()
     if not project_id:
         raise ValueError("Could not find project_id in gcp_config")
     

sunholo/discovery_engine/get_ai_search_chunks.py

@@ -37,7 +37,9 @@ def get_all_chunks(question:str, config:ConfigManager):
                 num_chunks = value.get('num_chunks') or 3
                 gcp_config = config.vacConfig("gcp_config")
                 project_id = gcp_config.get('project_id')
-                chunk = get_chunks(question, vector_name, num_chunks, project_id=project_id)
+                serving_config = value.get('serving_config')
+
+                chunk = get_chunks(question, vector_name, num_chunks, project_id=project_id, serving_config=serving_config)
                 if chunk:
                     chunks.append(chunk)
     if chunks:
@@ -46,10 +48,12 @@ def get_all_chunks(question:str, config:ConfigManager):
     log.warning(f"No chunks found for {vector_name}")
     return None
 
-def get_chunks(question, vector_name, num_chunks, project_id=None):
+def get_chunks(question, vector_name, num_chunks, project_id=None, serving_config=None):
+    if serving_config is None:
+        serving_config = "default_serving_config"
     de = DiscoveryEngineClient(vector_name, project_id=project_id or get_gcp_project(include_config=True))
     try:
-        return de.get_chunks(question, num_previous_chunks=num_chunks, num_next_chunks=num_chunks)
+        return de.get_chunks(question, num_previous_chunks=num_chunks, num_next_chunks=num_chunks, serving_config=serving_config)
     except Exception as err:
         log.error(f"No discovery engine chunks found: {str(err)}")
     

sunholo/genai/file_handling.py

@@ -51,6 +51,7 @@ VIDEO_MIMES = [
 AUDIO_MIMES = [
     'audio/wav',
     'audio/mp3',
+    'audio/mpeg', #added
     'audio/aiff',
     'audio/aac',
     'audio/ogg',
@@ -105,6 +106,8 @@ async def construct_file_content(gs_list, bucket:str):
             continue
         if the_mime_type in ALLOWED_MIME_TYPES:
             file_list.append(element)
+        else:
+            log.warning(f'{the_mime_type} is not in allowed MIME types for {element.get("name")}')
     
     if not file_list:
         return {"role": "user", "parts": [{"text": "No eligible contentTypes were found"}]}

sunholo/utils/config.py

@@ -211,6 +211,8 @@ def load_config_key(key: str, vector_name: str, kind: str):
     config = configs_by_kind[kind]
 
     apiVersion = config.get('apiVersion')
+    if apiVersion is None:
+        raise ValueError("Could not find apiVersion for config")
 
     log.debug(f"Fetching '{key}' for '{vector_name}' from '{kind}/{apiVersion}'")
     

{sunholo-0.109.5.dist-info → sunholo-0.110.1.dist-info}/METADATA

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

{sunholo-0.109.5.dist-info → sunholo-0.110.1.dist-info}/RECORD

@@ -71,10 +71,10 @@ sunholo/database/sql/sb/delete_source_row.sql,sha256=r6fEuUKdbiLHCDGKSbKINDCpJjs
 sunholo/database/sql/sb/return_sources.sql,sha256=89KAnxfK8n_qGK9jy1OQT8f9n4uYUtYL5cCxbC2mj_c,255
 sunholo/database/sql/sb/setup.sql,sha256=CvoFvZQev2uWjmFa3aj3m3iuPFzAAJZ0S7Qi3L3-zZI,89
 sunholo/discovery_engine/__init__.py,sha256=hLgqRDJ22Aov9o2QjAEfsVgnL3kMdM-g5p8RJ9OyKdQ,130
-sunholo/discovery_engine/chunker_handler.py,sha256=Fv4BLOBi_7ap3AiAy4TlTN48CLZSMurJ3TkvC75Euro,5123
-sunholo/discovery_engine/create_new.py,sha256=NzhSh6nG6nQ5J9gZh8IDph4JiEVT_DC5GGvP0GuwTWs,943
+sunholo/discovery_engine/chunker_handler.py,sha256=5tw5_jalNQosf7uFyCmsYA__VdNpWC1PPVVa420CzWU,5479
+sunholo/discovery_engine/create_new.py,sha256=jWg5LW-QpFE8zq50ShaQJB3Wu8loiWB0P4lRWaCHpss,1023
 sunholo/discovery_engine/discovery_engine_client.py,sha256=jfIayVUOPM4svGF1S5Kk60rIG-xSo_e3zOHtBRg0nZA,22002
-sunholo/discovery_engine/get_ai_search_chunks.py,sha256=7a83FnEDb5hn9j167XC_mN-3l-Sa-p_Yvivmu_DDN_0,4090
+sunholo/discovery_engine/get_ai_search_chunks.py,sha256=hsFGOQugSeTMPEaQ16XTs_D45F8NABBm2IsAEdTk7kQ,4316
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
 sunholo/embedder/embed_chunk.py,sha256=_FdO4-9frUJlDPqXv2Ai49ejUrrMTMGti3D7bfJGfy8,6984
 sunholo/excel/__init__.py,sha256=AqTMN9K4qJYi4maEgoORc5oxDVGO_eqmwzDaVP37JgY,56
@@ -86,7 +86,7 @@ sunholo/gcs/download_url.py,sha256=Ul81n1rklr8WogPsuxWWD1Nr8RHU451LzHPMJNhAKzw,6
 sunholo/gcs/extract_and_sign.py,sha256=paRrTCvCN5vkQwCB7OSkxWi-pfOgOtZ0bwdXE08c3Ps,1546
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/genai/__init__.py,sha256=6SWK7uV5F625J-P3xQoD6WKL59a9RSaidj-Guslyt8Q,192
-sunholo/genai/file_handling.py,sha256=vWkekjcKEpvavuO46Ogrqi8Ng1LPu-7iGgaWwDV4dsk,7665
+sunholo/genai/file_handling.py,sha256=N2AOqBaPJ9xGMQ1T_W45-rENyaMK7RRSBUZOOVrCDIg,7803
 sunholo/genai/images.py,sha256=EyjsDqt6XQw99pZUQamomCpMOoIah9bp3XY94WPU7Ms,1678
 sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
 sunholo/genai/process_funcs_cls.py,sha256=7_RQMqIAZ3nPP-GFgCHBvS39fwuWuGtvSyuJaJN_G3E,31590
@@ -132,7 +132,7 @@ sunholo/tools/web_browser.py,sha256=8Gdf02F4zCOeSnijnfaL6jzk4oaSI0cj48o-esoWzwE,
 sunholo/utils/__init__.py,sha256=Hv02T5L2zYWvCso5hzzwm8FQogwBq0OgtUbN_7Quzqc,89
 sunholo/utils/api_key.py,sha256=Ct4bIAQZxzPEw14hP586LpVxBAVi_W9Serpy0BK-7KI,244
 sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
-sunholo/utils/config.py,sha256=aG29MXcL5qzQMtCMqcdy-2ysDCYf9Zn_ZLk5NNOQNSE,8982
+sunholo/utils/config.py,sha256=uXD9cCLjZzdNpH5qZ2oVEo5Zb5EDkP9KxxjtriG9LgY,9074
 sunholo/utils/config_class.py,sha256=aNhxhEHIxRvqQNq_9wFJt1yM9U1ypahCVZ3NzPWuay4,9843
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
@@ -150,9 +150,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.109.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.109.5.dist-info/METADATA,sha256=Otmc-ulFD1PWOgeoOh0pbNnsEI_4z_Ve3Ir2wX8BTpE,8705
-sunholo-0.109.5.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-sunholo-0.109.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.109.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.109.5.dist-info/RECORD,,
+sunholo-0.110.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.110.1.dist-info/METADATA,sha256=eXAFbYzilR7c5qWIbYvvWimEAt3ID_5rN8R3yyPUb-0,8705
+sunholo-0.110.1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+sunholo-0.110.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.110.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.110.1.dist-info/RECORD,,

{sunholo-0.109.5.dist-info → sunholo-0.110.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any