vector-vault 4.2.8__tar.gz → 4.3.0__tar.gz

{vector_vault-4.2.8 → vector_vault-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector_vault
-Version: 4.2.8
+Version: 4.3.0
 Summary: Quickly create ChatGPT RAG apps and Unleash the full potential of GenAI with Vector Vault
 Home-page: https://github.com/John-Rood/VectorVault
 Author: VectorVault.io

{vector_vault-4.2.8 → vector_vault-4.3.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="vector_vault",
-    version="4.2.8",
+    version="4.3.0",
     packages=find_packages(),
     author="VectorVault.io",
     author_email="john@johnrood.com",

{vector_vault-4.2.8 → vector_vault-4.3.0}/vector_vault.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector-vault
-Version: 4.2.8
+Version: 4.3.0
 Summary: Quickly create ChatGPT RAG apps and Unleash the full potential of GenAI with Vector Vault
 Home-page: https://github.com/John-Rood/VectorVault
 Author: VectorVault.io

{vector_vault-4.2.8 → vector_vault-4.3.0}/vectorvault/cloudmanager.py

@@ -17,7 +17,7 @@ from google.cloud import storage
 from .creds import CustomCredentials
 from .vecreq import call_proj, call_update
 from .itemize import cloud_name
-from .vault import ThreadPoolExecutor, as_completed, time, json, os, tempfile, time
+from .vault import ThreadPoolExecutor, T, as_completed, time, json, os, tempfile, time
 
 class CloudManager:
     def __init__(self, user: str, api_key: str, vault: str, ai_api: str = None):
@@ -100,7 +100,7 @@ class CloudManager:
         return _map
     
     def update(self):
-        call_update(self.user, self.vault, self.api)
+        T(target=call_update, args=(self.user, self.vault, self.api)).start()
     
     def build_update(self):
         _map = self.get_mapping()

{vector_vault-4.2.8 → vector_vault-4.3.0}/vectorvault/vault.py

@@ -78,8 +78,14 @@ class Vault:
         if openai_key:
             self.openai_key = openai_key
             openai.api_key = self.openai_key
-        t = T(target=self.connect_to_cloud)
-        t.start()
+        try:
+            self.cloud_manager = CloudManager(self.user, self.api, self.vault, self.openai_key)
+            print(f'Connected vault: {self.vault}') if self.verbose else 0 
+        except Exception as e:
+            print('API KEY NOT FOUND or no internet connection!', e)
+            # user can still use the get_chat() function without an api key
+            self.cloud_manager = None
+
         self.embeddings_model = embeddings_model if embeddings_model else 'text-embedding-3-small'
         self.dims = 1536 if embeddings_model != 'text-embedding-3-large' else 3072
         self.vectors = get_vectors(self.dims)
@@ -95,19 +101,6 @@ class Vault:
         self.tools = ToolsGPT(verbose=verbose)
         self.rate_limiter = RateLimiter(max_attempts=30)
         self.cuid = conversation_user_id
-        t.join()
-
-
-    def connect_to_cloud(self):
-        try:
-            self.cloud_manager = CloudManager(self.user, self.api, self.vault, self.openai_key)
-            print(f'Connected vault: {self.vault}') if self.verbose else 0 
-                
-        except Exception as e:
-            print('API KEY NOT FOUND or no internet connection!', e)
-            # user can still use the get_chat() function without an api key
-            self.cloud_manager = None
-
 
     def get_vaults(self, vault: str = None):
         '''
@@ -392,8 +385,6 @@ class Vault:
     def check_index(self):
         if not self.x_checked:
             start_time = time.time()
-            while self.cloud_manager is None:
-                time.sleep(.01)
             if self.cloud_manager.vault_exists(name_vecs(self.vault, self.user, self.api)):
                 if not self.vecs_loaded:
                     self.load_vectors()
@@ -1015,7 +1006,7 @@ class Vault:
                         print(f"API Failed too many times, exiting loop: {e}.")
                         break
 
-        self.update_conversation_history(self.cuid, response) if self.cuid else None
+        self.update_conversation_history(self.cuid, response, user=False) if self.cuid else None
         print("get chat time --- %s seconds ---" % (time.time() - start_time)) if self.verbose else 0
             
         return {'response': response, 'context': context} if return_context else response
@@ -1135,7 +1126,7 @@ class Vault:
                         except Exception as e:
                             raise e
                         if counter == len(inputs):
-                            self.update_conversation_history(self.cuid, full_response) if self.cuid else None
+                            self.update_conversation_history(self.cuid, full_response, user=False) if self.cuid else None
                             yield '!END'
                             self.rate_limiter.on_success()
                     
@@ -1173,11 +1164,11 @@ class Vault:
                                             for i in range(len(metatag)):
                                                 yield str(metatag_prefixes[i]) + str(item['metadata'][f'{metatag[i]}'])
                                 yield item['data']
-                            self.update_conversation_history(self.cuid, full_response) if self.cuid else None
+                            self.update_conversation_history(self.cuid, full_response, user=False) if self.cuid else None
                             yield '!END'
                             self.rate_limiter.on_success()
                         else:
-                            self.update_conversation_history(self.cuid, full_response) if self.cuid else None
+                            self.update_conversation_history(self.cuid, full_response, user=False) if self.cuid else None
                             yield '!END'
                             self.rate_limiter.on_success()
 
@@ -1189,7 +1180,7 @@ class Vault:
                             self.rate_limiter.on_success()
                         except Exception as e:
                             raise e
-                        self.update_conversation_history(self.cuid, full_response) if self.cuid else None
+                        self.update_conversation_history(self.cuid, full_response, user=False) if self.cuid else None
                         yield '!END'
 
                     self.rate_limiter.on_success()
@@ -1283,7 +1274,7 @@ class Vault:
         t2 = T(target=self.cloud_manager.upload_to_cloud, args=(f'user_history/{conversation_id}/metadata', json.dumps(metadata_list)))
         t1.start()
         t2.start()
-        call_cloud_save(self.user, self.api, self.openai_key, f'user_history/{conversation_id}/vectors', self.embeddings_model, message, name=message_id, split_size=3000)
+        self.add_n_save(message, vault = f'user_history/{conversation_id}/vectors', name = message_id)
         t1.join()
         t2.join()