[update]add list assistant files

examples/test/test_assistant/assistant.py

@@ -1,100 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-import argparse
-import json
-
-from openai import OpenAI
-from openai.pagination import SyncCursorPage
-from openai.types.beta.threads import ThreadMessage
-
-from project_settings import environment, project_path
-
-
-def get_args():
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--openai_api_key",
-        default=environment.get("openai_api_key", default=None, dtype=str),
-        type=str
-    )
-    args = parser.parse_args()
-    return args
-
-
-def get_message_list(client: OpenAI, thread_id: str):
-    messages: SyncCursorPage[ThreadMessage] = client.beta.threads.messages.list(
-        thread_id=thread_id
-    )
-    result = list()
-    for message in messages.data:
-
-        content = list()
-        for msg in message.content:
-            content.append({
-                "text": {
-                    "annotations": msg.text.annotations,
-                    "value": msg.text.value,
-                },
-                "type": msg.type,
-            })
-
-        result.append({
-            "id": message.id,
-            "assistant_id": message.assistant_id,
-            "content": content,
-            "created_at": message.created_at,
-            "file_ids": message.file_ids,
-            "metadata": message.metadata,
-            "object": message.object,
-            "role": message.role,
-            "run_id": message.run_id,
-            "thread_id": message.thread_id,
-
-        })
-
-    return result
-
-
-def get_assistant_list(client: OpenAI):
-    assistant_list = client.beta.assistants.list()
-
-    result = list()
-    for assistant in assistant_list.data:
-
-        tools = list()
-        for tool in assistant.tools:
-            tools.append({
-                "type": tool.type
-            })
-
-        result.append({
-            "id": assistant.id,
-            "created_at": assistant.created_at,
-            "description": assistant.description,
-            "file_ids": assistant.file_ids,
-            "instructions": assistant.instructions,
-            "metadata": assistant.metadata,
-            "model": assistant.model,
-            "name": assistant.name,
-
-        })
-    return result
-
-
-def main():
-    args = get_args()
-
-    client = OpenAI()
-
-    message_list = get_message_list(client, thread_id="thread_HT89XoJP7ZoL4g2s0CWl01Oo")
-    message_list = json.dumps(message_list, indent=4, ensure_ascii=False)
-    print(message_list)
-
-    # assistant_list = get_assistant_list(client)
-    # assistant_list = json.dumps(assistant_list, indent=4, ensure_ascii=False)
-    # print(assistant_list)
-    return
-
-
-if __name__ == '__main__':
-    main()

examples/test/test_assistant/test_assistant.py

@@ -1,64 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-"""
-https://platform.openai.com/docs/assistants/overview
-"""
-import argparse
-
-from openai import OpenAI
-
-from project_settings import environment, project_path
-
-
-def get_args():
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--openai_api_key",
-        default=environment.get("openai_api_key", default=None, dtype=str),
-        type=str
-    )
-    args = parser.parse_args()
-    return args
-
-
-client = OpenAI()
-
-
-assistant = client.beta.assistants.create(
-    name="Math Tutor",
-    instructions="You are a personal math tutor. Write and run code to answer math questions.",
-    tools=[{"type": "code_interpreter"}],
-    model="gpt-4-1106-preview"
-)
-
-thread = client.beta.threads.create()
-
-message = client.beta.threads.messages.create(
-    thread_id=thread.id,
-    role="user",
-    content="I need to solve the equation `3x + 11 = 14`. Can you help me?"
-)
-print(message)
-
-run = client.beta.threads.runs.create(
-    thread_id=thread.id,
-    assistant_id=assistant.id,
-    instructions="Please address the user as Jane Doe. The user has a premium account."
-)
-
-run = client.beta.threads.runs.retrieve(
-    thread_id=thread.id,
-    run_id=run.id
-)
-
-messages = client.beta.threads.messages.list(
-    thread_id=thread.id
-)
-print(messages)
-
-# ThreadMessage(id='msg_7DjZts4XzdQw4IQvPYg3zJYS', assistant_id=None, content=[MessageContentText(text=Text(annotations=[], value='I need to solve the equation `3x + 11 = 14`. Can you help me?'), type='text')], created_at=1699425801, file_ids=[], metadata={}, object='thread.message', role='user', run_id=None, thread_id='thread_HT89XoJP7ZoL4g2s0CWl01Oo')
-# SyncCursorPage[ThreadMessage](data=[ThreadMessage(id='msg_7DjZts4XzdQw4IQvPYg3zJYS', assistant_id=None, content=[MessageContentText(text=Text(annotations=[], value='I need to solve the equation `3x + 11 = 14`. Can you help me?'), type='text')], created_at=1699425801, file_ids=[], metadata={}, object='thread.message', role='user', run_id=None, thread_id='thread_HT89XoJP7ZoL4g2s0CWl01Oo')], object='list', first_id='msg_7DjZts4XzdQw4IQvPYg3zJYS', last_id='msg_7DjZts4XzdQw4IQvPYg3zJYS', has_more=False)
-
-
-if __name__ == '__main__':
-    pass

