vector-vault 4.2.2__tar.gz → 4.2.4__tar.gz

{vector_vault-4.2.2 → vector_vault-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector_vault
-Version: 4.2.2
+Version: 4.2.4
 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.2 → vector_vault-4.2.4}/setup.py

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

{vector_vault-4.2.2 → vector_vault-4.2.4}/vector_vault.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector-vault
-Version: 4.2.2
+Version: 4.2.4
 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.2 → vector_vault-4.2.4}/vectorvault/ai.py

@@ -7,8 +7,9 @@ import tempfile
 stock_sys_msg = "You are an AI assistant that excels at following instructions exactly."
 
 class AI:
-    def __init__(self, personality_message: str = None, main_prompt: str = None, verbose: bool = False) -> None:
+    def __init__(self, personality_message: str = None, main_prompt: str = None, verbose: bool = False, timeout: int = 300) -> None:
         self.verbose = verbose
+        self.timeout = timeout
         self.model_token_limits = {
         'gpt-3.5-turbo': 16000,
         'gpt-3.5-turbo-0125': 16000,
@@ -50,8 +51,9 @@ class AI:
 
         return new_model
 
-    def make_call(self, messages, model, temperature, timeout=45):
+    def make_call(self, messages, model, temperature, timeout=None):
         # This function will be run in a separate thread
+        timeout = self.timeout if not timeout else timeout
         def call_api(response_queue):
             try:
                 response = openai.chat.completions.create(
@@ -76,18 +78,17 @@ class AI:
 
 
     # This function returns a ChatGPT completion based on a provided input
-    def llm(self, user_input: str = '', history: str = '', model='gpt-3.5-turbo', max_tokens = 4000, custom_prompt = False, temperature = 0, timeout = 45, max_retries = 5):        
+    def llm(self, user_input: str = '', history: str = '', model='gpt-3.5-turbo', max_tokens = 4000, custom_prompt = False, temperature = 0, timeout = None, max_retries = 5):        
         '''
             If you pass in a custom_prompt, make sure you format your inputs - this function will not change it
             If you want a custom_prompt but also want to pass `user_input` to take advantage of this function's formatting, then save your custom prompt as default with `save_custom_prompt` in vault.py
         '''
+        timeout = self.timeout if not timeout else timeout
         prompt_template = custom_prompt if custom_prompt else self.prompt
 
         # Use token_model_check to select the suitable model based on token count
         model = self.model_check(self.get_tokens(history + user_input + prompt_template), model)
         max_tokens = self.model_token_limits.get(model, 4000)
-        timeout = timeout * 2 if model in ['gpt-4-1106-preview','gpt-4-turbo-preview','gpt-4-0125-preview'] else timeout
-        timeout = timeout * .67 if model in ['gpt-3.5-turbo','gpt-3.5-turbo-0125','gpt-3.5-turbo-16k'] else timeout
 
         if user_input:
             new_texts = self.truncate_text(user_input, history, prompt_template, max_tokens=max_tokens)
@@ -161,12 +162,11 @@ class AI:
                 }]).choices[0].message.content
 
 
-    def llm_w_context(self, user_input = '', context = '', history = '', model = 'gpt-3.5-turbo', max_tokens = 4000, custom_prompt = False, temperature = 0, timeout = 45, max_retries = 5):
+    def llm_w_context(self, user_input = '', context = '', history = '', model = 'gpt-3.5-turbo', max_tokens = 4000, custom_prompt = False, temperature = 0, timeout = None, max_retries = 5):
+        timeout = self.timeout if not timeout else timeout
         prompt_template = custom_prompt if custom_prompt else self.context_prompt
         model = self.model_check(self.get_tokens(history + user_input + prompt_template + context), model)
         max_tokens = self.model_token_limits.get(model, 4000)
-        timeout = timeout * 2 if model in ['gpt-4-1106-preview','gpt-4-turbo-preview','gpt-4-0125-preview'] else timeout
-        timeout = timeout * .67 if model in ['gpt-3.5-turbo','gpt-3.5-turbo-0125','gpt-3.5-turbo-16k'] else timeout
 
         if user_input and context:
             new_texts = self.truncate_text(user_input, history, prompt_template, context, max_tokens=max_tokens)

{vector_vault-4.2.2 → vector_vault-4.2.4}/vectorvault/tools_gpt.py

