sunholo 0.83.3__py3-none-any.whl → 0.83.5__py3-none-any.whl

sunholo/database/alloydb_client.py

@@ -9,6 +9,7 @@ except ImportError:
     pass
 
 from .database import get_vector_size
+from .uuid import generate_uuid_from_object_id
 from ..custom_logging import log
 from ..utils import ConfigManager
 
@@ -79,9 +80,11 @@ class AlloyDBClient:
             log.info("User specified {user} - using pg8000 engine")
             self.inst_url = self._build_instance_uri(project_id, region, cluster_name, instance_name)
             self.engine = self._create_engine_from_pg8000()
+            self.engine_type = "pg8000"
         else:
             log.info("Build with Langchain engine - will use default service account for auth")
             self.engine = self._create_engine()
+            self.engine_type = "langchain"
 
     def _build_instance_uri(self, project_id, region, cluster_name, instance_name):
         return f"projects/{project_id}/locations/{region}/clusters/{cluster_name}/instances/{instance_name}"
@@ -120,16 +123,25 @@ class AlloyDBClient:
             region=self.config["region"],
             cluster=self.config["cluster"],
             instance=self.config["instance"],
-            password=self.password,
             database=self.database,
             ip_type=self.config.get("ip_type") or IPTypes.PRIVATE
         )
+        self._loop = engine._loop
 
         log.info(f"Created AlloyDB engine for {engine}")
 
         return engine
-
+    
     def execute_sql(self, sql_statement):
+        if self.engine_type == "pg8000":
+            return self._execute_sql_pg8000(sql_statement)
+        elif self.engine_type == "langchain":
+            return self._execute_sql_langchain(sql_statement)
+    
+    def _execute_sql_langchain(self, sql_statement):
+        return self.engine._fetch(query = sql_statement)
+
+    def _execute_sql_pg8000(self, sql_statement):
         """Executes a given SQL statement with error handling.
 
          - sql_statement (str): The SQL statement to execute.
@@ -152,6 +164,17 @@ class AlloyDBClient:
         return result
     
     async def execute_sql_async(self, sql_statement):
+        if self.engine_type == "pg8000":
+            result = await self._execute_sql_async_pg8000(sql_statement)
+        elif self.engine_type == "langchain":
+            result = await self._execute_sql_async_langchain(sql_statement)
+        
+        return result
+
+    async def _execute_sql_async_langchain(self, sql_statement):
+        return await self.engine._afetch(query = sql_statement)
+        
+    async def _execute_sql_async_pg8000(self, sql_statement):
         """Executes a given SQL statement asynchronously with error handling."""
         sql_ = sqlalchemy.text(sql_statement)
         result = None
@@ -168,6 +191,34 @@ class AlloyDBClient:
                 await conn.close()
 
         return result
+    
+    def get_document_from_docstore(self, source:str, vector_name):
+        query = self._get_document_from_docstore(source, vector_name)
+
+        return self.execute_sql(query)
+
+    async def get_document_from_docstore_async(self, source:str, vector_name:str):
+        query = self._get_document_from_docstore(source, vector_name)
+
+        document = await self.execute_sql_async(query)
+
+        return document
+    
+    def _get_document_from_docstore(self, source:str, vector_name:str):
+        if not isinstance(source, str):
+            raise ValueError("The 'source' parameter must be a single string, not a list of strings or other iterable.")
+
+        table_name = f"{vector_name}_docstore"
+        doc_id = generate_uuid_from_object_id(source)
+
+        query = f"""
+            SELECT * 
+            FROM {table_name}
+            WHERE doc_id = {doc_id}
+            LIMIT 1;
+        """
+
+        return query
 
     async def get_sources_from_docstore_async(self, sources, vector_name, search_type="OR", just_source_name=False):
         """Fetches sources from the docstore asynchronously."""
@@ -211,7 +262,7 @@ class AlloyDBClient:
             FROM {table_name}
             WHERE {conditions}
             ORDER BY langchain_metadata->>'objectId' ASC
-            LIMIT 500;
+            LIMIT 50;
         """
 
         return query

sunholo/utils/config_class.py

@@ -89,7 +89,7 @@ class ConfigManager:
                 continue
             if filename.endswith(('.yaml', '.yml', '.json')):
                 config_file = os.path.join(folder, filename)
-                log.debug(f"Checking config file: {config_file}")
+               
                 if filename in self.config_cache:
                     cached_config, cache_time = self.config_cache[filename]
                     time_to_recache = (current_time - cache_time)

{sunholo-0.83.3.dist-info → sunholo-0.83.5.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.83.3
+Version: 0.83.5
 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.83.3.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.83.5.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -21,7 +21,7 @@ License-File: LICENSE.txt
 Requires-Dist: google-auth
 Requires-Dist: ruamel.yaml
 Requires-Dist: langchain >=0.2.12
-Requires-Dist: langchain-experimental >=0.0.61
+Requires-Dist: langchain-experimental ==0.0.63
 Requires-Dist: langchain-community >=0.2.11
 Provides-Extra: all
 Requires-Dist: asyncpg ; extra == 'all'

{sunholo-0.83.3.dist-info → sunholo-0.83.5.dist-info}/RECORD

@@ -59,7 +59,7 @@ sunholo/components/retriever.py,sha256=bKIVT7_18Ut3OJd0E0jyiISPnD9qkHWVjcQPT4i1_
 sunholo/components/vectorstore.py,sha256=xKk7micTRwZckaI7U6PxvFz_ZSjCH48xPTDYiDcv2tc,5913
 sunholo/database/__init__.py,sha256=bpB5Nk21kwqYj-qdVnvNgXjLsbflnH4g-San7OHMqR4,283
 sunholo/database/alloydb.py,sha256=YH8wNPS8gN-TDZEXQcVHxwd1NScHRfAxma3gK4R6KCk,11740
-sunholo/database/alloydb_client.py,sha256=138gtbPzgcFT9j6hLQ1QD263ny_wJ0qPXCjKIK49Xts,12722
+sunholo/database/alloydb_client.py,sha256=JYozFOOdeDNEB1D2_If488qS1Qc7emHowUEQL0fgU1E,14617
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -118,7 +118,7 @@ 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_class.py,sha256=ygKw3E-Q6MLc1XZKRULCTPTibsOFlEfyCA3GyxOhPa8,9869
+sunholo/utils/config_class.py,sha256=tp3mXrwbgOISvI1iT-NhEffD6QpIUK65ik7aT_gi-5o,9819
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
 sunholo/utils/gcp_project.py,sha256=Fa0IhCX12bZ1ctF_PKN8PNYd7hihEUfb90kilBfUDjg,1411
@@ -134,9 +134,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=q_phxgGX2TG2j2MXNULF2xGzQnQPENwjPN9nZ_A9Gh0,7526
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.83.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.83.3.dist-info/METADATA,sha256=SIKK5jlQKCKbpXixBWG5EJZiU_BUku1ytzEbiz0tnWE,7413
-sunholo-0.83.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.83.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.83.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.83.3.dist-info/RECORD,,
+sunholo-0.83.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.83.5.dist-info/METADATA,sha256=05IvbTEGbeGoW5dwFBd2IUAEBd7nFySYZcQConfSrLs,7413
+sunholo-0.83.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.83.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.83.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.83.5.dist-info/RECORD,,