Update app.py

app.py

@@ -9,6 +9,20 @@ import Arcana
 from nylon import *
 import pandas as pd
 import json
+import fiber
+
+
+foldername = 'Celsiaaa'
+dbmsmode = 'Fiber'
+
+try:
+    with open('settings.arcana',mode='r') as file:
+        foldername,dbmsmode = file.read().split('\n')
+except Exception as e:
+    print(e)
+    with open('settings.arcana',mode='w') as file:
+        newsettings = foldername+'\n'+dbmsmode
+        file.write(newsettings)
 
 # SSL configuration to avoid verification issues
 try:
@@ -19,23 +33,58 @@ else:
     ssl._create_default_https_context = _create_unverified_https_context
 
 def query_database2(query):
-    db = ChatDatabase('memory.txt')
-
-    sender = 'Arcana'
-    N = 10
-    cache = {}
-    query_tag = None
-
-    relevant_messages = db.get_relevant_messages(sender, query, N, cache, query_tag)
+    print(dbmsmode)
+    if dbmsmode == 'Nylon':
+        db = ChatDatabase(foldername+'.txt')
+
+        sender = 'Arcana'
+        N = 10
+        cache = {}
+        query_tag = None
+
+        relevant_messages = db.get_relevant_messages(sender, query, N, cache, query_tag)
+
+        print("Relevant messages:")
+        for message in relevant_messages:
+            print(f"Sender: {message[0]}, Time: {message[1]}, Tag: {message[3]}")
+            print(f"Message: {message[2][:100]}...")
+            print()
+
+        df_data = [str(message) for message in relevant_messages]
+        return ';'.join(df_data)
+    elif dbmsmode == 'Fiber':
+        dbms = fiber.FiberDBMS()
+        # Load or create the database
+        dbms.load_or_create(foldername+'.txt')
+        results = dbms.query(query, 3)
+        
+        # Convert each result dictionary to a string
+        result_strings = []
+        for result in results:
+            result_str = f"Name: {result['name']}\nContent: {result['content']}\nTags: {result['tags']}\nIndex: {result['index']}"
+            result_strings.append(result_str)
+        
+        # Join all result strings with a separator
+        return ';'.join(result_strings)
+
+def list_files_indb(directory=foldername):
+    """
+    List all files in the given directory, separated by semicolons.
+    
+    :param directory: The directory to list files from. Defaults to the current directory.
+    :return: A string of filenames separated by semicolons.
+    """
+    try:
+        # Get all files in the directory
+        files = [f for f in os.listdir(directory) if os.path.isfile(os.path.join(directory, f))]
+        
+        # Join the filenames with semicolons
+        return ';'.join(files)
+    except Exception as e:
+        return f"An error occurred: {str(e)}"
 
-    print("Relevant messages:")
-    for message in relevant_messages:
-        print(f"Sender: {message[0]}, Time: {message[1]}, Tag: {message[3]}")
-        print(f"Message: {message[2][:100]}...")
-        print()
+search_mode = 0#Always Search
 