@@ -4,41 +4,43 @@ import ast
 
 '''
     ToolsGPT is a set of tools special to large language models. 
-    Every tool turns subjectivity into objectivity.
+    Every tool turns unstructured data into structured data.
     
-    Objectivity is needed for code. 
-    Subjectivity is the primary human input.
-    These tools bridge the gap between human interaction and code. 
+    Structure data is required to run programs. 
+    Unstructured data is the primary human output.
+    AI tools convert unstructured data into structured data, 
+    bridging the gap between humans and programs. 
+    Therefore, in the future, everything will be programmable.
     
     ToolsGPT allows you to get the following for any input:
         1. `get_rating` - returns a rating out of 10 for any input
         2. `get_yes_no` - returns a 'yes' or a 'no' to any question
-        3. `get_binary` - returns a '0' or '1' to any input
-        4. `get_match` - returns a match to a list options
-        5. `match_or_make` - returns a match to a list of options, or a new option
+        3. `get_number` - returns an integer based on your instructions
+        4. `get_match` - returns a match to a list options - (single choice)
+        5. `get_multi_match` - returns one or many matches to a list of options - (multiple choice)
         6. `get_topic` - returns the topic subject matter of any input 
 
         1. `get_rating`:
-            Useful to get a quality rating
+            Get a numeric rating out of 10 for anything
 
         2. `get_yes_no`:
-            Useful for getting a difinitive answer 
+            Get an exact 'yes' or 'no' to any question
 
-        3. `get_binary`:
-            Useful for getting a definitive answer in 0/1 format
+        3. `get_number`:
+            Get an integer output for any input
         
         4. `get_match`:
-            Useful to get an exact match to a single option within a set of options 
+            Get an exact match to a single item within a list 
+            -> in: (text and list of strings) 
+            -> out: (one exact match to an answer in list -> string type)
+        
+        5. `get_multi_match`:
+            Get many matches to items within a list  
             -> in: (text and list of answers) 
-            -> out: (exact match to one answer in list of answer)
+            -> out: (list of exact matches -> list type)
 
-        5. `get_topic`:
+        6. `get_topic`:
             Useful to classify the topic of conversation
-        
-        6. `match_or_make` (M&M):
-            Get a match to a list of options, or make a new one if unrelated
-            Useful if you aren't sure if the input will match one of your existing list options, and need flexibility of creating a new one
-            Also useful when starting from an empty list. - will create it from scratch
 '''
 
 class ToolsGPT():
@@ -46,6 +48,7 @@ class ToolsGPT():
         self.verbose = verbose
         self.llm = AI(verbose=verbose).llm
 
+
     def get_rating(self, text: str = None, concept_to_rate_for: str = None, model='gpt-3.5-turbo', loop_limit=20) -> int:
         '''
             Get a numeric rating out of 10. Input plain text, and concept to rate for. Defualts to 'quality'
@@ -70,16 +73,25 @@ that this number has been carefully considered given your concept. My rating out
         try:
             return int(answer) # try to return an int zero shot
         except:
-            return self.get_number(answer, model=model, loop_limit=loop_limit) # force the integer if zero shot fails
+            return self.retry_until_its_a_number(answer, model=model, loop_limit=loop_limit) # force the integer if zero shot fails
         
         
-    def get_number(self, content: str, model='gpt-3.5-turbo', loop_limit=5) -> int:
+    def get_number(self, concept, content: str, model='gpt-3.5-turbo', loop_limit=5) -> int:
+        '''
+            param: `concept` - is the idea used to generate a number with - i.e. "How many students are in the professor's class?" 
+            param: `content` - is the content to generate a number for - i.e. "I had 400 students in my class last year, but this year, I have 10% more." 
+        '''
+        response = self.retry_llm(f'{concept} \n\n{content}', model=model, loop_limit=loop_limit)
+        print("Initial number extraction response:", response) if self.verbose else 0
+        return response if type(response) is int else self.retry_until_its_a_number(response, model=model, loop_limit=loop_limit)
+        
+    
+    def retry_until_its_a_number(self, content: str, model='gpt-3.5-turbo', loop_limit=5) -> int:
         '''
