vector-vault 7.2.2__tar.gz → 7.2.4__tar.gz

{vector_vault-7.2.2 → vector_vault-7.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector_vault
-Version: 7.2.2
+Version: 7.2.4
 Summary: Quickly create RAG apps, Agents, and Unleash the full power of AI with Vector Vault
 Home-page: https://github.com/John-Rood/VectorVault
 Author: VectorVault.io

{vector_vault-7.2.2 → vector_vault-7.2.4}/setup.py

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

{vector_vault-7.2.2 → vector_vault-7.2.4}/vector_vault.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector-vault
-Version: 7.2.2
+Version: 7.2.4
 Summary: Quickly create RAG apps, Agents, and Unleash the full power of AI with Vector Vault
 Home-page: https://github.com/John-Rood/VectorVault
 Author: VectorVault.io

{vector_vault-7.2.2 → vector_vault-7.2.4}/vectorvault/ai.py

@@ -312,6 +312,10 @@ class OpenAIPlatform(LLMPlatform):
             return None
 
     def model_check(self, token_count, model):
+        # Handle 'default' model - return the actual default model name
+        if model == 'default':
+            return self.model_token_limits['default']
+            
         if model not in self.model_token_limits.keys():
             return model
         else:

{vector_vault-7.2.2 → vector_vault-7.2.4}/vectorvault/itemize.py

@@ -119,10 +119,25 @@ def get_time_statement(now, message_time):
     return human_readable_time
 
 def load_json(json_object):
-    def load_json_from_string(string):
+    """
+    Loads a JSON object from either a string (potentially double-wrapped) or a direct object.
+    Handles cases where the JSON might be escaped inside a string by attempting multiple parses.
+    """
+    def parse_json(string):
         try:
             return json.loads(string)
         except json.JSONDecodeError:
             raise ValueError("Invalid JSON string provided.")
-        
-    return load_json_from_string(json_object) if isinstance(json_object, str) else json_object
+
+    # If it's not a string, return as is
+    if not isinstance(json_object, str):
+        return json_object
+
+    # Initial parse
+    result = parse_json(json_object)
+
+    # If the result is still a string (double-wrapped), parse again
+    if isinstance(result, str):
+        result = parse_json(result)
+
+    return result

{vector_vault-7.2.2 → vector_vault-7.2.4}/vectorvault/vault.py

@@ -1101,7 +1101,7 @@ class Vault:
         
         return json.dumps(results)
     
-
+    
     def upload_database_from_json(self, json_data: Union[str, dict]):
         """
         Replace your entire vault from a JSON string or dictionary.
@@ -1115,7 +1115,37 @@ class Vault:
         vault.upload_database_from_json(json_string_or_dict)
 
         """
-        items_dict = load_json(json_data)
+        def parse_json(string):
+            try:
+                return json.loads(string)
+            except json.JSONDecodeError:
+                print("Warning: JSON decoding failed. Attempting to clean and retry...") if self.verbose else 0
+                # Attempt to clean: strip outer quotes if present
+                cleaned = string.strip().strip('"')
+                try:
+                    return json.loads(cleaned)
+                except json.JSONDecodeError:
+                    print("Error: Failed to parse JSON after cleaning attempt. Skipping upload.") if self.verbose else 0
+                    return {}  # Return empty dict to adapt and continue without raising
+
+        # Load the JSON data with robust parsing
+        if not isinstance(json_data, str):
+            items_dict = json_data  # Already a dict, use as is
+        else:
+            # Initial parse for string input
+            result = parse_json(json_data)
+            
+            # If the result is still a string (double-wrapped), parse again
+            if isinstance(result, str):
+                result = parse_json(result)
+            
+            # After parsing, ensure it's a dict
+            if not isinstance(result, dict):
+                print("Warning: Parsed result is not a dictionary. Using empty dict to continue.") if self.verbose else 0
+                items_dict = {}
+            else:
+                items_dict = result
+
         print('Loaded json items') if self.verbose else 0
         print('Deleting cloud items') if self.verbose else 0
 
@@ -1124,7 +1154,7 @@ class Vault:
         items_added = 0
         for item_number, item_data in sorted(items_dict.items()):
             if 'data' not in item_data:
-                print(f"Skipping item {item_number}: Invalid format")
+                print(f"Skipping item {item_number}: Invalid format") if self.verbose else 0
                 continue
 
             self.add_item(text=item_data['data'], meta=item_data.get('metadata', None))