-    df_data = [str(message) for message in relevant_messages]
-    return ';'.join(df_data)
 
 # OpenAI client setup
 client = OpenAI(
@@ -46,7 +95,7 @@ client = OpenAI(
 # Function list for OpenAI API
 function_list = [
     {
-        "name": "query_database",
+        "name": "search_database",
         "description": "Query the database and return a list of results as strings",
         "parameters": {
             "type": "object",
@@ -58,12 +107,27 @@ function_list = [
             },
             "required": ["query"]
         }
+    },
+
+    {
+        "name": "list_database_files",
+        "description": "Check what files are present in the database",
+        "parameters":{
+            "type":"object",
+            "properties":{
+                "query":{
+                    "type":"string",
+                    "description":"Gives a list of semicolon seperated file names in the database"
+                    },
+                },
+        }
     }
 ]
 
 # Mapping of function names to actual function objects
 function_map = {
-    "query_database": query_database2
+    "search_database": query_database2,
+    "list_database_files":list_files_indb
 }
 
 def execute_function(function_name, function_args):
@@ -72,12 +136,19 @@ def execute_function(function_name, function_args):
     else:
         return f"Error: Function {function_name} not found"
 
-# Retry logic for OpenAI API call
+mapsearchmode = ['always', 'auto', 'none']
+
 def openai_api_call(messages, retries=3, delay=5):
+    global search_mode  # Declare search_mode as a global variable
+
     for attempt in range(retries):
         try:
+            # Modify the user's message if search_mode is 0
+            if search_mode == 0:
+                messages[-1]['content'] = "[System: SEARCH when the user ASKED A QUESTION & remember to CITE(the source is the first tag). Otherwise do not search];" + messages[-1]['content']
+
             completion = client.chat.completions.create(
-                model="gpt-3.5-turbo",  # Changed from "gpt-4o" to "gpt-4"
+                model="gpt-3.5-turbo",
                 messages=messages,
                 functions=function_list,
                 function_call='auto',
@@ -109,10 +180,43 @@ def openai_api_call(messages, retries=3, delay=5):
             else:
                 return "Sorry, I am having trouble connecting to the server. Please try again later."
 
+    return "Failed to get a response after multiple attempts."
+
+
+def handle_search_mode(mode):
+    print(mode)
+    global search_mode
+    if mode == "Always":
+        search_mode = 0
+        return "You are in Mode 1"
+    elif mode == "Automatic":
+        search_mode = 1
+        return "You are in Mode 2"
+    else:
+        search_mode = 0
+        return "Select a mode"
+
+def handle_dbms_mode(mode):
+    print(mode)
+    global dbmsmode
+    with open('settings.arcana',mode='w') as file:
+        newsettings = foldername+'\n'+mode
+        file.write(newsettings)
+        
+    if mode == "Nylon":
+        dbmsmode = "Nylon"
+        return "You are in Mode 1"
+    elif mode == "Fiber":
+        dbmsmode = "Fiber"
+        return "You are in Mode 2"
+    else:
+        search_mode = 0
+        return "Select a mode"
+    
 # Chatbot response function
 def chatbot_response(message, history):
     messages = [{"role": "system", "content": '''You are Arcana, a dynamic study resource database designed to help students excel in their exams. Your responses should be accurate, informative, and evidence-based whenever possible. Follow these guidelines:
-Your primary goal is to provide students with the most helpful and accurate study information, utilizing both your internal knowledge and the PDF resources at your disposal.'''}]
+Your primary goal is to provide students with the most helpful and accurate study information, utilizing both your internal knowledge and the PDF resources at your disposal. You will search your database for answers and properly intext cite them, unless there is no such data, then you will intextcite[Arcana].'''}]
     
     for human, assistant in history:
         messages.append({"role": "user", "content": human})
@@ -130,7 +234,7 @@ from concurrent.futures import ThreadPoolExecutor
 # Function to handle the file upload
 def handle_file_upload(file):
     # Ensure the cache2 directory exists
-    cache_dir = 'cache'
+    cache_dir = foldername
     os.makedirs(cache_dir, exist_ok=True)
     
     # Get the uploaded file path
@@ -154,7 +258,7 @@ def handle_file_upload_threaded(file):
         return future.result()
 
 def list_uploaded_files():
-    foldername = 'cache'
+    global foldername
     if not os.path.exists(foldername):
         return []
     files = os.listdir(foldername)
@@ -167,7 +271,7 @@ def on_select(evt: gr.SelectData):
     selected = selected_value
     print(f"Selected value: {selected_value} at index: {selected_index}")
     
-    file_path = os.path.join("cache", selected_value) if selected_value else None
+    file_path = os.path.join(foldername,selected_value) if selected_value else None
     status_message = f"Selected: {selected_value}" if selected_value else "No file selected"
     
     file_size = get_file_size(file_path) if file_path else ""
@@ -193,9 +297,8 @@ def get_file_creation_time(file_path):
     return ""
 
 def delete_file():
-    global selected
+    global selected,foldername
     if selected:
-        foldername = 'cache'
         file_path = os.path.join(foldername, selected)
         if os.path.exists(file_path):
             os.remove(file_path)
@@ -209,12 +312,12 @@ def refresh_files():
     return list_uploaded_files()
 
 def display_file(evt: gr.SelectData, df):
-    file_path = os.path.join("cache", evt.value)
+    file_path = os.path.join(foldername, evt.value)
     return file_path, file_path if file_path.lower().endswith(('.png', '.jpg', '.jpeg', '.gif')) else None, f"Displaying: {evt.value}"
 
 def render_to_database():
     # This function is undefined as per your request
-    Arcana.main()
+    Arcana.main(foldername)
 
 def change_theme(theme):
     gr.Interface.theme = theme
@@ -222,8 +325,8 @@ def change_theme(theme):
 def rename_file(new_name):
     global selected
     if selected and new_name:
-        old_path = os.path.join('cache', selected)
-        new_path = os.path.join('cache', new_name+'.'+selected.split('.')[-1])
+        old_path = os.path.join(foldername, selected)
+        new_path = os.path.join(foldername, new_name+'.'+selected.split('.')[-1])
         if os.path.exists(old_path):
             os.rename(old_path, new_path)
             selected = new_name
@@ -234,7 +337,7 @@ def rename_file(new_name):
 
 def query_database(query):
     # Usage example
-    db = ChatDatabase('memory.txt')
+    db = ChatDatabase(foldername+'.txt')
 
     # Example 1: Get relevant messages
     sender = 'Arcana'
@@ -257,6 +360,27 @@ def query_database(query):
     
     return df
 
+def query_database_fiber(query):
+    dbms = fiber.FiberDBMS()
+    # Load or create the database
+    dbms.load_or_create(foldername+'.txt')
+    results = dbms.query(query, 10)
+    
+    # Convert the results to a pandas DataFrame
+    df = pd.DataFrame(results)
+    
+    # Reorder columns if needed
+    columns_order = ['name', 'content', 'tags', 'index']
+    df = df[columns_order]
+    
+    return df
+
+def setdbname(name):
+    global foldername
+    foldername = name
+    with open('settings.arcana',mode='w') as file:
+        newsettings = foldername+'\n'+dbmsmode
+        file.write(newsettings)
     
 example_database = [
     "What is Hydrogen Bonding?",
@@ -284,17 +408,20 @@ def get_random_examples(num_examples=5):
 chatbot_interface = gr.ChatInterface(
     chatbot_response,
     chatbot=gr.Chatbot(height=400),
-    textbox=gr.Textbox(placeholder="Type your message here...", container=True, scale=10),
+    textbox=gr.Textbox(placeholder="Type your message here...", container=False, scale=100),
     title="Review With Arcana",
     description="ArcanaUI v0.8 - Chatbot",
-    theme="soft",
+    theme="default",
     examples=get_random_examples(),
     cache_examples=False,
-    retry_btn=None,
+    retry_btn=gr.Button('Retry'),
     undo_btn="Delete Previous",
-    clear_btn="Clear"
+    clear_btn="Clear",
 )
 
+def chatbot_response(message):
+    # Your chatbot response logic here
+    return f"Response to: {message}"
 
 def relaunch():
     global demo
@@ -324,7 +451,7 @@ async () => {
 
         with gr.TabItem("Chatbot"):
             chatbot_interface.render()
-
+        
         # File uploading interface
         with gr.TabItem('Upload'):
             gr.Markdown('# Upload and View Files')
@@ -380,10 +507,22 @@ async () => {
 
                 test_nylon = gr.Textbox(label='Test Nylon', placeholder='Query')
                 uploaded_files_list2 = gr.DataFrame(headers=["Nylon Returned Query"], datatype="str", interactive=False)
-                
-                query_button = gr.Button('Query')
-                
-                query_button.click(fn=query_database, inputs=test_nylon, outputs=uploaded_files_list2)
+                query_button2 = gr.Button('Query')
+                query_button2.click(fn=query_database, inputs=test_nylon, outputs=uploaded_files_list2)
+
+                test_fiber = gr.Textbox(label='Test Fiber', placeholder='Query')
+                uploaded_files_list3 = gr.DataFrame(headers=["Fiber Returned Query"], datatype="str", interactive=False)
+                query_button3 = gr.Button('Query')
+                query_button3.click(fn=query_database_fiber, inputs=test_fiber, outputs=uploaded_files_list3)
+
+                gr.Markdown('Nylon 2.1 will be deprecated in text-text selections, as it is built for image-text selections.\nDefault model is Fiber.')
+                dbmsmode_selector = gr.Radio(["Nylon", "Fiber"], label="Select Model")
+                dbmsmode_selector.change(handle_dbms_mode, dbmsmode_selector)
+
+                database_name = gr.Textbox(label='Database Name', placeholder='cache')
+                set_dbname = gr.Button('Set Database Name')
+                set_dbname.click(fn=setdbname, inputs=database_name)
+
             with gr.TabItem('Theme'):
                 gr.Markdown('Change Theme')
 
@@ -393,7 +532,13 @@ async () => {
                 theme_button.click(fn=change_theme, inputs=theme_dropdown)
                 relaunch_button = gr.Button('Relaunch')
                 relaunch_button.click(fn=relaunch)
+            with gr.TabItem('Search'):
+                gr.Markdown('Set Search Modes')
 
+                searchmode_selector = gr.Radio(["Always", "Automatic"], label="Select Mode")
+                output = gr.Textbox(label="Output")
+                searchmode_selector.change(handle_search_mode, searchmode_selector, output)
+        
 
 # Launch the interface
 demo.launch(share=True)