-            Your content will be injected into this prompt: 
-            `...User: The following content should be a number - Content: "{content}"`
+            param: `content` - the AI will return an integer based on the content you input
         '''
-        def retry_until_its_a_number(content):
-            prompt_template = """Respond only with a number in integer format...
+
+        prompt_template = """Respond only with a number in integer format...
 Example content: 'The revenue for the last fiscal year was $1,200,000.' Example answer: '1200000'
 Example content 2: 'The company has been in business for twenty years.' Example answer 2: '20'
 Example content 3: 'The recipe calls for three cups of flour.' Example answer 3: '3'
@@ -90,27 +102,31 @@ Example content 7: 'The project deadline is in 45 days.' Example answer 7: '45'
 User: The following content should be a number - Content: "{content}"
 \nAgent:"""
 
-            prompt = prompt_template.format(content=content)
-            response = self.retry_llm(custom_prompt=prompt, model=model, loop_limit=loop_limit)
-            if self.verbose: 
-                print("Extracted Number: ", response)
-            return response
-        loops = 0
-        answer = content
-        while True:
-            if loops >= loop_limit:
-                break
-            answer = retry_until_its_a_number(answer)
-            if self.verbose == True:
-                print(f"Loops: {loops} |  Number: {answer}")
-            loops += 1
-            try:
-                answer = int(answer)
-                break # finally exit loop when we get an integer
-            except:
-                pass
+        prompt = prompt_template.format(content=content)
+        response = self.retry_llm(custom_prompt=prompt, model=model, loop_limit=loop_limit)
+        print("Initial number extraction response:", response) if self.verbose else 0
+
+        if type(response) is int:
+            return response 
+        
+        else: # loop until its a number
+            loops = 0
+            answer = content
+
+            while True: 
+                if loops >= loop_limit:
+                    break
+
+                prompt = prompt_template.format(content=answer)
+                answer = self.retry_llm(custom_prompt=prompt, model=model, loop_limit=loop_limit)
+                print(f"Loops: {loops} |  Number: {answer}") if self.verbose else 0
+                    
+                try:
+                    answer = int(answer)
+                    return answer # exit loop and return the integer
+                except:
+                    loops += 1
 
-        return answer # return the integer
     
     def get_yes_no(self, text: str, question: str = None, model='gpt-3.5-turbo', loop_limit=20) -> str:
         '''
@@ -118,36 +134,16 @@ User: The following content should be a number - Content: "{content}"
             Be sure to input text to get a yes or no to, then ask the question to answer
         '''
         answer = self.yay_or_nay(text, question, model=model) if question else self.yay_or_nay_question_in_content(text, model=model) 
-        if self.verbose == True:
-            print(f"Y/N Initial Answer: {answer}")
-
+        print(f"Y/N Initial Answer: {answer}") if self.verbose == True else 0
+            
         loops = 0
         while loops < loop_limit and answer not in ['yes', 'no']:
             answer = self.isolate_yes_no(answer)
-            if self.verbose:
-                print(f"Y/N Answer {loops}: {answer}")
+            print(f"Y/N Answer {loops}: {answer}") if self.verbose else 0
             loops += 1
 
         return answer
 
-    def get_binary(self, text: str, zero_if: str, one_if: str, model='gpt-3.5-turbo', loop_limit=20) -> str:
-        '''
-            Get an exact "0" or "1" to any question, given an input. 
-            Input text to get a decision on, then tell why to pick 0 and why to pick 1. 
-            Prompt starts with "Repond '0' if"...
-        '''
-        answer = self.zero_or_one(text, zero_if, one_if, model=model)
-        if self.verbose == True:
-            print(f"0/1 Initial Answer: {answer}")
-
-        loops = 0
-        while loops < loop_limit and int(answer) not in [0, 1]:
-            answer = self.isolate_zero_one(answer)
-            if self.verbose:
-                print(f"0/1 Answer {loops}: {answer}")
-            loops += 1
-            
-        return int(answer)
 
     def get_match(self, text: str, list_of_options: list, model='gpt-3.5-turbo', loop_limit=4) -> str:
         '''
@@ -185,6 +181,7 @@ Content to classify: "{text}"  \n\nDo not respond with anything other than the o
 
         return new_answer
 
+
     def get_multi_match(self, text: str, list_of_options: list, model='gpt-3.5-turbo', loop_limit=4) -> str:
         '''
         This function can be used in a variety of Natural Language Processing (NLP) tasks, 
@@ -203,6 +200,7 @@ Content to classify: "{text}"  \n\n Respond with a subset list that matches the
 
         return [i if i in list_of_options else self.get_match(i, list_of_options, model, loop_limit) for i in ast.literal_eval(answer)]
 
+
     def get_topic(self, text: str, list_of_options: list, model='gpt-3.5-turbo', loop_limit=4) -> str:
         '''
         Like get_match, default optimized for topic recognition