examples/test/test_assistant/test_assistant_chat.py

@@ -0,0 +1,73 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+"""
+https://platform.openai.com/docs/assistants/overview
+"""
+import argparse
+import time
+
+from openai import OpenAI
+from openai.pagination import SyncCursorPage
+from openai.types.beta.threads import ThreadMessage
+
+from project_settings import environment, project_path
+
+
+def get_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--openai_api_key",
+        default=environment.get("openai_api_key", default=None, dtype=str),
+        type=str
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    args = get_args()
+
+    client = OpenAI(
+        api_key=args.openai_api_key
+    )
+
+    assistant = client.beta.assistants.create(
+        name="Math Tutor",
+        instructions="You are a personal math tutor. Write and run code to answer math questions.",
+        tools=[{"type": "code_interpreter"}],
+        model="gpt-4-1106-preview"
+    )
+    print(f"assistant.id: {assistant.id}")
+
+    thread = client.beta.threads.create()
+    print(f"thread.id: {thread.id}")
+
+    message = client.beta.threads.messages.create(
+        thread_id=thread.id,
+        role="user",
+        content="I need to solve the equation `3x + 11 = 14`. Can you help me?"
+    )
+
+    run = client.beta.threads.runs.create(
+        thread_id=thread.id,
+        assistant_id=assistant.id,
+        instructions="Please address the user as Jane Doe. The user has a premium account."
+    )
+
+    run = client.beta.threads.runs.retrieve(
+        thread_id=thread.id,
+        run_id=run.id
+    )
+
+    time.sleep(10)
+
+    messages = client.beta.threads.messages.list(
+        thread_id=thread.id
+    )
+    print(messages)
+
+    return
+
+
+if __name__ == '__main__':
+    main()

examples/test/test_assistant/test_assistant_delete.py

@@ -0,0 +1,42 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import argparse
+import json
+import time
+
+from openai import OpenAI
+from openai.types.beta.asssitant_deleted import AsssitantDeleted
+
+from project_settings import environment, project_path
+
+
+def get_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--openai_api_key",
+        default=environment.get("openai_api_key", default=None, dtype=str),
+        type=str
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    args = get_args()
+
+    client = OpenAI(
+        api_key=args.openai_api_key
+    )
+
+    result: AsssitantDeleted = client.beta.assistants.delete(assistant_id="asst_bXMHkMvMfJX2J0JgK4nIHKqc")
+    print(f"result: {result}")
+
+    print(result.model_dump(mode="json"))
+
+    result = json.dumps(result.model_dump(mode="json"), indent=4, ensure_ascii=False)
+    print(result)
+    return
+
+
+if __name__ == '__main__':
+    main()

examples/test/test_assistant/test_assistant_file_list.py

