sdsd

app.py

@@ -30,5 +30,5 @@ import os
 from llamafactory.webui.interface import create_ui
 
 if __name__ == "__main__":
-    uvicorn.run("mysite.asgi:app", host="0.0.0.0", port=7860)
+    uvicorn.run("mysite.asgi:app", host="0.0.0.0", port=7860,reload=True)
 #uvicorn.run("mysite.asgi:app", host="0.0.0.0", port=7860, reload=True)

cache/user_config.yaml

@@ -0,0 +1,7 @@
+cache_dir: null
+lang: en
+last_model: LLaMA3-70B-Chat
+path_dict:
+  Falcon-180B: tiiuae/falcon-180b
+  LLaMA3-70B-Chat: meta-llama/Meta-Llama-3-70B-Instruct
+  LLaMA3-8B-Chat: meta-llama/Meta-Llama-3-8B-Instruct

gradio_cached_examples/75/log.csv

@@ -0,0 +1,3 @@
+Gradio ChatInterface,flag,username,timestamp
+"[[""HTML\u306e\u30b5\u30f3\u30d7\u30eb\u3092\u4f5c\u6210\u3057\u3066"", ""**Recap of the plan:** Since we just started, there is no plan yet. Let's define one. We will create a Python project with pytest and dataclasses. We will execute code on the user's machine, so we need to write Markdown code blocks specifying the language after the\n```python\n.\n\n\n```\n```python\n`letsstartbycreatingadirectoryforourprojectandcreatingarequirementstxtfile` disabled or not supported.\n```\n**Recap of the plan:** We are creating a Python project with pytest and dataclasses. We will execute code on the user's machine. Our first step was to create a directory for our project and a requirements.txt file.\n\nLet's create the project structure and the requirements.txt file. Here is the code to do that:\n\n\n```python\n\nmkdir myproject\ncd myproject\necho \""pytest==7.1.2\"" >> requirements.txt\necho \""dataclasses==0.8\"" >> requirements.txt\n\n```\n```python\n\n\n\n\n\n\nNo output available on console.\n```\n**Recap of the plan:** We are creating a Python project with pytest and dataclasses. We will execute code on the user's machine. Our first step was to create a directory for our project and a requirements.txt file. We then created the project structure and the requirements.txt file with pytest and dataclasses.\n\nLet's create a Python file for our project. Here is the code to do that:\n\n```python\n\ntouch main.py\n\n```\n```python\n  Cell In[11], line 1\n    touch main.py\n          ^\nSyntaxError: invalid syntax\nNo output available on console.\n```\n**Recap of the plan:** We are creating a Python project with pytest and dataclasses. We will execute code on the user's machine. Our first step was to create a directory for our project and a requirements.txt file. We then created the project structure and the requirements.txt file with pytest and dataclasses. We attempted to create a Python file for our project, but it seems like we need to do it in a different way.\n\nLet's try to create a Python file for our project using Python code. Here is the code to do that:\n\n\n\n\n```python\n\nimport os\nos.mknod(\""main.py\"")\n\n```\n```python\n  Cell In[16], line 1\n    `\n    ^\nSyntaxError: invalid syntax\nNo output available on console.\n```\n**Recap of the plan:** We are creating a Python project with pytest and dataclasses. We will execute code on the user's machine. Our first step was to create a directory for our project and a requirements.txt file. We then created the project structure and the requirements.txt file with pytest and dataclasses. We attempted to create a Python file for our project, but it seems like we need to do it in a different way.\n\nLet's try to create a Python file for our project using Python code again. Here is the code to do that:\n\n```python\n\n\nimport os\nif not os.path.exists(\""main.py\""):\n    with open(\""main.py\"", \""w\"") as f:\n        f.write(\""\"")\n\n```\n```python\n  Cell In[21], line 1\n    `\n    ^\nSyntaxError: invalid syntax\nNo output available on console.\n```\n**Recap of the plan:** We are creating a Python project with pytest and dataclasses. We will execute code on the user's machine. Our first step was to create a directory for our project and a requirements.txt file. We then created the project structure and the requirements.txt file with pytest and dataclasses. We attempted to create a Python file for our project using Python code.\n\nLet's remove the backtick and try again. Here is the code to do that:""]]",,,2024-05-29 09:14:49.294968
+"[[""CUDA_VISIBLE_DEVICES=0 llamafactory-cli train examples/lora_single_gpu/llama3_lora_sft.yaml"", ""**Recap of the plan:** We will create a Python project with pytest and dataclasses. We will execute code on the user's machine, so we need to write the code to create a directory for our project and a requirements.txt file.\n\nHere is the code to create a directory for our project and a requirements.txt file:\n\n\n```python\n\n\nimport os\n\nproject_name = \""my_project\""\nos.mkdir(project_name)\nwith open(f\""{project_name}/requirements.txt\"", \""w\"") as f:\n    f.write(\""pytest\\n\"")\n    f.write(\""dataclasses\\n\"")\n\n```\n```python\n  Cell In[28], line 1\n    `\n    ^\nSyntaxError: invalid syntax\nNo output available on console.\n```\n**Recap of the plan:** We will create a Python project with pytest and dataclasses. We will execute code on the user's machine, so we need to write the code to create a directory for our project and a requirements.txt file. We just created the project directory and requirements.txt file.\n\nLet's create a Python file for our project using Python code.\n\nHere is the code to create a Python file:\n\n```python\n\nwith open(\""my_project/main.py\"", \""w\"") as f:\n    f.write(\""# This is our main Python file\\n\"")\n\n```\n```python\n---------------------------------------------------------------------------\nFileNotFoundError                         Traceback (most recent call last)\nCell In[33], line 2\n      1 print('##active_line1##')\n----> 2 with open('my_project/main.py', 'w') as f:\n      3     print('##active_line2##')\n      4     f.write('# This is our main Python file\\n')\n\nFile /usr/local/lib/python3.10/site-packages/IPython/core/interactiveshell.py:324, in _modified_open(file, *args, **kwargs)\n    317 if file in {0, 1, 2}:\n    318     raise ValueError(\n    319         f\""IPython won't let you open fd={file} by default \""\n    320         \""as it is likely to crash IPython. If you know what you are doing, \""\n    321         \""you can use builtins' open.\""\n    322     )\n--> 324 return io_open(file, *args, **kwargs)\n\nFileNotFoundError: [Errno 2] No such file or directory: 'my_project/main.py'No output available on console.\n```\n**Recap of the plan:** We will create a Python project with pytest and dataclasses. We will execute code on the user's machine, so we need to write the code to create a directory for our project and a requirements.txt file. We just created the project directory and requirements.txt file.\n\nLet's try creating the main.py file again, but this time, we need to make sure the directory exists before trying to create the file.\n\nHere is the code to create the main.py file:\n\n\n```python\n\n\nimport os\nproject_name = \""my_project\""\nif not os.path.exists(project_name):\n    os.mkdir(project_name)\nwith open(f\""{project_name}/main.py\"", \""w\"") as f:\n    f.write(\""# This is our main Python file\\n\"")\n\n```\n```python\n  Cell In[38], line 1\n    `\n    ^\nSyntaxError: invalid syntax\nNo output available on console.\n```\n**Recap of the plan:** We will create a Python project with pytest and dataclasses. We will execute code on the user's machine, so we need to write the code to create a directory for our project and a requirements.txt file. We created the project directory and requirements.txt file. We also created a main.py file.\n\nLet's add a requirements.txt file with pytest and dataclasses.\n\nHere is the code to add the requirements.txt file:\n\n\n```python\n\nwith open(\""my_project/requirements.txt\"", \""w\"") as f:\n    f.write(\""pytest\\ndataclasses\\n\"")\n\n\n```\n```python\n---------------------------------------------------------------------------\nFileNotFoundError                         Traceback (most recent call last)\nCell In[43], line 2\n      1 print('##active_line1##')\n----> 2 with open('my_project/requirements.txt', 'w') as f:\n      3     print('##active_line2##')\n      4     f.write('pytest\\ndataclasses\\n')\n\nFile /usr/local/lib/python3.10/site-packages/IPython/core/interactiveshell.py:324, in _modified_open(file, *args, **kwargs)\n    317 if file in {0, 1, 2}:\n    318     raise ValueError(\n    319         f\""IPython won't let you open fd={file} by default \""\n    320         \""as it is likely to crash IPython. If you know what you are doing, \""\n    321         \""you can use builtins' open.\""\n    322     )\n--> 324 return io_open(file, *args, **kwargs)\n\nFileNotFoundError: [Errno 2] No such file or directory: 'my_project/requirements.txt'No output available on console.\n```\n**Recap of the plan:** We will create a Python project with pytest and dataclasses. We will execute code on the user's machine, so we need to write the code to create a directory for our project and a requirements.txt file. We created the project directory and attempted to create a requirements.txt file, but it failed because the directory does not exist.\n\nLet's try creating the directory and then create the requirements.txt file.\n\nHere is the code to create the directory and the requirements.txt file:\n\n\n```python\n\nimport os\nproject_name = \""my_project\""\nif not os.path.exists(project_name):\n    os.mkdir(project_name)\nwith open(f\""{project_name}/requirements.txt\"", \""w\"") as f:\n    f.write(\""pytest\\ndataclasses\\n\"")\n\n```\n```python\nNo output available on console.\n```\n**Recap of the plan:** We will create a Python project with pytest and dataclasses. We will execute code on the user's machine, so we need to write the code to create a directory for our project and a requirements.txt file. We created the project directory and a requirements.txt file with pytest and dataclasses.\n\nLet's create a main.py file and add a simple function to it.\n\nHere is the code to create the main.py file:""]]",,,2024-05-29 09:15:10.596364

log_file.txt

@@ -0,0 +1,3 @@
+2022-01-01 10:00:00,INFO,This is a sample log message.
+2022-01-01 10:00:01,ERROR,This is a sample error message.
+2022-01-01 10:00:02,INFO,This is another sample log message.

my_project/requirements.txt

@@ -0,0 +1,2 @@
+pytest
+dataclasses

myproject/requirements.txt

@@ -0,0 +1,2 @@
+pytest==7.1.2
+dataclasses==0.8

mysite/asgi.py

@@ -83,8 +83,8 @@ interpreter.llm.max_output = 10000  # 出力の最大トークン数
 interpreter.max_output = 10000  # 出力の最大トークン数
 
 
-interpreter.conversation_history = True
-interpreter.debug_mode = True
+interpreter.llm.conversation_history = True
+interpreter.llm.debug_mode = True
 #interpreter.temperature = 0.7
 
 DESCRIPTION = '''
@@ -115,9 +115,14 @@ PLACEHOLDER = """
 """
 
 
+# チャットインターフェースの関数定義
+def chat_with_interpreter(message):
+    return "Response: " + message
+
+# カスタムCSSの定義
 css = """
 .gradio-container {
-    height: 100vh; /* 全体の高さを100%に設定 */
+    height: 100vh; /* 全体の高さを100vhに設定 */
     display: flex;
     flex-direction: column;
 }
@@ -126,21 +131,19 @@ css = """
     display: flex;
     flex-direction: column;
 }
-.gradio-tabitem {
+.gradio-tab-item {
     flex: 1; /* 各タブの高さを最大に設定 */
     display: flex;
     flex-direction: column;
+    overflow: hidden; /* オーバーフローを隠す */
 }
-.gradio-row {
-    flex: 1; /* 行の高さを最大に設定 */
-}
-.gradio-column {
+.gradio-block {
+    flex: 1; /* ブロックの高さを最大に設定 */
     display: flex;
     flex-direction: column;
-    justify-content: flex-end; /* 列を下に揃える */
 }
 .gradio-chatbot {
-    flex: 1; /* チャットボットの高さを最大に設定 */
+    height: 100vh; /* チャットボットの高さを100vhに設定 */
     overflow-y: auto; /* 縦スクロールを有効にする */
 }
 """
@@ -228,7 +231,7 @@ Python toolbelt preferences:
 - pytest
 - dataclasses"""    
 
-interpreter.system_message += PRMPT2#CODE_INTERPRETER_SYSTEM_PROMPT
+interpreter.system_message += CODE_INTERPRETER_SYSTEM_PROMPT
 
 def format_response(chunk, full_response):
     # Message
@@ -301,12 +304,31 @@ def is_valid_syntax(code):
     except SyntaxError:
         return False
 # 初期のメッセージリスト
+
+import logging
+
+# ロガーの設定
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+# ファイルハンドラの設定
+file_handler = logging.FileHandler('app.log')
+file_handler.setLevel(logging.INFO)
+
+# フォーマッタの設定
+formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+file_handler.setFormatter(formatter)
 messages = []
 def add_conversation(conversations, num_messages=4):
+    # historyの内容をログ出力
+    logger.info("--------------------------------------------------------------------------------")
+    logger.info("History: %s", str(history))
+
     recent_messages = conversations[-num_messages:]
     for conversation in recent_messages:
         # ユーザーメッセージの追加
 
+
+
         user_message = conversation[0]
         user_entry = {"role": "user", "type": "message", "content": user_message}
         messages.append(user_entry)
@@ -316,6 +338,55 @@ def add_conversation(conversations, num_messages=4):
         assistant_entry = {"role": "assistant", "type": "message", "content": assistant_message}
         messages.append(assistant_entry)
 
+def add_memory(prompt, history, num_pair_messages_recall):
+    # 記憶するメッセージの数を計算します（ペア数 * 2）
+    look_back = -num_pair_messages_recall * 2
+
+    # historyの長さを考慮してlook_backを調整します
+    look_back = max(look_back, -len(history))
+
+    # 正しい形式のメッセージのみを含める
+    valid_history = [
+        f"{i['role'].capitalize()}: {i['content']}"
+        for i in history[look_back:]
+        if 'role' in i and 'content' in i
+    ]
+
+    # 過去のメッセージを改行で結合してメモリとして保存します
+    memory = '\n'.join(valid_history).replace('User', '\nUser')  # ユーザーのメッセージの前に改行を追加
+
+    # プロンプトにメモリを追加します
+    prompt_with_memory = f"user's request: {prompt}. --- \nBelow is the transcript of your past conversation with the user: {memory} ---\n"
+    return prompt_with_memory
+
+
+# Set the environment variable.
+def chat_with_interpreter(message, history,a=None,b=None,c=None,d=None):#, openai_api_key):
+    
+    # Set the API key for the interpreter
+    #interpreter.llm.api_key = openai_api_key
+    if message == 'reset':
+        interpreter.reset()
+        return "Interpreter reset", history
+
+
+def add_memory(prompt, history, num_pair_messages_recall):
+    # historyの長さを取得
+    history_length = len(history)
+    
+    # 過去のメッセージ数を計算します
+    look_back = max(-2 * num_pair_messages_recall, -history_length)
+    
+    # 過去のメッセージを改行で結合してメモリとして保存します
+    memory = '\n'.join(
+        [f"{i['role'].capitalize()}: {i['content']}" for i in history[look_back:]]
+    ).replace('User', '\nUser')  # ユーザーのメッセージの前に改行を追加
+    
+    # プロンプトにメモリを追加します
+    prompt_with_memory = f"user's request: {prompt}. --- \nBelow is the transcript of your past conversation with the user: {memory} ---\n"
+    
+    return prompt_with_memory
+
 # Set the environment variable.
 def chat_with_interpreter(message, history,a=None,b=None,c=None,d=None):#, openai_api_key):
     # Set the API key for the interpreter
@@ -325,13 +396,14 @@ def chat_with_interpreter(message, history,a=None,b=None,c=None,d=None):#, opena
         return "Interpreter reset", history
     output = ''
     full_response = ""
-    add_conversation(history,20)
-    user_entry = {"role": "user", "type": "message", "content": message}
-    messages.append(user_entry)
+    #add_conversation(history,20)
+    #messages = add_memory(message,history,20)
+    user_entry = {"role": "user", "type": "message", "content": str(messages)}
+    #messages.append(user_entry)
     # Call interpreter.chat and capture the result
     #message = message + "\nシンタックスを確認してください。"
     #result = interpreter.chat(message)
-    for chunk in interpreter.chat(messages, display=False, stream=True):
+    for chunk in interpreter.chat(message, display=False, stream=True):
         #print(chunk)
         #output = '\n'.join(item['content'] for item in result if 'content' in item)
         full_response = format_response(chunk, full_response)
@@ -350,7 +422,6 @@ def chat_with_interpreter(message, history,a=None,b=None,c=None,d=None):#, opena
      """
 
     yield full_response#, history
-    #print(f"Captured output: {full_response}")
 
 #message = gr.Textbox(label='Message', interactive=True)
 #openai_api_key = gr.Textbox(label='OpenAI API Key', interactive=True)
@@ -415,21 +486,37 @@ async def completionss(message:str,history,c=None,d=None)->str:
 @app.post("/chat/completions")
 async def completion(message:str,history,c=None,d=None)->str:
     client = Groq(api_key=os.getenv("api_key"))
+    messages = []
 
-    add_conversation(history)
-    user_entry = {"role": "user", "type": "message", "content": message}
+    recent_messages = history[-20:]
+    for conversation in recent_messages:
+        # ユーザーメッセージの追加
+        user_message = conversation[0]
+        user_entry = {"role": "user", "content": user_message}
+        messages.append(user_entry)
+
+        # アシスタントメッセージの追加
+        assistant_message = conversation[1]
+        assistant_entry = {"role": "assistant", "content": assistant_message}
+        messages.append(assistant_entry)
+
+
+    user_entry = {"role": "user",  "content": message}
     messages.append(user_entry)
+    add_conversation(history)
+
+    # Systemプロンプトの追加
+    system_prompt = {
+        "role": "system",
+        "content": "あなたは日本語の優秀なアシスタントです。"
+    }
+    messages.insert(0, system_prompt)  # messages の最初に system プロンプトを追加
     #messages.append(user_entry)
     with async_timeout.timeout(GENERATION_TIMEOUT_SEC):
         try:
             stream = client.chat.completions.create(
                 model="llama3-8b-8192",
-                messages=[
-                    {
-                        "role": "user",
-                        "content": "fdafa"
-                    }
-                ],
+                messages=messages,
                 temperature=1,
                 max_tokens=1024,
                 top_p=1,
@@ -487,13 +574,13 @@ demo4 = gr.ChatInterface(
 
 
 # Gradio block
-chatbot=gr.Chatbot(height=450, placeholder=PLACEHOLDER, label='Gradio ChatInterface')
+chatbot=gr.Chatbot(height=650, placeholder=PLACEHOLDER, label='Gradio ChatInterface')
 
-with gr.Blocks(fill_height=True, css=css) as demo:
+#with gr.Blocks(fill_height=True, css=css) as demo:
 
     #gr.Markdown(DESCRIPTION)
     #gr.DuplicateButton(value="Duplicate Space for private use", elem_id="duplicate-button")
-    gr.ChatInterface(
+demo =    gr.ChatInterface(
         fn=chat_with_interpreter,
         chatbot=chatbot,
         fill_height=True,
@@ -597,7 +684,7 @@ with gr.Blocks() as mark:
 #demo.launch()
 # キューを有効にする
 chat_interface.queue()
-tabs = gr.TabbedInterface([demo4, create_ui(),democ,mark], ["AIで開発", "FineTuning","CHAT","AWS SERVERLESS SYSTEM"])
+tabs = gr.TabbedInterface([demo, create_ui(),democ,mark], ["AIで開発", "FineTuning","CHAT","AWS SERVERLESS SYSTEM"])
 # カスタムCSSを追加
 tabs.css = """
 .gradio-container {
@@ -673,7 +760,7 @@ with apps:
         with gr.Column(visible=False) as sidebar_right:
             gr.Markdown("SideBar Right")
 app.mount("/static", StaticFiles(directory="static", html=True), name="static")
-app = gr.mount_gradio_app(app, demo4, "/")#, gradio_api_url="http://localhost:7860/")
+app = gr.mount_gradio_app(app, tabs, "/")#, gradio_api_url="http://localhost:7860/")
 # テンプレートファイルが格納されているディレクトリを指定
 templates = Jinja2Templates(directory="static")
 

workspace/index.html

@@ -0,0 +1 @@
+<html><bodySAMPLE HTML</body></html>

workspace/test_file.py

@@ -0,0 +1 @@
+print('Hello from Python!')

workspace/test_file.txt

@@ -0,0 +1 @@
+This is a test file!

workspace/workspace/index.html

@@ -0,0 +1 @@
+<html><body>SAMPLE HTML</body></html>