@@ -213,13 +211,11 @@ Content to classify: "{text}"  \n\n Respond with a subset list that matches the
             list_copy.append(option.strip().replace('.', '').lower().strip('"').strip("'"))
         prompt_template = """Respond with one of the options on this list: {list_of_options} 
 Content to classify: "{content}"  \n\nClassifiy the content above based on which topic it is mostly related to one topic: {list_of_options}"""
+        
         prompt = prompt_template.format(content=text, list_of_options=list_copy)
-
         topic = self.retry_llm_in_list(prompt, list_copy, model, loop_limit)
-
-        if self.verbose:
-            print(f"Topic Answer: {topic}")
-
+        print(f"Topic Answer: {topic}") if self.verbose else 0
+            
         if topic is not None:
             topic = list_of_options[list_copy.index(topic)]  # return original topic
 
@@ -268,6 +264,7 @@ Respond "Yes" if the right category already exists in the list'''
         
         return answer
     
+
     # internal function 
     def make_option(self, text, list_of_options: list, model='gpt-3.5-turbo') -> str:
         prompt_template = """Content to classify: "{content}"  \n\n
@@ -277,6 +274,7 @@ Create a new category for the content based on these other categories in this li
 
         return self.retry_llm(custom_prompt=prompt, model=model)
 
+
     # internal function 
     def make_option_from_zero(self, text, model='gpt-3.5-turbo'):
         '''
@@ -290,6 +288,7 @@ no explination before or after, just the name of the catagory. \n\nThe name of t
 
         return self.retry_llm(custom_prompt=prompt, model=model)
     
+
     # internal function 
     def finalize_category(self, text, prev_answer):
         prompt_template = """Given the following category suggestion: "{prev_answer}"
@@ -299,6 +298,7 @@ no explination before or after, just the name of the catagory. \n\nThe name of t
 
         return self.retry_llm(custom_prompt=prompt)
 
+
     # internal function 
     def isolate_yes_no(self, content, question: str, model='gpt-3.5-turbo'):
         '''Not recommended for external use. Internal function'''
@@ -313,6 +313,7 @@ Example question 5: 'Will this happen if it's 19 percent likely to happen?' Exam
 
         return self.retry_llm(custom_prompt=prompt, model=model)
     
+
     # internal function 
     def yay_or_nay(self, content, question: str, model='gpt-3.5-turbo'):
         '''Not recommended for external use. Internal function'''
@@ -327,6 +328,7 @@ Example question 5: 'Will this happen if it's 19 percent likely to happen?' Exam
 
         return self.retry_llm(custom_prompt=prompt, model=model)
     
+
     # internal function 
     def yay_or_nay_question_in_content(self, content: str, model='gpt-3.5-turbo'):
         '''Not recommended for external use. Internal function'''
@@ -344,6 +346,7 @@ Agent:"""
 
         return self.retry_llm(custom_prompt=prompt, model=model)
     
+
     # internal function 
     def zero_or_one(self, content, zero_if: str, one_if: str, model='gpt-3.5-turbo'):
         '''Not recommended for external use. Internal function'''
@@ -358,6 +361,7 @@ Example question 5: 'Will this happen if it's 19 percent likely to happen?' Exam
 
         return self.retry_llm(custom_prompt=prompt, model=model)
     
+
     # internal function 
     def isolate_zero_one(self, content, model='gpt-3.5-turbo'):
         '''Not recommended for external use. Internal function'''
@@ -372,6 +376,7 @@ Example question 5: 'Will this happen if it's 19 percent likely to happen?' Exam
 
         return self.retry_llm(custom_prompt=prompt, model=model)
 
+
     # This function is called by the others to handle retries:
     def retry_llm(self, custom_prompt, model='gpt-3.5-turbo', loop_limit=2, temperature=0):
         for i in range(loop_limit):
@@ -383,11 +388,12 @@ Example question 5: 'Will this happen if it's 19 percent likely to happen?' Exam
                     print(f"Attempt {i+1} failed with error: {str(e)}. Retrying...")
                 else:
                     raise f"Attempt {i+1} failed with error: {str(e)}. No more retries."