@@ -0,0 +1,65 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import argparse
+import json
+import time
+
+from openai import OpenAI
+from openai.pagination import SyncCursorPage
+from openai.types.beta.threads import ThreadMessage
+from openai.types.beta.assistant import Assistant
+
+from project_settings import environment, project_path
+
+
+def get_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--openai_api_key",
+        default=environment.get("openai_api_key", default=None, dtype=str),
+        type=str
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    """
+    {
+        "data": [
+            {
+                "id": "file-BuLs1LIuKWGRwmx8YDwQ5Vd7",
+                "bytes": 1206396,
+                "created_at": 1699443275,
+                "filename": "三国演义.txt",
+                "object": "file",
+                "purpose": "assistants",
+                "status": "processed",
+                "status_details": null
+            }
+        ],
+        "object": "list",
+        "has_more": false
+    }
+
+    """
+    args = get_args()
+
+    client = OpenAI(
+        api_key=args.openai_api_key
+    )
+
+    file_list = client.files.list()
+    print(f"file_list: {file_list}")
+    print(type(file_list))
+    print(file_list.model_dump(mode="python"))
+    print(file_list.model_dump(mode="json"))
+
+    file_list = json.dumps(file_list.model_dump(mode="json"), indent=4, ensure_ascii=False)
+    print(file_list)
+
+    return
+
+
+if __name__ == '__main__':
+    main()

examples/test/test_assistant/test_assistant_list.py

@@ -0,0 +1,87 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import argparse
+import json
+import time
+
+from openai import OpenAI
+from openai.pagination import SyncCursorPage
+from openai.types.beta.threads import ThreadMessage
+from openai.types.beta.assistant import Assistant
+
+from project_settings import environment, project_path
+
+
+def get_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--openai_api_key",
+        default=environment.get("openai_api_key", default=None, dtype=str),
+        type=str
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    """
+{
+    "data": [
+        {
+            "id": "asst_9wwRvH6Jr3LKvKEP0Tm4oeRy",
+            "created_at": 1699493281,
+            "description": null,
+            "file_ids": [],
+            "instructions": "You are a personal math tutor. Write and run code to answer math questions.",
+            "metadata": {},
+            "model": "gpt-4-1106-preview",
+            "name": "Math Tutor",
+            "object": "assistant",
+            "tools": []
+        },
+        {
+            "id": "asst_cjUW4TZY6TEV3xhBBJW6qCaN",
+            "created_at": 1699494925,
+            "description": null,
+            "file_ids": [
+                "file-hy90LKmHi5Y5jKYMr9WdlT91"
+            ],
+            "instructions": "根据小说内容回答问题。",
+            "metadata": {},
+            "model": "gpt-4-1106-preview",
+            "name": "小说专家",
+            "object": "assistant",
+            "tools": [
+                {
+                    "type": "retrieval"
+                }
+            ]
+        },
+    ],
+    "object": "list",
+    "first_id": "asst_blsH05YKxgb1YgC3e1xhrQOC",
+    "last_id": "asst_gGLXz0SiTopsjA6rq9y5mdS5",
+    "has_more": true
+}
+
+    """
+    args = get_args()
+
+    client = OpenAI(
+        api_key=args.openai_api_key
+    )
+
+    assistant_list: SyncCursorPage[Assistant] = client.beta.assistants.list()
+    print(f"assistant_list: {assistant_list}")
+    print(type(assistant_list))
+    print(assistant_list.model_dump(mode="python"))
+    print(assistant_list.model_dump(mode="json"))
+
+    assistant_list = json.dumps(assistant_list.model_dump(mode="json"), indent=4, ensure_ascii=False)
+    print(assistant_list)
+
+    return
+
+
+if __name__ == '__main__':
+    main()

examples/test/test_assistant/test_assistant_retrieval.py

