pycoze 0.1.420__py3-none-any.whl → 0.1.421__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -164,24 +164,46 @@ async def stream_openai_response(conversation_history, start_new_stream):
             print(f"Error: {e}", style="bold red")
             break
     
-    # 处理 buffer 中剩余的内容
-    if buffer:
-        if in_json_block:
-            buffer = buffer.split("```")[0]
-            json_block_content += buffer
+    if not in_json_block:
+        # 查找 JSON 代码块的起始标记
+        json_start_match = re.search(r"```json", buffer, re.IGNORECASE)
+        if json_start_match:
+            # 提取 JSON 代码块之前的文本
+            text_content += buffer[:json_start_match.start()]
+            # 如果 text_content 不为空，先 yield 文本
+            if text_content.strip():
+                yield ("text", text_content.strip())
+                text_content = ""
+            # 进入 JSON 代码块模式
+            in_json_block = True
+            buffer = buffer[json_start_match.end():]
         else:
+            # 如果没有找到 JSON 代码块，继续累积到 text_content
             text_content += buffer
-
+            buffer = ""
+    else:
+        # 查找 JSON 代码块的结束标记
+        json_end_match = re.search(r"```", buffer)
+        if json_end_match:
+            # 提取 JSON 代码块内容
+            json_block_content += buffer[:json_end_match.start()]
+            # yield JSON 代码块
+            yield ("json", json_block_content.strip())
+            json_block_content = ""
+            in_json_block = False
+            buffer = buffer[json_end_match.end():]
+        else:
+            # 如果没有找到结束标记，继续累积 JSON 内容
+            json_block_content += buffer
+            buffer = ""
     # 处理流结束后的剩余内容
     if in_json_block:
         # 如果仍在 JSON 代码块模式，处理剩余的 JSON 内容
         if json_block_content.strip():
-            print("yield json", json_block_content.strip())
             yield ("json", json_block_content.strip())
     else:
         # 如果不在 JSON 代码块模式，处理剩余的文本内容
         if text_content.strip():
-            print("yield json", text_content.strip())
             yield ("text", text_content.strip())
 
 

{pycoze-0.1.420.dist-info → pycoze-0.1.421.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycoze
-Version: 0.1.420
+Version: 0.1.421
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.420.dist-info → pycoze-0.1.421.dist-info}/RECORD

@@ -11,8 +11,7 @@ pycoze/api/lib/web.py,sha256=GWgtiTJOolKOX2drXcwuyqTcbo5FQVxa1NuBGcNyjyc,223
 pycoze/api/lib/window.py,sha256=dkzWfLwn5pE_L0DfQ38K8nx9tQyT5KO-GYyXi0rytFc,2073
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
 pycoze/bot/chat.py,sha256=qEuMxH0cVFU9QSU36FrOsjhRAxtsvOv7CQtuXvM3F6Y,6446
-pycoze/bot/chat_base copy.py,sha256=WZRB08zN4OeYAjSxccgu69Jb-k8tfbNwskqi5LmBF20,11979
-pycoze/bot/chat_base.py,sha256=Uh2MxkcgRRp3GjP9BPlGAlHrb1Gd_VHTr79rDJ-i8x4,11815
+pycoze/bot/chat_base.py,sha256=A68wiakJxlCjVSZxAPLpk0xdQg62_0T8Xf7gbT-R490,12845
 pycoze/bot/lib.py,sha256=_bQ52mKsWgFGAogFHnmRBJbvK_tPOwsAJ8NqJNMR5K4,7210
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
 pycoze/bot/prompt.md,sha256=t7NQdiiNe-jCDVfeVbvTPfq5WK5nF8CxFUQUFMyXJlo,13880
@@ -32,8 +31,8 @@ pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
 pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.420.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.420.dist-info/METADATA,sha256=fTu_e7L5sy2gnsvyTWBpvIxCqbi-KhuEL5GM-fyrH3g,854
-pycoze-0.1.420.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.420.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.420.dist-info/RECORD,,
+pycoze-0.1.421.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.421.dist-info/METADATA,sha256=ZpqsY6J44Vmv4RPXHOimbf8Efa0vQv0n4XkpmJvaQgQ,854
+pycoze-0.1.421.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.421.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.421.dist-info/RECORD,,

pycoze/bot/chat_base copy.py