-                
+
+
     def perfect(self, content, instructions: str, model='gpt-3.5-turbo'):
         '''Wrapper function ensures that you get exactly what you wanted, and will not return until you get what you wanted'''
-        output = self.get_yes_no(model=model, text=f"These are the instructions: {instructions}", 
-                    question=f"This is the Output: {content} \n\nDoes this output match the instructions?", ) == 'no'
+        output = self.get_yes_no(model=model, text=f"These are the instructions: {instructions} and this is the Output: {content}", 
+                    question=f"Does the output match the instructions?", ) == 'no'
         
         while output:
             new_intstructions = f'''The following content does not match the instructions exactly. Your job is to return the content exactly as the instructions direct:

{vector_vault-4.2.2 → vector_vault-4.2.4}/vectorvault/vault.py

@@ -96,16 +96,18 @@ class Vault:
         self.rate_limiter = RateLimiter(max_attempts=30)
         t.join()
 
+
     def connect_to_cloud(self):
         try:
             self.cloud_manager = CloudManager(self.user, self.api, self.vault)
-            if self.verbose:
-                print(f'Connected vault: {self.vault}')
+            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):
         '''
             Returns a list of vaults within the current vault directory 
@@ -113,6 +115,7 @@ class Vault:
         vault = self.vault if vault is None else vault
         return self.cloud_manager.list_vaults(vault)
 
+
     def get_total_items(self, vault: str = None):
         '''
             Returns the total number of vectored items in the Vault
@@ -130,6 +133,7 @@ class Vault:
             except: # it doesn't exist
                 return 0
 
+
     def get_tokens(self, text: str):
         '''
             Returns the number of tokens for any given text
@@ -137,6 +141,7 @@ class Vault:
         self.load_ai()
         return self.ai.get_tokens(text)
     
+
     def get_distance(self, id1: int, id2: int):
         '''
             Returns the distance between two vectors - item ids are needed to compare
@@ -144,6 +149,7 @@ class Vault:
         self.check_index()
         return self.vectors.get_distance(id1, id2)
     
+
     def get_item_vector(self, item_id: int):
         '''
             Returns the vector from an item id
@@ -151,6 +157,7 @@ class Vault:
         self.check_index()
         return self.vectors.get_item_vector(item_id)
 
+
     def load_ai(self):
         self.ai_loaded = True
         self.ai = AI(verbose=self.verbose)
@@ -158,15 +165,16 @@ class Vault:
         self.ai.prompt = self.fetch_custom_prompt(context=False)
         self.ai.personality_message = self.fetch_personality_message()
 
+
     def save_personality_message(self, text: str):
         '''
             Saves personality_message to the vault and use it by default from now on
         '''
         self.cloud_manager.upload_personality_message(text)
 
-        if self.verbose:
-            print(f"Personality message saved")
-    
+        print(f"Personality message saved") if self.verbose else 0
+            
+
     def fetch_personality_message(self):
         '''
             Retrieves personality_message from the vault if it is there or else use the defualt
@@ -182,6 +190,7 @@ class Vault:
                 
         return personality_message
     
+
     def save_custom_prompt(self, text: str, context=True):
         '''
             Saves custom_prompt to the vault and use it by default from now on
@@ -189,9 +198,9 @@ class Vault:
         '''
         self.cloud_manager.upload_custom_prompt(text) if context else self.cloud_manager.upload_no_context_prompt(text)
 
-        if self.verbose:
-            print(f"Custom prompt saved")
-    
+        print(f"Custom prompt saved") if self.verbose else 0
+            
+
     def fetch_custom_prompt(self, context=True):
         '''
             Retrieves custom_prompt from the vault if there or eles use defualt - (used for get_context = True responses)
@@ -208,6 +217,7 @@ class Vault:
             
         return prompt
 
+
     def save(self, trees: int = 10):
         '''
             Saves all the data added locally to the Cloud. All Vault references are Cloud references.
@@ -229,10 +239,9 @@ class Vault:
                 total_saved_items += 1
 
         self.upload_vectors()
-
-        if self.verbose:
-            print(f"upload time --- {(time.time() - start_time)} seconds --- {total_saved_items} items saved")
+        print(f"upload time --- {(time.time() - start_time)} seconds --- {total_saved_items} items saved") if self.verbose else 0
             
+
     def clear_cache(self):
         '''
             Clears the cache for all the loaded items 