@@ -0,0 +1,79 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import argparse
+import time
+
+from openai import OpenAI
+
+from project_settings import environment, project_path
+
+
+def get_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--openai_api_key",
+        default=environment.get("openai_api_key", default=None, dtype=str),
+        type=str
+    )
+    parser.add_argument(
+        "--document_file",
+        default=(project_path / "data/三国演义.txt").as_posix(),
+        type=str
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    args = get_args()
+
+    client = OpenAI(
+        api_key=args.openai_api_key
+    )
+
+    document = client.files.create(
+        file=open(args.document_file, "rb"),
+        purpose='assistants'
+    )
+
+    assistant = client.beta.assistants.create(
+        name="小说专家",
+        instructions="根据小说内容回答问题。",
+        tools=[{"type": "retrieval"}],
+        model="gpt-4-1106-preview",
+        file_ids=[document.id]
+
+    )
+    print(f"assistant.id: {assistant.id}")
+
+    thread = client.beta.threads.create()
+    print(f"thread.id: {thread.id}")
+
+    message = client.beta.threads.messages.create(
+        thread_id=thread.id,
+        role="user",
+        content="刘备和张飞是什么关系。"
+    )
+
+    run = client.beta.threads.runs.create(
+        thread_id=thread.id,
+        assistant_id=assistant.id,
+    )
+
+    run = client.beta.threads.runs.retrieve(
+        thread_id=thread.id,
+        run_id=run.id
+    )
+
+    time.sleep(10)
+
+    messages = client.beta.threads.messages.list(
+        thread_id=thread.id
+    )
+    print(messages)
+
+    return
+
+
+if __name__ == '__main__':
+    main()

examples/test/test_assistant/test_asssitant_file_delete.py

@@ -0,0 +1,45 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import argparse
+import json
+import time
+
+from openai import OpenAI
+from openai.pagination import SyncCursorPage
+from openai.types.beta.threads import ThreadMessage
+from openai.types.beta.assistant import Assistant
+
+from project_settings import environment, project_path
+
+
+def get_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--openai_api_key",
+        default=environment.get("openai_api_key", default=None, dtype=str),
+        type=str
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    args = get_args()
+
+    client = OpenAI(
+        api_key=args.openai_api_key
+    )
+
+    result = client.files.delete(file_id="file-Rienw0VlV1Ed9QCLZcVmUfgI")
+    print(f"result: {result}")
+
+    print(result.model_dump(mode="json"))
+
+    result = json.dumps(result.model_dump(mode="json"), indent=4, ensure_ascii=False)
+    print(result)
+
+    return
+
+
+if __name__ == '__main__':
+    main()

examples/test/test_tts/test_tts.py

@@ -27,12 +27,13 @@ def get_args():
     )
     parser.add_argument(
         "--openai_input",
-        default="Today is a wonderful day to build something people love!",
+        # default="Today is a wonderful day to build something people love!",
+        default="오늘은 사람들이 좋아하는 것을 만들기에 좋은 날입니다!",
         type=str
     )
     parser.add_argument(
         "--speech_file_path",
-        default=(Path(__file__).parent / "speech_alloy.mp3").as_posix(),
+        default=(Path(__file__).parent / "speech_alloy_korean.mp3").as_posix(),
         type=str
     )
     parser.add_argument(

main.py

@@ -5,16 +5,27 @@ https://huggingface.co/spaces/fffiloni/langchain-chat-with-pdf-openai
 """
 import argparse
 import json
+import logging
 import time
 from typing import List, Tuple
 
+logging.basicConfig(
+    level=logging.DEBUG,
+    format="%(asctime)s %(levelname)s %(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+)
+
 import gradio as gr
+import openai
 from openai import OpenAI
 from threading import Thread
 import _queue
 from queue import Queue
 
 import project_settings as settings
+from project_settings import project_path
+
+logger = logging.getLogger(__name__)
 
 
 def get_args():
@@ -34,19 +45,245 @@ def greet(question: str, history: List[Tuple[str, str]]):
     return result
 
 
+def click_create_assistant(openai_api_key: str,
+                           name: str,
+                           instructions: str,
+                           description: str,
+                           tools: str,
+                           files: List[str],
+                           file_ids: str,
+                           model: str,
+                           ):
+    logger.info("click create assistant, name: {}".format(name))
+    client = OpenAI(
+        api_key=openai_api_key,
+    )
+
+    # tools
+    tools = str(tools).strip()
+    if tools is not None and len(tools) != 0:
+        tools = tools.split("\n")
+        tools = [json.loads(tool) for tool in tools if len(tool.strip()) != 0]
+    else:
+        tools = list()
+
+    # files
+    if files is not None and len(files) != 0:
+        files = [
+            client.files.create(
+                file=open(file, "rb"),
+                purpose='assistants'
+            ) for file in files
+        ]
+    else:
+        files = list()
+
+    # file_ids
+    file_ids = str(file_ids).strip()
+    if file_ids is not None and len(file_ids) != 0:
+        file_ids = file_ids.split("\n")
+        file_ids = [file_id.strip() for file_id in file_ids if len(file_id.strip()) != 0]
+    else:
+        file_ids = list()
+
+    # assistant
+    assistant = client.beta.assistants.create(
+        name=name,
+        instructions=instructions,
+        description=description,
+        tools=tools,
+        file_ids=file_ids + [file.id for file in files],
+        model=model,
+    )
+    assistant_id = assistant.id
+
+    # thread
+    thread = client.beta.threads.create()
+    thread_id = thread.id
+
+    return assistant_id, thread_id
+
+
+def click_list_assistant(openai_api_key: str) -> str:
+    client = OpenAI(
+        api_key=openai_api_key,
+    )
+    assistant_list = client.beta.assistants.list()
+    assistant_list.model_dump(mode="json")
+
+    result = ""
+    for a in assistant_list["data"]:
+        assis = "id: \n{}\nname: \n{}\ndescription: \n{}\n\n".format(a["id"], a["name"], a["description"])
+        result += assis
+
+    return result
+
+
+def click_delete_assistant(openai_api_key: str,
+                           assistant_id: str) -> str:
+    logger.info("click delete assistant, assistant_id: {}".format(assistant_id))
+
+    client = OpenAI(
+        api_key=openai_api_key,
+    )
+
+    try:
+        assistant_deleted = client.beta.assistants.delete(assistant_id=assistant_id)
+        result = "success" if assistant_deleted.deleted else "failed"
+    except openai.NotFoundError as e:
+        result = e.message
+    return result
+
+
+def click_list_file(openai_api_key: str):
+    client = OpenAI(
+        api_key=openai_api_key,
+    )
+    file_list = client.files.list()
+    file_list = file_list.model_dump(mode="json")
+
+    result = ""
+    for f in file_list["data"]:
+        file = "id: \n{}\nfilename: \n{}\nbytes: \n{}\nstatus: \n{}\n\n".format(
+            f["id"], f["filename"], f["bytes"], f["status"]
+        )
+        result += file
+
+    return result
+
+
+def click_delete_file(openai_api_key: str,
+                      file_id: str) -> str:
+    logger.info("click delete file, file_id: {}".format(file_id))
+
+    client = OpenAI(
+        api_key=openai_api_key,
+    )
+
+    try:
+        assistant_deleted = client.files.delete(file_id=file_id)
+        result = "success" if assistant_deleted.deleted else "failed"
+    except openai.NotFoundError as e:
+        result = e.message
+    return result
+
+
+def click_upload_files(openai_api_key: str,
+                       files: List[str],
+                       ):
+    logger.info("click upload files, files: {}".format(files))
+
+    client = OpenAI(
+        api_key=openai_api_key,
+    )
+
+    result = list()
+    if files is not None and len(files) != 0:
+        files = [
+            client.files.create(
+                file=open(file, "rb"),
+                purpose='assistants'
+            ) for file in files
+        ]
+        file_ids = [file.id for file in files]
+        result.extend(file_ids)
+    return result
+
+
 def get_message_list(client: OpenAI, thread_id: str):
+    """
+    SyncCursorPage[ThreadMessage](
+        data=[
+            ThreadMessage(
+                id='msg_kb0f2fyDC6OwMyXxKbUpcuBS',
+                assistant_id='asst_DzVVZkE0dIGe0gsOdsdn3A0w',
+                content=[
+                    MessageContentText(
+                        text=Text(
+                            annotations=[
+                                TextAnnotationFileCitation(
+                                    end_index=44,
+                                    file_citation=TextAnnotationFileCitationFileCitation(
+                                        file_id='file-IwzwXQkixMu7fvgGoC1alIWu',
+                                        quote='念刘备、关羽、张飞，虽然异姓，既结为兄弟，则同心协力，救困扶危；上报国家，下安黎庶。不求同年同月同日生，只愿同年同月同日死。皇天后土，实鉴此心，背义忘恩，天人共戮！”誓毕，拜玄德为兄，关羽次之，张飞为弟'
+                                    ),
+                                    start_index=34,
+                                    text='【7†source】',
+                                    type='file_citation'
+                                )
+                            ],
+                            value='刘备和张飞虽然是异姓，但他们结为了兄弟，其中刘备被拜为兄，而张飞为弟【7†source】。'
+                        ),
+                        type='text'
+                    )
+                ],
+                created_at=1699493845,
+                file_ids=[],
+                metadata={},
+                object='thread.message',
+                role='assistant',
+                run_id='run_zJYZX0KFEvEh2VG5x5zSLq9s',
+                thread_id='thread_3JWRdjvZDJTBgZ0tlrrKXnrt'
+            ),
+
+            ThreadMessage(
+                id='msg_tc5Tit7q19S5TSgvmBauME3H',
+                assistant_id=None,
+                content=[
+                    MessageContentText(
+                        text=Text(
+                            annotations=[],
+                            value='刘备和张飞是什么关系。'
+                        ),
+                        type='text'
+                    )
+                ],
+                created_at=1699493838,
+                file_ids=[],
+                metadata={},
+                object='thread.message',
+                role='user',
+                run_id=None,
+                thread_id='thread_3JWRdjvZDJTBgZ0tlrrKXnrt'
+            )
+
+        ],
+        object='list',
+        first_id='msg_kb0f2fyDC6OwMyXxKbUpcuBS',
+        last_id='msg_tc5Tit7q19S5TSgvmBauME3H',
+        has_more=False
+    )
+    """
     messages = client.beta.threads.messages.list(
         thread_id=thread_id
     )
+    # print(messages)
 
     result = list()
     for message in messages.data:
 
         content = list()
         for msg in message.content:
+            annotations = list()
+            for annotation in msg.text.annotations:
+                a = {
+                    "start_index": annotation.start_index,
+                    "end_index": annotation.end_index,
+                    "text": annotation.text,
+                    "type": annotation.type,
+                }
+
+                if annotation.type == "file_citation":
+                    a["file_citation"] = {
+                        "file_id": annotation.file_citation.file_id,
+                        "quote": annotation.file_citation.quote,
+                    }
+
+                annotations.append(a)
+
             content.append({
                 "text": {
-                    "annotations": msg.text.annotations,
+                    "annotations": annotations,
                     "value": msg.text.value,
                 },
                 "type": msg.type,
@@ -89,6 +326,43 @@ def convert_message_list_to_response(message_list: List[dict]) -> str:
     return response
 
 
+def convert_message_list_to_conversation(message_list: List[dict]) -> List[Tuple[str, str]]:
+    conversation = list()
+    for message in message_list:
+        role = message["role"]
+        content = message["content"]
+        for c in content:
+            c_type = c["type"]
+            if c_type != "text":
+                continue
+            text: dict = c["text"]
+
+            if c_type == "text":
+                text_value = text["value"]
+                text_annotations = text["annotations"]
+
+                msg = text_value
+                for text_annotation in text_annotations:
+                    a_type = text_annotation["type"]
+                    if a_type == "file_citation":
+                        msg += "\n\n"
+                        msg += "\nquote: \n{}\nfile_id: \n{}".format(
+                            text_annotation["file_citation"]["quote"],
+                            text_annotation["file_citation"]["file_id"],
+                        )
+            else:
+                raise NotImplementedError
+
+            if role == "assistant":
+                msg = [None, msg]
+            else:
+                msg = [msg, None]
+
+            conversation.append(msg)
+
+    return conversation
+
+
 def streaming_refresh(openai_api_key: str,
                       thread_id: str,
                       queue: Queue,
@@ -121,8 +395,10 @@ def refresh(openai_api_key: str,
     )
 
     message_list = get_message_list(client, thread_id=thread_id)
-    response = convert_message_list_to_response(message_list)
-    return response
+    print(message_list)
+    logger.info("message_list: {}".format(message_list))
+    conversation = convert_message_list_to_conversation(message_list)
+    return conversation
 
 
 def add_and_run(openai_api_key: str,
@@ -130,6 +406,10 @@ def add_and_run(openai_api_key: str,
                 thread_id: str,
                 name: str,
                 instructions: str,
+                description: str,
+                tools: str,
+                files: List[str],
+                file_ids: str,
                 model: str,
                 query: str,
                 ):
@@ -137,13 +417,10 @@ def add_and_run(openai_api_key: str,
         api_key=openai_api_key,
     )
     if assistant_id is None or len(assistant_id.strip()) == 0:
-        assistant = client.beta.assistants.create(
-            name=name,
-            instructions=instructions,
-            # tools=[{"type": "code_interpreter"}],
-            model=model,
+        assistant_id = click_create_assistant(
+            openai_api_key,
+            name, instructions, description, tools, files, file_ids, model
         )
-        assistant_id = assistant.id
 
     if thread_id is None or len(thread_id.strip()) == 0:
         thread = client.beta.threads.create()
@@ -192,7 +469,8 @@ def add_and_run(openai_api_key: str,
 
         result = [
             assistant_id, thread_id,
-            last_response
+            last_response,
+            []
         ]
         yield result
 
@@ -200,13 +478,13 @@ def add_and_run(openai_api_key: str,
 def main():
     args = get_args()
 
-    description = """
-    chat llm
+    gr_description = """
+    OpenAI Assistant
     """
 
     # ui
     with gr.Blocks() as blocks:
-        gr.Markdown(value=description)
+        gr.Markdown(value=gr_description)
 
         with gr.Row():
             # settings
@@ -221,22 +499,41 @@ def main():
 
                         name = gr.Textbox(label="name")
                         instructions = gr.Textbox(label="instructions")
+                        description = gr.Textbox(label="description")
 
                         model = gr.Dropdown(["gpt-4-1106-preview"], value="gpt-4-1106-preview", label="model")
 
                         # functions
-                        functions = gr.TextArea(label="functions")
+                        tools = gr.TextArea(label="functions")
 
                         # upload files
-                        retrieval_files = gr.Files(label="retrieval files")
+                        retrieval_files = gr.Files(label="retrieval_files")
+                        retrieval_file_ids = gr.TextArea(label="retrieval_file_ids")
+
+                        # create assistant
+                        create_assistant_button = gr.Button("create assistant")
+
+                    with gr.TabItem("list assistant"):
+                        list_assistant_button = gr.Button("list assistant")
+                        assistant_list = gr.TextArea(label="assistant_list")
+
+                        delete_assistant_id = gr.Textbox(label="delete_assistant_id")
+                        delete_assistant_button = gr.Button("delete assistant")
+
+                    with gr.TabItem("list file"):
+                        list_file_button = gr.Button("list file")
+                        file_list = gr.TextArea(label="file_list")
+
+                        delete_file_id = gr.Textbox(label="delete_file_id")
+                        delete_file_button = gr.Button("delete file")
+
+                        upload_files = gr.Files(label="upload_files")
+                        upload_files_button = gr.Button("upload file")
 
             # chat
             with gr.Column(scale=5):
-                response = gr.Textbox(lines=5, max_lines=80, label="response")
-                query = gr.Textbox(lines=2, label="query")
-
-                # chat_bot = gr.Chatbot([], elem_id="context", height=400)
-                # text_box = gr.Textbox(show_label=False, placeholder="Enter text and press enter", container=False)
+                chat_bot = gr.Chatbot(label="conversation", height=600)
+                query = gr.Textbox(lines=1, label="query")
 
                 with gr.Row():
                     with gr.Column(scale=1):
@@ -246,7 +543,6 @@ def main():
 
             # states
             with gr.Column(scale=2):
-                # upload files
                 assistant_id = gr.Textbox(value=None, label="assistant_id")
                 thread_id = gr.Textbox(value=None, label="thread_id")
 
@@ -257,34 +553,117 @@ def main():
                     [
                         "Math Tutor",
                         "You are a personal math tutor. Write and run code to answer math questions.",
+                        "Official math test cases",
+                        None,
+                        None,
                         "gpt-4-1106-preview",
                         "123 * 524 等于多少？"
-                    ]
+                    ],
+                    [
+                        "小说专家",
+                        "根据小说内容回答问题。",
+                        "三国演义文档问答测试",
+                        "{\"type\": \"retrieval\"}",
+                        [
+                            (project_path / "data/三国演义.txt").as_posix()
+                        ],
+                        "gpt-4-1106-preview",
+                        "刘备和张飞是什么关系。"
+                    ],
                 ],
                 inputs=[
-                    name, instructions, model,
+                    name, instructions, description, tools, retrieval_files, model,
                     query,
                 ],
                 examples_per_page=5
             )
 
