refactor

app.py

@@ -1,128 +1,45 @@
 import gradio as gr
-import os
-from openai import OpenAI
-from utils import get_secret
-from database import create_chatbot, get_chatbot, update_chatbot, delete_chatbot, get_all_chatbots, filter_profanity
-
-CREATE_APP_PW = get_secret("CREATE_APP_PW")
-ADMIN_PW = get_secret("ADMIN_PW")
-OPENAI_API_KEY = get_secret("OPENAI_API_KEY")
-
-client = OpenAI(api_key=OPENAI_API_KEY)
-
-
-def create_chatbot_interface(name, custom_instruction, password):
-    if password != CREATE_APP_PW:
-        return "Invalid password. Chatbot creation failed."
-
-    filtered_name = filter_profanity(name)
-    filtered_instruction = filter_profanity(custom_instruction)
-
-    chatbot = create_chatbot(filtered_name, filtered_instruction)
-    return f"Chatbot created with ID: {chatbot.chatbot_id}"
-
-def chat_with_bot(message, history, chatbot_id):
-    chatbot = get_chatbot(chatbot_id)
-    if not chatbot:
-        return "Invalid chatbot ID or chatbot not active"
-
-    # Prepare the conversation history for OpenAI
-    conversation = [
-        {"role": "system", "content": chatbot.custom_instruction},
-    ]
-    for human, assistant in history:
-        conversation.append({"role": "user", "content": human})
-        conversation.append({"role": "assistant", "content": assistant})
-    conversation.append({"role": "user", "content": message})
-
-    try:
-        response = client.chat.completions.create(model="gpt-3.5-turbo",
-        messages=conversation)
-        return response.choices[0].message.content
-    except Exception as e:
-        return f"An error occurred: {str(e)}"
-
-def admin_view(password):
-    if password != ADMIN_PW:
-        return "Invalid admin password."
-
-    chatbots = get_all_chatbots()
-    return gr.Dataframe(
-        headers=["ID", "Name", "Custom Instruction", "Is Active"],
-        data=[[c.chatbot_id, c.name, c.custom_instruction, c.is_active] for c in chatbots]
-    )
-
-def admin_action(action, chatbot_id, name, custom_instruction, is_active, password):
-    if password != ADMIN_PW:
-        return "Invalid admin password."
-
-    if action == "Edit":
-        update_chatbot(chatbot_id, name, custom_instruction, is_active)
-        return "Chatbot updated successfully."
-    elif action == "Delete":
-        delete_chatbot(chatbot_id)
-        return "Chatbot deleted successfully."
-    else:
-        return "Invalid action."
-
-with gr.Blocks() as demo:
-    chatbot_id_input = gr.Textbox(label="Enter Chatbot ID", visible=False)
-
-    with gr.Tab("Chat"):
-        chatbot_title = gr.Markdown("Welcome to the Chatbot")
-        chat_interface = gr.ChatInterface(
-            chat_with_bot,
-            additional_inputs=[chatbot_id_input],
-        )
-        share_link = gr.Textbox(label="Share Link", interactive=False)
-
-    with gr.Tab("Create Chatbot"):
-        name = gr.Textbox(label="Chatbot Name")
-        instructions = gr.Textbox(label="Enter custom instructions for your chatbot")
-        create_password = gr.Textbox(label="Creation Password", type="password")
-        create_button = gr.Button("Create Chatbot")
-        create_output = gr.Textbox(label="Creation Result")
-        create_button.click(create_chatbot_interface, inputs=[name, instructions, create_password], outputs=create_output)
-
-    with gr.Tab("Admin"):
-        admin_password = gr.Textbox(label="Admin Password", type="password")
-        admin_button = gr.Button("View Chatbots")
-        admin_output = gr.Dataframe(headers=["ID", "Name", "Custom Instruction", "Is Active"])
-        admin_button.click(admin_view, inputs=[admin_password], outputs=admin_output)
-
-        with gr.Row():
-            admin_action_dropdown = gr.Dropdown(["Edit", "Delete"], label="Action")
-            admin_chatbot_id = gr.Textbox(label="Chatbot ID")
-            admin_name = gr.Textbox(label="Name")
-            admin_instruction = gr.Textbox(label="Custom Instruction")
-            admin_is_active = gr.Checkbox(label="Is Active")
-        admin_action_button = gr.Button("Perform Action")
-        admin_action_output = gr.Textbox(label="Action Result")
-        admin_action_button.click(
-            admin_action,
-            inputs=[admin_action_dropdown, admin_chatbot_id, admin_name, admin_instruction, admin_is_active, admin_password],
-            outputs=admin_action_output
-        )
-
-    @demo.load(inputs=[chatbot_id_input], outputs=[chatbot_title, chatbot_id_input, share_link])
-    def load_chatbot(chatbot_id, request: gr.Request):
-        # Check if there's a chatbot_id in the URL parameters
-        params = request.query_params
-        if "chatbot_id" in params:
-            chatbot_id = params["chatbot_id"]
-
-        chatbot = get_chatbot(chatbot_id)
-        if chatbot:
+from tabs.chat import create_chat_tab
+from tabs.create_chatbot import create_chatbot_tab
+from tabs.admin import create_admin_tab
+
+def create_app():
+    with gr.Blocks(title="codora AI App Creator v0") as demo:
+        gr.Markdown("# codora AI App Creator v0")
+        chatbot_id_input = gr.Textbox(label="Enter Chatbot ID", visible=False)
+        
+        with gr.Tabs():
+            with gr.Tab("Chat"):
+                chat_tab = create_chat_tab(chatbot_id_input)
+            
+            with gr.Tab("Create Chatbot"):
+                create_chatbot_tab()
+            
+            with gr.Tab("Admin"):
+                create_admin_tab()
+
+        @demo.load(inputs=[chatbot_id_input], outputs=[chat_tab['title'], chatbot_id_input, chat_tab['share_link']])
+        def load_chatbot(chatbot_id, request: gr.Request):
+            params = request.query_params
+            if "chatbot_id" in params:
+                chatbot_id = params["chatbot_id"]
+
+            from database import get_chatbot
+            chatbot = get_chatbot(chatbot_id)
+            if chatbot:
+                return (
+                    gr.update(value=f"Welcome to {chatbot.name}"),
+                    gr.update(value=chatbot_id, visible=True),
+                    gr.update(value=f"https://huggingface.co/spaces/codora/ai-app-creator?chatbot_id={chatbot_id}")
+                )
             return (
-                gr.update(value=f"Welcome to {chatbot.name}"),
-                gr.update(value=chatbot_id, visible=True),
-                gr.update(value=f"https://huggingface.co/spaces/codora/ai-app-creator?chatbot_id={chatbot_id}")
+                gr.update(value="Welcome to the Chatbot"),
+                gr.update(value="", visible=True),
+                gr.update(value="")
             )
