vector-vault 2.7.0__tar.gz → 2.7.2__tar.gz

{vector_vault-2.7.0 → vector_vault-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector_vault
-Version: 2.7.0
+Version: 2.7.2
 Summary: Customize ChatGPT and unleash the full potential of generative AI with Vector Vault
 Home-page: https://github.com/John-Rood/VectorVault
 Author: VectorVault.io

{vector_vault-2.7.0 → vector_vault-2.7.2}/setup.py

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

{vector_vault-2.7.0 → vector_vault-2.7.2}/vector_vault.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector-vault
-Version: 2.7.0
+Version: 2.7.2
 Summary: Customize ChatGPT and unleash the full potential of generative AI with Vector Vault
 Home-page: https://github.com/John-Rood/VectorVault
 Author: VectorVault.io

{vector_vault-2.7.0 → vector_vault-2.7.2}/vectorvault/cloudmanager.py

@@ -100,11 +100,11 @@ class CloudManager:
         else:
             print(f"Item metadata at path {meta_path} does not exist.")
     
-    def rename_item(self, vault, old_item, new_item):
-        old_path = self.cloud_name(vault, old_item, self.user, self.api, item=True)
-        new_path = self.cloud_name(vault, new_item, self.user, self.api, item=True)
-        old_meta_path = self.cloud_name(vault, old_item, self.user, self.api, meta=True)
-        new_meta_path = self.cloud_name(vault, new_item, self.user, self.api, meta=True)
+    def rename_item(self, old_item : int, new_item : int):
+        old_path = self.cloud_name(self.vault, old_item, self.user, self.api, item=True)
+        new_path = self.cloud_name(self.vault, new_item, self.user, self.api, item=True)
+        old_meta_path = self.cloud_name(self.vault, old_item, self.user, self.api, meta=True)
+        new_meta_path = self.cloud_name(self.vault, new_item, self.user, self.api, meta=True)
         
         old_blob = self.cloud.blob(old_path)
         new_blob = self.cloud.blob(new_path)
@@ -117,19 +117,17 @@ class CloudManager:
         else:
             print(f"Item at path {old_path} does not exist.")
         if old_meta_blob.exists(self.storage_client):
-            self.cloud.copy_blob(old_meta_blob, self.cloud, new_meta_blob.name)
+            meta_data_string = old_meta_blob.download_as_string()
+            meta_data = json.loads(meta_data_string)
+            meta_data['item_id'] -= 1
+            new_meta_blob.upload_from_string(json.dumps(meta_data))
             old_meta_blob.delete()
         else:
             print(f"Item at path {old_path} does not exist.")
             
     def delete_and_rename_all_items_after(self, item_id):
-        """
-        Deletes an item specified by item_id and renames all subsequent items 
-        by decrementing their item_ids by one.
-        """
-        
         # Delete the specified item
-        self.delete_item(self.cloud_name(self.vault, item_id, self.user, self.api, item=True))
+        self.delete_item(item_id)
         
         # Start renaming subsequent items
         current_item_id = item_id + 1
@@ -142,7 +140,7 @@ class CloudManager:
             
             if current_blob.exists(self.storage_client):
                 # Rename the current item to next_item_id
-                self.rename_item(self.vault, current_item_id, next_item_id)
+                self.rename_item(current_item_id, next_item_id)
                 current_item_id += 1
             else:
                 # If the blob doesn't exist, break out of the loop

{vector_vault-2.7.0 → vector_vault-2.7.2}/vectorvault/vault.py

@@ -18,12 +18,11 @@ import tempfile
 import os
 import time
 import re
-import openai
 import json
 import traceback
 from concurrent.futures import ThreadPoolExecutor
 from .cloudmanager import CloudManager
-from .ai import AI
+from .ai import AI, openai
 from .itemize import itemize, name_vecs, get_item, get_vectors, build_return, cloud_name
 from .vecreq import call_get_similar
 from .tools_gpt import ToolsGPT
@@ -96,7 +95,7 @@ class Vault:
         if self.saved_already == True:
             self.clear_cache()
             print("The last save was aborted before the build process finished. Clearing cache to start again...")
-        self.saved_already = True
+        self.saved_already = True # Make sure the if the save process is interrupted, data will not get corrupted
         start_time = time.time()
         self.vectors.build(trees)
 
@@ -143,28 +142,31 @@ class Vault:
         self.cloud_manager.delete()
         print('Vault deleted')
 
-    def delete_item(self, item_id : int):
+    def delete_items(self, item_ids : list[int]) -> None:
         '''
-            Enter the item id to delete
+            Deletes one or more items from item_id(s) passed in.
+            item_ids is a list of one or more integers
         '''
         if self.verbose == True:
             print('Deleting item and rebuilding database...')
 
-        num_existing_items = self.vectors.get_n_items()
-        new_index = get_vectors(self.dims)
-        plus_one = 0
+        for item_id in item_ids:
+            num_existing_items = self.vectors.get_n_items()
+            self.cloud_manager.delete_and_rename_all_items_after(item_id)
+            new_index = get_vectors(self.dims)
+            plus_one = 0
 
-        for i in range((num_existing_items - 1)):
-            if i == item_id:
-                plus_one += 1 
-            else: 
-                vector = self.vectors.get_item_vector(i + plus_one)
-                new_index.add_item(i, vector)
+            for i in range((num_existing_items - 1)):
+                if i in item_ids:
+                    # equals 0 until the item being deleting has been removed
+                    plus_one += 1 
+                else: 
+                    vector = self.vectors.get_item_vector(i - plus_one) 
+                    new_index.add_item(i - plus_one, vector)
 
-        self.x = i + 1
-        self.vectors = new_index
-        self.cloud_manager.delete_and_rename_all_items_after(item_id)
-        print('Item deleted')
+            self.x = i + 1
+            self.vectors = new_index
+            print(f'Item {item_id} deleted')
 
     def check_index(self):
         '''
@@ -279,11 +281,12 @@ class Vault:
             '2023-07-16T04:29:00.730754', 'updated_at': '2023-07-16T04:29:00.730758'},
             'distance': 0.7101698517799377}]`
         '''
+        results = []
         self.load_vectors()
         start_time = time.time()
 
         for i in ids:
-            results = []
+            print(i)
             # Retrieve the item
             item_data = self.cloud_manager.download_text_from_cloud(cloud_name(self.vault, i, self.user, self.api, item=True))
             # Retrieve the metadata