@@ -242,12 +251,13 @@ class Vault:
         self.vecs_loaded = True
         self.saved_already = False
 
+
     def delete(self):
         '''
             Deletes the entire Vault and all contents
         '''
-        if self.verbose:
-            print('Deleting started. Note: this can take a while for large datasets')
+        print('Deleting started. Note: this can take a while for large datasets') if self.verbose else 0
+            
         # Clear the local vector data
         self.vectors = get_vectors(self.dims)
         self.items.clear()
@@ -255,11 +265,13 @@ class Vault:
         self.x = 0
         print('Vault deleted')
     
+
     def remap(self, item_id):
         for i in range(item_id, len(self.map) - 1):
             self.map[str(i)] = self.map[str(i + 1)]
         self.map.popitem()
 
+
     def update_vault_data(self):
         nary = []
         try:
@@ -296,6 +308,7 @@ class Vault:
 
         self.cloud_manager.upload_temp_file(nary_temp_file_path, f'{self.cloud_manager.username}.json')
 
+
     def delete_items(self, item_ids: List[int], trees: int = 10) -> None:
         '''
             Deletes one or more items from item_id(s) passed in.
@@ -334,8 +347,8 @@ class Vault:
             self.remap(item_id)
             rebuild_vectors(item_id)
 
-        if self.verbose:
-            print(f'Item {item_id} deleted')
+        print(f'Item {item_id} deleted') if self.verbose else 0
+
 
     def edit_item(self, item_id: int, new_text: str, trees: int = 10) -> None:
         '''
@@ -362,17 +375,16 @@ class Vault:
         self.cloud_manager.upload_to_cloud(cloud_name(self.vault, self.map[str(item_id)], self.user, self.api, item=True), new_text)
         edit_vector(item_id, self.process_batch([new_text], never_stop=False, loop_timeout=180)[0])
 
-        if self.verbose:
-            print(f'Item {item_id} edited')
+        print(f'Item {item_id} edited') if self.verbose else 0
+
 
     def edit_item_meta(self, item_id: int, metadata) -> None:
         '''
             Edit and save any item's metadata
         '''
         self.cloud_manager.upload_to_cloud(cloud_name(self.vault, self.map[str(item_id)], self.user, self.api, meta=True), json.dumps(metadata))
+        print(f'Item {item_id} metadata saved') if self.verbose else 0
 
-        if self.verbose:
-            print(f'Item {item_id} metadata saved')
 
     def check_index(self):
         if not self.x_checked:
@@ -383,8 +395,8 @@ class Vault:
                 self.reload_vectors()
             
             self.x_checked = True
-            if self.verbose:
-                print("initialize index --- %s seconds ---" % (time.time() - start_time))
+            print("initialize index --- %s seconds ---" % (time.time() - start_time)) if self.verbose else 0
+                
 
     def load_mapping(self):
         '''Internal function only'''
@@ -401,6 +413,7 @@ class Vault:
         self.map[str(self.x)] = str(uuid.uuid4())
         self.x +=1
     
+
     def load_vectors(self):
         start_time = time.time()
         t = T(target=self.load_mapping())
@@ -410,8 +423,8 @@ class Vault:
         os.remove(temp_file_path)
         t.join()
         self.vecs_loaded = True
-        if self.verbose:
-            print("get load vectors --- %s seconds ---" % (time.time() - start_time))
+        print("get load vectors --- %s seconds ---" % (time.time() - start_time)) if self.verbose else 0
+
 
     def make_3d_map(self, highlight_id: int = None, return_html: bool = False):
         from kneed import KneeLocator
@@ -509,6 +522,7 @@ class Vault:
         else:
             fig.show()
 
+
     def reload_vectors(self):
         num_existing_items = self.vectors.get_n_items()
         new_index = get_vectors(self.dims)
@@ -520,6 +534,7 @@ class Vault:
         self.x = count + 1
         self.vectors = new_index
 
+
     def upload_vectors(self):
         with tempfile.NamedTemporaryFile(delete=False) as temp_file:
             vector_temp_file_path = temp_file.name
@@ -542,6 +557,7 @@ class Vault:
         self.vecs_loaded = False
         self.saved_already = False
 