+        # create assistant
+        create_assistant_button.click(
+            click_create_assistant,
+            inputs=[
+                openai_api_key,
+                name, instructions, description, tools, retrieval_files, retrieval_file_ids, model,
+            ],
+            outputs=[
+                assistant_id, thread_id
+            ]
+        )
+
+        # list assistant
+        list_assistant_button.click(
+            click_list_assistant,
+            inputs=[
+                openai_api_key
+            ],
+            outputs=[
+                assistant_list
+            ]
+        )
+
+        # delete assistant button
+        delete_assistant_button.click(
+            click_delete_assistant,
+            inputs=[
+                openai_api_key,
+                delete_assistant_id
+            ],
+            outputs=[
+                delete_assistant_id
+            ]
+        )
+
+        # list file
+        list_file_button.click(
+            click_list_file,
+            inputs=[
+                openai_api_key
+            ],
+            outputs=[
+                file_list
+            ],
+        )
+
+        # delete file
+        delete_file_button.click(
+            click_delete_file,
+            inputs=[
+                openai_api_key,
+                delete_file_id
+            ],
+            outputs=[
+                delete_file_id
+            ]
+        )
+
+        # upload files
+        upload_files_button.click(
+            click_upload_files,
+            inputs=[
+                openai_api_key,
+                upload_files
+            ],
+            outputs=[
+
+            ]
+        )
+
         # add and run
         add_and_run_button.click(
             add_and_run,
             inputs=[
                 openai_api_key,
                 assistant_id, thread_id,
-                name, instructions, model,
+                name, instructions, description, tools, retrieval_files, retrieval_file_ids, model,
                 query,
             ],
             outputs=[
                 assistant_id, thread_id,
-                response,
+                chat_bot
             ],
         )
 
         # refresh
-
         refresh_button.click(
             refresh,
             inputs=[
@@ -292,7 +671,7 @@ def main():
                 thread_id,
             ],
             outputs=[
-                response
+                chat_bot
             ]
         )