-        return (
-            gr.update(value="Welcome to the Chatbot"),
-            gr.update(value="", visible=True),
-            gr.update(value="")
-        )
+
+    return demo
 
 if __name__ == "__main__":
+    demo = create_app()
     demo.launch()

database.py

@@ -3,7 +3,7 @@ import os
 from sqlalchemy import create_engine, Column, Integer, String, Text, Boolean, DateTime, func
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
-from utils import get_secret
+from utils.utils import get_secret
 import random
 from better_profanity import profanity
 import logging

requirements.txt

@@ -6,6 +6,7 @@ asttokens==2.4.1
 attrs==23.2.0
 backcall==0.2.0
 beautifulsoup4==4.12.3
+better-profanity==0.7.0
 bleach==6.1.0
 build==1.2.1
 certifi==2024.7.4
@@ -29,6 +30,7 @@ fonttools==4.53.1
 fsspec==2024.6.1
 gradio==4.38.1
 gradio_client==1.1.0
+greenlet==3.0.3
 h11==0.14.0
 httpcore==1.0.5
 httptools==0.6.1
@@ -72,6 +74,7 @@ pydantic==2.8.2
 pydantic_core==2.20.1
 pydub==0.25.1
 Pygments==2.18.0
+PyMySQL==1.1.1
 pyparsing==3.1.2
 pyproject_hooks==1.1.0
 python-dateutil==2.9.0.post0
@@ -90,6 +93,7 @@ shellingham==1.5.4
 six==1.16.0
 sniffio==1.3.1
 soupsieve==2.5
+SQLAlchemy==2.0.31
 stack-data==0.6.3
 starlette==0.37.2
 tinycss2==1.3.0

tabs/admin.py