+
     def split_text(self, text: str, min_threshold: int = 1000, max_threshold: int = 16000):
         '''
         Internal function
@@ -584,11 +600,11 @@ class Vault:
         if current_segment and (current_length >= min_threshold or not segments):
             segments.append(" ".join(current_segment))
 
-        if self.verbose:
-            print(f'split_text chunks: {len(segments)}') 
+        print(f'split_text chunks: {len(segments)}') if self.verbose else 0
         
         return segments
     
+
     def get_items(self, ids: List[int] = [], vault: str = None) -> list:
         '''
             Get one or more items from the database. 
@@ -641,11 +657,11 @@ class Vault:
                 index, result = future.result()
                 results[index] = result  # Insert each result at its corresponding index
             
-        if self.verbose:
-            print(f"Retrieved {len(ids)} items --- %s seconds ---" % (time.time() - start_time))
-
+        print(f"Retrieved {len(ids)} items --- %s seconds ---" % (time.time() - start_time)) if self.verbose else 0
+        
         return results
 
+
     def get_items_by_vector(self, vector: list, n: int = 4, include_distances: bool = False):
         '''
             Internal function that returns vector similar items. Requires input vector, returns similar items
@@ -670,8 +686,8 @@ class Vault:
                         index, result = future.result()
                         results[index] = result  # Insert each result at its corresponding index
 
-                if self.verbose:
-                    print(f"get {n} items back --- %s seconds ---" % (time.time() - start_time))
+                print(f"get {n} items back --- %s seconds ---" % (time.time() - start_time)) if self.verbose else 0
+                   
                 return results
             else:
                 vecs, distances = self.vectors.get_nns_by_vector(vector, n, include_distances=include_distances)
@@ -690,12 +706,13 @@ class Vault:
                         index, result = future.result()
                         results[index] = result  # Insert each result at its corresponding index
 
-                if self.verbose:
-                    print(f"get {n} items back --- %s seconds ---" % (time.time() - start_time))
+                print(f"get {n} items back --- %s seconds ---" % (time.time() - start_time))if self.verbose else 0
+                   
                 return results
         except:
             return [{'data': 'No data has been added', 'metadata': {'no meta': 'No metadata has been added'}}]
 
+
     def get_similar_local(self, text: str, n: int = 4, include_distances: bool = False):
         '''
             Returns similar items from the Vault as the one you entered, but locally
@@ -705,6 +722,7 @@ class Vault:
         vector = self.process_batch([text], never_stop=False, loop_timeout=180)[0]
         return self.get_items_by_vector(vector, n, include_distances=include_distances)
     
+
     def get_similar(self, text: str, n: int = 4, include_distances: bool = False):
         '''
             Returns similar items from the Vault as the text you enter.
@@ -712,11 +730,10 @@ class Vault:
             Param `include_distances = True` adds the "distance" field to the return.
             The distance can be useful for assessing similarity differences in the items returned. 
             Each item has its' own distance number, and this changes the structure of the output.
-
-
         '''
         return call_get_similar(self.user, self.vault, self.api, self.openai_key, text, n, include_distances=include_distances, verbose=self.verbose)
 
+
     def add_item(self, text: str, meta: dict = None, name: str = None):
         """
             If your text length is greater than 15000 characters, you should use Vault.split_text(your_text) to 
@@ -727,6 +744,7 @@ class Vault:
         self.items.append(new_item)
         self.add_to_map()
 
+
     def add(self, text: str, meta: dict = None, name: str = None, split: bool = False, split_size: int = 1000, max_threshold: int = 16000):
         """
             If your text length is greater than 4000 tokens, Vault.split_text(your_text)  
@@ -735,14 +753,15 @@ class Vault:
         self.check_index()
 
         if len(text) > 15000 or split:
-            if self.verbose:
-                print('Using the built-in "split_text()" function to get a list of texts') 
+            print('Using the built-in "split_text()" function to get a list of texts') if self.verbose else 0 
+                
             texts = self.split_text(text, min_threshold=split_size, max_threshold=max_threshold) # returns list of text segments
         else:
             texts = [text]
         for text in texts:
             self.add_item(text, meta, name)
 
+
     def add_n_save(self, text: str, meta: dict = None, name: str = None, split: bool = False, split_size: int = 1000, max_threshold: int = 16000):
         """
             Adds data, gets vectors, then saves the data to the cloud in one call
@@ -753,6 +772,7 @@ class Vault:
         self.get_vectors()
         self.save()
 
+
     def add_item_with_vector(self, text: str, vector: list, meta: dict = None, name: str = None):
         """
             If your text length is greater than 15000 characters, you should use Vault.split_text(your_text) to 
