sunholo 0.119.1__py3-none-any.whl → 0.119.4__py3-none-any.whl

sunholo/discovery_engine/chunker_handler.py

@@ -69,7 +69,10 @@ def do_discovery_engine(message_data:str, metadata:dict, config:ConfigManager=No
                     gcs_uri=message_data,
                     metadata=metadata
                 )
-                log.info(f"Imported file to corpus: {response} with metadata: {metadata}")
+                if response:
+                    log.info(f"Imported file to corpus: {response} with metadata: {metadata}")
+                else:
+                    log.warning(f"Could not import {message_data} got not response")
             except Exception as err:
                 log.error(f"Error importing {message_data} - {corp=} - {str(err)}")
 

sunholo/discovery_engine/create_new.py

@@ -1,6 +1,7 @@
 from .discovery_engine_client import DiscoveryEngineClient
 from ..utils import ConfigManager
 from ..utils.gcp_project import get_gcp_project
+from ..custom_logging import log
 
 def create_new_discovery_engine(config:ConfigManager):
 
@@ -12,9 +13,13 @@ def create_new_discovery_engine(config:ConfigManager):
             chunk_size = chunker_config["chunk_size"]    
 
     gcp_config = config.vacConfig("gcp_config")
-    project_id = gcp_config.get("project_id") or get_gcp_project()
+    if not gcp_config:
+        log.info("Found no gcp_config in configuration so using get_gcp_project()")
+        project_id = get_gcp_project()
+    else:
+        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")
+        raise ValueError("Could not find project_id in gcp_config or global")
     
     #location = gcp_config.get('location')
 

sunholo/discovery_engine/discovery_engine_client.py

@@ -435,7 +435,7 @@ class DiscoveryEngineClient:
         return operation.operation.name
 
     def _import_document_request(self,
-        request: discoveryengine.ImportDocumentsRequest # type: ignore
+        request
     ) -> str:
         """
         Handles the common logic for making an ImportDocumentsRequest, including retrying.
@@ -558,13 +558,15 @@ class DiscoveryEngineClient:
                 except json.JSONDecodeError as e:
                     log.error(f"Error decoding JSON in line: {line.strip()}. Error: {e}")
                     continue  # Skip to the next line if there's an error
+                except Exception as e:
+                    log.error(f"Unknown error: {str(e)}")
+                    raise e
 
         # 2. Use InlineSource to import:
         request = discoveryengine.ImportDocumentsRequest(
             parent=parent,
             inline_source=discoveryengine.ImportDocumentsRequest.InlineSource(
                 documents=documents_with_metadata,  # Pass the list of Document objects
-                data_schema="document"  # Important: Set to "document" when providing full Documents
             ),
             reconciliation_mode=discoveryengine.ImportDocumentsRequest.ReconciliationMode.INCREMENTAL,
         )
@@ -607,7 +609,6 @@ class DiscoveryEngineClient:
                 parent=parent,
                 inline_source=discoveryengine.ImportDocumentsRequest.InlineSource(
                     documents=[document],
-                    data_schema="document"
                 ),
                 reconciliation_mode=discoveryengine.ImportDocumentsRequest.ReconciliationMode.INCREMENTAL
             )
@@ -617,6 +618,7 @@ class DiscoveryEngineClient:
 
         except Exception as e:
             log.error(f"Error importing document with metadata: {e}")
+            raise e
     
     def get_mime_type(self, uri:str):
         return guess_mime_type(uri)

{sunholo-0.119.1.dist-info → sunholo-0.119.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sunholo
-Version: 0.119.1
+Version: 0.119.4
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0
@@ -20,7 +20,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aiohttp
 Requires-Dist: google-auth
-Requires-Dist: google-cloud-discoveryengine>=0.13.4
 Requires-Dist: pydantic
 Requires-Dist: requests
 Requires-Dist: ruamel.yaml

{sunholo-0.119.1.dist-info → sunholo-0.119.4.dist-info}/RECORD

@@ -72,9 +72,9 @@ 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=E3z-rVUuhjDebJY6nderr9QBYe8CrjwKskwIkOa_e68,5591
-sunholo/discovery_engine/create_new.py,sha256=jWg5LW-QpFE8zq50ShaQJB3Wu8loiWB0P4lRWaCHpss,1023
-sunholo/discovery_engine/discovery_engine_client.py,sha256=uZFNRtFtG9AfWM1Go3aPWmciyQ_4bQwhgiR2A9XjPPE,27606
+sunholo/discovery_engine/chunker_handler.py,sha256=dmdXpUIYIkmXUf3M6V-vuWqDXNthLPsKoSyzQmQOu4c,5731
+sunholo/discovery_engine/create_new.py,sha256=WUi4_xh_dFaGX3xA9jkNKZhaR6LCELjMPeRb0hyj4FU,1226
+sunholo/discovery_engine/discovery_engine_client.py,sha256=b6UT7s-1zqrLnIfoP9bDs64hk0SUsqaA40ghbs2A7go,27552
 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=Vvvj3-H4pSb1a2sLik3-X3X459j2jrUq1dBNAsOcQLo,7156
@@ -164,9 +164,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.119.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.119.1.dist-info/METADATA,sha256=0UGUFxVnrxTEFwLKYjbSWEu_8S74mPHVQgypdr1E-S4,9706
-sunholo-0.119.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-sunholo-0.119.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.119.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.119.1.dist-info/RECORD,,
+sunholo-0.119.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.119.4.dist-info/METADATA,sha256=cYBqEOOkHvurx9b3-ipXsEMDpa6JIARsvEpVIqWE2ZQ,9654
+sunholo-0.119.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+sunholo-0.119.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.119.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.119.4.dist-info/RECORD,,