sunholo 0.126.0__tar.gz → 0.126.2__tar.gz

{sunholo-0.126.0/src/sunholo.egg-info → sunholo-0.126.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.126.0
+Version: 0.126.2
 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

{sunholo-0.126.0 → sunholo-0.126.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sunholo"
-version = "0.126.0"
+version = "0.126.2"
 description = "Large Language Model DevOps - a package to help deploy LLMs to the Cloud."
 readme = "README.md"
 requires-python = ">=3.10"

{sunholo-0.126.0 → sunholo-0.126.2}/src/sunholo/chunker/process_chunker_data.py

@@ -35,14 +35,14 @@ def process_chunker_data(message_data, metadata, vector_name):
     # checks if only a llamaindex chunking/embedder, return early as no other processing needed
     llamacheck = llamaindex_chunker_check(message_data, metadata, vector_name)
     if llamacheck:
-
-        return llamacheck
+        log.info(f"No further chunker required for {message_data}")
+        return None
     
     # if only a discovery engine memory, return early as no other processing needed
     discovery_check = discovery_engine_chunker_check(message_data, metadata, config=config, process=False)
     if discovery_check:
-
-        return discovery_check
+        log.info(f"No further chunker required for {message_data}")
+        return None
 
     log.info(f"Discovery engine and llamaindex checks passed - continuing to other memory types for {metadata}")
     chunks = []

{sunholo-0.126.0 → sunholo-0.126.2}/src/sunholo/discovery_engine/chunker_handler.py

@@ -36,20 +36,24 @@ 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")
+
+                project_id = value.get("project_id")
+                location = value.get("location", "eu")
+                if not project_id:
+                    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=project_id
+                    project_id=project_id,
                     # location needs to be 'eu' or 'us' which doesn't work with other configurations
-                    #location=location or global_location
+                    location=location
                     )
 
                 corpuses.append(corpus)
@@ -145,6 +149,7 @@ def discovery_engine_chunker_check(message_data,
     total_memories = len(check_write_memories(config))
     total_discovery_memories = check_discovery_engine_in_memory(config)
 
+    log.debug(f"{memories=} {total_memories=} {total_discovery_memories=}")
     if not process and total_memories == total_discovery_memories:
         log.info(f"Do not process discovery engine, and only memory found is discovery engine for {metadata} - stopping")
         
@@ -158,7 +163,7 @@ def discovery_engine_chunker_check(message_data,
     # If discovery engine is the only entry, return
     if total_discovery_memories == total_memories:
         log.info(f"Process discovery engine was only type found in {metadata} - stopping")
-        
+
         return disc_meta
     
     elif disc_meta:

{sunholo-0.126.0 → sunholo-0.126.2/src/sunholo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.126.0
+Version: 0.126.2
 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