@@ -769,9 +789,9 @@ class Vault:
         self.items.append(itemize(self.vault, self.x, meta, text, name))
         self.add_to_map()
 
-        if self.verbose:
-            print("add item time --- %s seconds ---" % (time.time() - start_time))
-        
+        print("add item time --- %s seconds ---" % (time.time() - start_time)) if self.verbose else 0
+            
+
     def process_batch(self, batch_text_chunks, never_stop, loop_timeout):
         '''
             Internal function
@@ -799,9 +819,10 @@ class Vault:
                         raise TimeoutError("Loop timed out")
         return [record.embedding for record in res.data]
         
+
     def get_vectors(self, batch_size: int = 32, never_stop: bool = False, loop_timeout: int = 777):
         '''
-        Takes text data added to the vault, and gets vectors for them
+            Takes text data added to the vault, and gets vectors for them
         '''
         self.check_index()
         start_time = time.time()
@@ -827,14 +848,13 @@ class Vault:
                 current_item_index += 1
 
         self.last_time = time.time()
-        if self.verbose:
-            print("get vectors time --- %s seconds ---" % (time.time() - start_time))
-
+        print("get vectors time --- %s seconds ---" % (time.time() - start_time)) if self.verbose else 0
+            
 
     def get_chat(self, text: str = None, history: str = None, summary: bool = False, get_context: bool = False, 
                  n_context: int = 4, return_context: bool = False, history_search: bool = False, smart_history_search: bool = False, 
                  model: str = 'gpt-3.5-turbo', include_context_meta: bool = False, custom_prompt: bool = False, 
-                 local: bool =False, temperature: int = 0, timeout: int = 45):
+                 local: bool =False, temperature: int = 0, timeout: int = 300):
         '''
             Chat get response from OpenAI's ChatGPT. 
             Models: ChatGPT = "gpt-3.5-turbo" • GPT4 = "gpt-4" 
@@ -984,19 +1004,16 @@ class Vault:
                         print(f"API Failed too many times, exiting loop: {e}.")
                         break
 
-        if self.verbose:
-            print("get chat time --- %s seconds ---" % (time.time() - start_time))
-
-        if not return_context:
-            return response
-        elif return_context:
-            return {'response': response, 'context': context}
+        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
         
+
     def get_chat_stream(self, text: str = None, history: str = None, summary: bool = False, get_context: bool = False,
                         n_context: int = 4, return_context: bool = False, history_search: bool = False, smart_history_search: bool = False, 
                         model: str ='gpt-3.5-turbo', include_context_meta: bool = False, metatag: bool = False,
                         metatag_prefixes: bool = False, metatag_suffixes: bool = False, custom_prompt: bool = False, 
-                        local: bool = False, temperature: int = 0, timeout: int = 45):
+                        local: bool = False, temperature: int = 0, timeout: int = 300):
         '''
             Always use this get_chat_stream() wrapped by either print_stream(), or cloud_stream().
             cloud_stream() is for cloud functions, like a flask app serving a front end elsewhere.
@@ -1164,8 +1181,8 @@ class Vault:
                         print(f"API Failed too many times, exiting loop: {e}.")
                         break
             
-        if self.verbose:
-            print("get chat time --- %s seconds ---" % (time.time() - start_time))
+        print("get chat time --- %s seconds ---" % (time.time() - start_time)) if self.verbose else 0
+            
 
     def print_stream(self, function, printing=True):
         '''
@@ -1185,6 +1202,7 @@ class Vault:
             else:
                 return full_text
         
+
     def print_vault_data(self, print_data: bool = True, return_data: bool = False):
         ''' 
             Function to print vault data 
@@ -1223,6 +1241,7 @@ class Vault:
         
             return vd if return_data else None
         
+
     def cloud_stream(self, function):
         '''
             For cloud application yielding the chat stream, like a flask app
@@ -1230,6 +1249,7 @@ class Vault:
         for word in function:
             yield f"data: {json.dumps({'data': word})} \n\n"
 
+
 class RateLimiter:
     def __init__(self, max_attempts=30):
         self.base_delay = 1  # Base delay of 1 second