@@ -1,313 +0,0 @@
-import json
-import os
-from .lib import get_formatted_filelist_str, read_local_file, resolve_relative_path
-from .message import info
-from pycoze.ai import chat_stream_async, extract
-from .tools import ToolExecutor
-from typing import List
-
-def guess_files_in_message(cwd: str, user_message: str) -> List[str]:
-    try:
-        value = extract(
-            {"includedFiles": ["relative path format", "relative path format", "..."]},
-            'Please find the files mentioned in the text. If none, return {"includedFiles": []}:\n'
-            + user_message,
-        )
-        return [resolve_relative_path(cwd, p) for p in value["includedFiles"]]
-    except:
-        print("Failed to guess files in message")
-        return []
-
-
-def format_content(cwd, potential_paths, conversation_history):
-    content = []
-    for file_path in potential_paths:
-        file_path = resolve_relative_path(cwd, file_path)
-        if os.path.isfile(file_path):
-            file_marker = f"[[{file_path}]]'"
-            file_content = read_local_file(file_path)
-            if not any(
-                file_marker in msg["content"] for msg in conversation_history
-            ):
-                content.append(f"{file_marker}\n{file_content}")
-    return (
-        "Partial contents of files are as follows:" + "\n".join(content)
-        if content
-        else ""
-    )
-
-def generate_user_task_prompt(conversation_history, cwd, user_input: str, bot_setting_file:str):
-    # 需要重新读取openedFiles和activeFile
-    with open(bot_setting_file, encoding="utf-8") as f: 
-        bot_setting = json.load(f)
-    folder_context = bot_setting["folderContext"]
-    opened_files = bot_setting["openedFiles"]
-    active_file = bot_setting["activeFile"]
-
-    if folder_context:
-        potential_paths = guess_files_in_message(cwd, user_input)
-
-        existing_files = get_formatted_filelist_str(cwd, True, 200)
-
-        active_file_str = f"Currently viewing: {active_file}" if active_file else ""
-        
-        opened_files_str = (
-            f"Open tabs:\n{'\n'.join(opened_files)}" if opened_files else ""
-        )
-        existing_files_str = f"Files in directory:\n{existing_files}" if existing_files else ""
-        return f"""<task>
-{user_input}
-</task>
-
-<environment_details>
-Current working directory: {cwd}
-
-{active_file_str}
-
-{opened_files_str}
-
-{existing_files_str}
-
-{format_content(cwd, potential_paths, conversation_history)}
-
-</environment_details>
-    """
-
-    else:
-        return f"""<task>
-{user_input}
-</task>
-"""
-
-
-def dumps_markdown_json(data):
-    json_str = json.dumps(data, indent=4, ensure_ascii=False)
-    return f"\n```json\n{json_str}\n```\n"
-
-
-
-import re
-
-import re
-
-async def stream_openai_response(conversation_history, start_new_stream):
-    """
-    异步流式传输 OpenAI 聊天完成响应并处理结构化输出
-    """
-    stream = None
-    buffer = ""
-    in_json_block = False
-    json_block_content = ""
-    text_content = ""
-
-    while True:
-        # 检查是否需要重新创建流
-        if stream is None or start_new_stream["value"]:
-            if stream is not None:
-                await stream.aclose()  # 关闭之前的流
-            stream = chat_stream_async(conversation_history)  # 获取新的异步生成器
-            start_new_stream["value"] = False  # 重置标志
-            buffer = ""
-            in_json_block = False
-            json_block_content = ""
-            text_content = ""
-
-        # 使用 async for 迭代异步生成器
-        try:
-            async for chunk in stream:
-                print("chunk", chunk)
-                # 检查是否需要重新创建流
-                if start_new_stream["value"]:
-                    break  # 退出当前的 async for 循环，进入下一次 while 循环
-                
-                info("assistant", chunk)
-                buffer += chunk
-
-                # 处理 buffer 中的内容
-                while buffer:
-                    print("while buffer", buffer)
-                    if not in_json_block:
-                        # 查找 JSON 代码块的起始标记
-                        json_start_match = re.search(r"```json", buffer, re.IGNORECASE)
-                        if json_start_match:
-                            # 提取 JSON 代码块之前的文本
-                            text_content += buffer[:json_start_match.start()]
-                            # 如果 text_content 不为空，先 yield 文本
-                            if text_content.strip():
-                                print("yield text", text_content.strip())
-                                yield ("text", text_content.strip())
-                                text_content = ""
-                            # 进入 JSON 代码块模式
-                            in_json_block = True
-                            buffer = buffer[json_start_match.end():]
-                        else:
-                            # 如果没有找到 JSON 代码块，继续累积到 text_content
-                            text_content += buffer
-                            buffer = ""
-                    else:
-                        # 查找 JSON 代码块的结束标记
-                        json_end_match = re.search(r"```", buffer)
-                        if json_end_match:
-                            # 提取 JSON 代码块内容
-                            json_block_content += buffer[:json_end_match.start()]
-                            # yield JSON 代码块
-                            print("yield json", json_block_content.strip())
-                            yield ("json", json_block_content.strip())
-                            json_block_content = ""
-                            in_json_block = False
-                            buffer = buffer[json_end_match.end():]
-                        else:
-                            # 如果没有找到结束标记，继续累积 JSON 内容
-                            json_block_content += buffer
-                            buffer = ""
-
-            # 如果流正常结束，退出 while 循环
-            break
-
-        except Exception as e:
-            # 捕获其他异常（如网络错误）
-            print(f"Error: {e}", style="bold red")
-            break
-
-    # 处理 buffer 中剩余的内容
-    if buffer:
-        if in_json_block:
-            buffer = buffer.split("```")[0]
-            json_block_content += buffer
-        else:
-            text_content += buffer
-
-    # 处理流结束后的剩余内容
-    if in_json_block:
-        # 如果仍在 JSON 代码块模式，处理剩余的 JSON 内容
-        if json_block_content.strip():
-            print("yield json", json_block_content.strip())
-            yield ("json", json_block_content.strip())
-    else:
-        # 如果不在 JSON 代码块模式，处理剩余的文本内容
-        if text_content.strip():
-            print("yield json", text_content.strip())
-            yield ("text", text_content.strip())
-
-
-async def handle_user_inputs(
-    conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting, bot_setting_file:str
-):
-    no_exit_if_incomplete = bot_setting["systemAbility"]["no_exit_if_incomplete"]
-    show_tool_results = bot_setting["showToolResults"]
-    
-    start_new_stream = {
-        "value": False
-    }  # 当遇到AI准备执行JSON，即需要新信息的时候，用于强制停止当前stream，减少后续无效的tokens
-
-    print("Processing user command", user_input)
-    if user_input.lower() in ["exit", "quit"]:
-        exit(0)
-    # 将用户消息添加到对话历史
-    conversation_history.append(
-        {
-            "role": "user",
-            "content": generate_user_task_prompt(
-                conversation_history, cwd, user_input, bot_setting_file
-            ),
-        }
-    )
-    need_break = False
-
-    if no_exit_if_incomplete:
-        okay_str = 'Okay, please continue. If the tasks within <task>...task content...</task> have been completed, execute the tool "complete_all_tasks". If you have a question, use "ask_follow_up_question".'
-    else:
-        okay_str = "Okay"
-    while True:
-        async for response in stream_openai_response(
-            conversation_history, start_new_stream
-        ):
-            if len(response) == 2:
-                if (
-                    response[0] == "text"
-                    and response[1].strip() != ""
-                    or (response[0] == "json" and not has_any_tool)
-                ):
-                    if response[0] == 'text':
-                        conversation_history.append(
-                            {"role": "assistant", "content": response[1]}
-                        )
-                    else:
-                        conversation_history.append(
-                            {"role": "assistant", "content": "\n```" + response[0] + "\n" + response[1] + "\n```\n"}
-                        )
-
-                    conversation_history.append(
-                        {
-                            "role": "user",
-                            "content": okay_str,
-                        }
-                    )
-                    continue
-                elif response[0] == "json":
-                    info("assistant", "\n")
-                    cleaned_content = response[1]
-                    try:
-                        tool_request = json.loads(cleaned_content)
-                        tool_name = list(tool_request.keys())[0]
-                    except json.JSONDecodeError as e:
-                        conversation_history.append(
-                            {
-                                "role": "assistant",
-                                "content": f"\n```json\n{cleaned_content}\n```\n",
-                            }
-                        )
-                        conversation_history.append(
-                            {
-                                "role": "user",
-                                "content": "Invalid JSON content:" + str(e),
-                            }
-                        )
-                        continue
-
-                    ok, is_json_dumps, result = ToolExecutor.execute_tool(
-                        cwd, tool_request, abilities
-                    )
-                    
-                    assistant_content = (
-                        "Executing tool: \n"
-                        + dumps_markdown_json(tool_request)
-                        + "\n\n[Tool Result Begin]\n"
-                        + result
-                        + "\n[Tool Result End]\n"
-                    )
-                    lang = "json" if is_json_dumps else "text"
-                    
-                    if show_tool_results:
-                        status_str = "✅\n" if ok else "❌\n"
-                        info("assistant", status_str + f"\n```{lang}\n" + result + "\n```\n\n")
-
-                    conversation_history.append(
-                        {"role": "assistant", "content": assistant_content}
-                    )
-                    if tool_name in ["complete_all_tasks", "ask_follow_up_question"]:
-                        need_break = True
-                        break
-                    else:
-                        conversation_history.append(
-                            {
-                                "role": "user",
-                                "content": okay_str,
-                            }
-                        )
-                        start_new_stream["value"] = True
-
-        if need_break:
-            break
-        if not no_exit_if_incomplete and not start_new_stream["value"]:
-            break
-    last_conversation = conversation_history[-1]
-    if last_conversation["role"] == 'user' and last_conversation["content"] == okay_str:
-        conversation_history.pop()
-
-# 示例调用
-# user_input_list = [
-#     "访问https://api-docs.deepseek.com/zh-cn/guides/chat_prefix_completion，并结合它编写一段代码，并保存"
-# ]
-
-# asyncio.run(handle_user_inputs(user_input_list))