@@ -0,0 +1,48 @@
+import gradio as gr
+from utils.utils import get_secret
+from database import get_all_chatbots, update_chatbot, delete_chatbot
+
+ADMIN_PW = get_secret("ADMIN_PW")
+
+def admin_view(password):
+    if password != ADMIN_PW:
+        return "Invalid admin password."
+    
+    chatbots = get_all_chatbots()
+    return gr.Dataframe(
+        headers=["ID", "Name", "Custom Instruction", "Is Active"],
+        data=[[c.chatbot_id, c.name, c.custom_instruction, c.is_active] for c in chatbots]
+    )
+
+def admin_action(action, chatbot_id, name, custom_instruction, is_active, password):
+    if password != ADMIN_PW:
+        return "Invalid admin password."
+    
+    if action == "Edit":
+        update_chatbot(chatbot_id, name, custom_instruction, is_active)
+        return "Chatbot updated successfully."
+    elif action == "Delete":
+        delete_chatbot(chatbot_id)
+        return "Chatbot deleted successfully."
+    else:
+        return "Invalid action."
+
+def create_admin_tab():
+    admin_password = gr.Textbox(label="Admin Password", type="password")
+    admin_button = gr.Button("View Chatbots")
+    admin_output = gr.Dataframe(headers=["ID", "Name", "Custom Instruction", "Is Active"])
+    admin_button.click(admin_view, inputs=[admin_password], outputs=admin_output)
+    
+    with gr.Row():
+        admin_action_dropdown = gr.Dropdown(["Edit", "Delete"], label="Action")
+        admin_chatbot_id = gr.Textbox(label="Chatbot ID")
+        admin_name = gr.Textbox(label="Name")
+        admin_instruction = gr.Textbox(label="Custom Instruction")
+        admin_is_active = gr.Checkbox(label="Is Active")
+    admin_action_button = gr.Button("Perform Action")
+    admin_action_output = gr.Textbox(label="Action Result")
+    admin_action_button.click(
+        admin_action,
+        inputs=[admin_action_dropdown, admin_chatbot_id, admin_name, admin_instruction, admin_is_active, admin_password],
+        outputs=admin_action_output
+    )

tabs/chat.py

@@ -0,0 +1,16 @@
+import gradio as gr
+from utils.openai_utils import chat_with_bot
+
+def create_chat_tab(chatbot_id_input):
+    chatbot_title = gr.Markdown("Welcome to the Chatbot")
+    chat_interface = gr.ChatInterface(
+        chat_with_bot,
+        additional_inputs=[chatbot_id_input],
+    )
+    share_link = gr.Textbox(label="Share Link", interactive=False)
+    
+    return {
+        "title": chatbot_title,
+        "interface": chat_interface,
+        "share_link": share_link
+    }

tabs/create_chatbot.py

@@ -0,0 +1,23 @@
+import gradio as gr
+from utils.utils import get_secret
+from database import create_chatbot, filter_profanity
+
+CREATE_APP_PW = get_secret("CREATE_APP_PW")
+
+def create_chatbot_interface(name, custom_instruction, password):
+    if password != CREATE_APP_PW:
+        return "Invalid password. Chatbot creation failed."
+    
+    filtered_name = filter_profanity(name)
+    filtered_instruction = filter_profanity(custom_instruction)
+    
+    chatbot = create_chatbot(filtered_name, filtered_instruction)
+    return f"Chatbot created with ID: {chatbot.chatbot_id}"
+
+def create_chatbot_tab():
+    name = gr.Textbox(label="Chatbot Name")
+    instructions = gr.Textbox(label="Enter custom instructions for your chatbot")
+    create_password = gr.Textbox(label="Creation Password", type="password")
+    create_button = gr.Button("Create Chatbot")
+    create_output = gr.Textbox(label="Creation Result")
+    create_button.click(create_chatbot_interface, inputs=[name, instructions, create_password], outputs=create_output)

utils/openai_utils.py

@@ -0,0 +1,26 @@
+from openai import OpenAI
+from utils.utils import get_secret
+
+OPENAI_API_KEY = get_secret("OPENAI_API_KEY")
+client = OpenAI(api_key=OPENAI_API_KEY)
+
+def chat_with_bot(message, history, chatbot_id):
+    from database import get_chatbot
+    chatbot = get_chatbot(chatbot_id)
+    if not chatbot:
+        return "Invalid chatbot ID or chatbot not active"
+
+    conversation = [
+        {"role": "system", "content": chatbot.custom_instruction},
+    ]
+    for human, assistant in history:
+        conversation.append({"role": "user", "content": human})
+        conversation.append({"role": "assistant", "content": assistant})
+    conversation.append({"role": "user", "content": message})
+
+    try:
+        response = client.chat.completions.create(model="gpt-3.5-turbo",
+        messages=conversation)
+        return response.choices[0].message.content
+    except Exception as e:
+        return f"An error occurred: {str(e)}"