Update app.py

app.py

@@ -2,15 +2,15 @@ import gradio as gr
 import asyncio
 import json
 import html
-from openai import AzureOpenAI
-from azure.identity import DefaultAzureCredential, get_bearer_token_provider
-from tiktoken import get_encoding
-import sqlite3
+import os
 import uuid
+import sqlite3
 import datetime
 import difflib
+from tiktoken import get_encoding
+from openai import AzureOpenAI
 
-# Reusing ConversationMemory and TextEditor classes from previous artifact
+# ConversationMemory class (unchanged)
 class ConversationMemory:
     def __init__(self, db_path="conversation.db"):
         self.conn = sqlite3.connect(db_path)
@@ -66,6 +66,7 @@ class ConversationMemory:
         cursor = self.conn.execute("SELECT * FROM conversation_chunks ORDER BY timestamp DESC LIMIT ?", (limit,))
         return [{"chunk_id": row[0], "text": row[1], "role": row[2], "timestamp": row[3], "intent": row[4], "token_count": row[5]} for row in cursor]
 
+# TextEditor class (unchanged)
 class TextEditor:
     def __init__(self, memory):
         self.memory = memory
@@ -103,7 +104,7 @@ class TextEditor:
         chunk = self.memory.get_chunk(chunk_id)
         if chunk:
             chunk['text'] = chunk['text'] + suffix
-            self.memory.update_chunk(chunk_id, chunk['text'])
+            self.memory It.update_chunk(chunk_id, chunk['text'])
         return chunk['text']
         
     def diff(self, chunk_id, original_text):
@@ -114,15 +115,14 @@ class TextEditor:
             return '\n'.join(diff)
         return ""
 
+# OpenAIApi class (modified to fix proxies error)
 class OpenAIApi:
-    def __init__(self, preprompt="", endpoint="https://T-App-GPT4o.openai.azure.com/openai/v1/", model="gpt-4o"):
-        token_provider = get_bearer_token_provider(
-            DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
-        )
+    def __init__(self, preprompt="", endpoint="https://T-App-GPT4o.openai.azure.com/openai/v1/", model="gpt-4o", api_key=None):
         self.client = AzureOpenAI(
             azure_endpoint=endpoint,
-            azure_ad_token_provider=token_provider,
-            api_version="2025-01-01-preview"
+            api_key=api_key or os.getenv("AZURE_OPENAI_API_KEY"),
+            api_version="2025-01-01-preview",
+            http_client_kwargs={"proxies": None}  # Explicitly disable proxies
         )
         self.model = model
         self.preprompt = preprompt
@@ -159,7 +159,7 @@ class OpenAIApi:
             },
             {
                 "type": "function",
-                "name": "paste_text",
+                "name": "pasteテキスト",
                 "description": "Paste clipboard content into a conversation chunk.",
                 "parameters": {
                     "type": "object",
@@ -233,7 +233,7 @@ class OpenAIApi:
             response_chunk_id = self.memory.add_chunk(full_response, "assistant")
             
             for tool_call in tool_calls:
-                if tool_call.type == "function":
+                if tool_call and hasattr(tool_call, 'function'):
                     func_name = tool_call.function.name
                     args = json.loads(tool_call.function.arguments)
                     if func_name == "cut_text":
@@ -261,13 +261,15 @@ class OpenAIApi:
             self.memory.add_chunk(error_msg, "system")
             return {"error": error_msg}
 
-# Gradio UI
+# Updated Gradio UI with messages format
 async def chat_submit(user_input, chat_history, preprompt):
-    api = OpenAIApi(preprompt=preprompt)
+    api = OpenAIApi(preprompt=preprompt, api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     response = await api.fetch_response(user_input)
     if "error" in response:
-        return chat_history + [[user_input, f"Error: {response['error']}"]], preprompt
-    chat_history.append([user_input, response["content"]])
+        chat_history.append({"role": "assistant", "content": f"Error: {response['error']}"})
+    else:
+        chat_history.append({"role": "user", "content": user_input})
+        chat_history.append({"role": "assistant", "content": response["content"]})
     return chat_history, preprompt
 
 def get_history():
@@ -278,27 +280,27 @@ def select_chunk(evt: gr.SelectData):
     return evt.value["chunk_id"], evt.value["text"]
 
 async def edit_cut(chunk_id, start, end):
-    api = OpenAIApi()
+    api = OpenAIApi(api_key=os.getenv("AZ URE_OPENAI_API_KEY"))
     result = api.editor.cut(chunk_id, int(start), int(end))
     return result, api.editor.diff(chunk_id, result)
 
 async def edit_copy(chunk_id, start, end):
-    api = OpenAIApi()
+    api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.copy(chunk_id, int(start), int(end))
     return result, ""
 
 async def edit_paste(chunk_id, position):
-    api = OpenAIApi()
+    api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.paste(chunk_id, int(position))
     return result, api.editor.diff(chunk_id, result)
 
 async def edit_prefix(chunk_id, prefix):
-    api = OpenAIApi()
+    api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.add_prefix(chunk_id, prefix)
     return result, api.editor.diff(chunk_id, result)
 
 async def edit_suffix(chunk_id, suffix):
-    api = OpenAIApi()
+    api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.add_suffix(chunk_id, suffix)
     return result, api.editor.diff(chunk_id, result)
 
@@ -307,7 +309,7 @@ def create_ui():
         gr.Markdown("# Azure OpenAI Chat with Text Editing")
         
         with gr.Tab("Chat"):
-            chatbot = gr.Chatbot(label="Conversation")
+            chatbot = gr.Chatbot(label="Conversation", type="messages")  # Updated to messages format
             user_input = gr.Textbox(label="Your Message", placeholder="Type your message or editing command...")
             preprompt = gr.Textbox(label="System Prompt", value="You are a helpful assistant with text editing capabilities.")
             submit_btn = gr.Button("Send")
@@ -358,4 +360,4 @@ def create_ui():
 
 if __name__ == "__main__":
     demo = create_ui()
-    demo.launch()
+    demo.launch(server_name="0.0.0.0", server_port=7860)