pycoze 0.1.469__py3-none-any.whl → 0.1.470__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -169,6 +169,7 @@ class BufferProcessor:
         self.text_content = ""
 
 
+
 async def stream_openai_response(conversation_history, start_new_stream):
     """
     异步流式传输 OpenAI 聊天完成响应并处理结构化输出
@@ -219,6 +220,39 @@ async def stream_openai_response(conversation_history, start_new_stream):
         yield result
 
 
+def mark_json_error(e, content):
+    """标记JSON解析错误的位置
+    Args:
+        e: JSONDecodeError异常
+        content: 原始JSON内容
+    Returns:
+        标记错误位置的字符串，并用 **ERROR** 标注错误位置
+    """
+    # 确保上下文长度至少为前后各50个字符
+    error_start = max(0, e.pos - 50)
+    error_end = min(len(content), e.pos + 50)
+    error_context = content[error_start:error_end]
+    
+    # 计算错误在上下文中的位置
+    error_pos_in_context = e.pos - error_start
+    
+    # 确保错误位置在上下文中
+    if error_pos_in_context < 0 or error_pos_in_context >= len(error_context):
+        # 如果错误位置超出上下文范围，返回整个上下文并标记错误位置
+        return (
+            f"Error position is at the end of the context:\n"
+            f"{error_context}**ERROR_HERE**"
+        )
+    
+    # 标记错误位置
+    marked_error = (
+        error_context[:error_pos_in_context] +
+        '**ERROR_HERE**' + error_context[error_pos_in_context] + '**ERROR_HERE**' +
+        error_context[error_pos_in_context + 1:]
+    )
+    
+    return marked_error
+
 
 async def handle_user_inputs(
     conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting, bot_setting_file:str
@@ -287,15 +321,13 @@ async def handle_user_inputs(
                                 "content": f"\n```json\n{cleaned_content}\n```\n",
                             }
                         )
-                        # 获取错误位置前后的上下文
-                        start = max(0, e.pos - 100)
-                        end = min(len(cleaned_content), e.pos + 100)
-                        context = cleaned_content[start:end]
-                        
+                        # 使用函数标记错误位置
+                        marked_error = mark_json_error(e, cleaned_content)
+                        json_err =  f"JSON parsing error\n\nError type: {type(e).__name__}\nError message: {e.msg}\nPosition: line {e.lineno}, column {e.colno}\n\nError context:\n{marked_error}\n\nPlease think and check and correct the JSON format, then try again."
                         conversation_history.append(
                             {
                                 "role": "user",
-                                "content": f"JSON parsing error\n\nError type: {type(e).__name__}\nError message: {e.msg}\nPosition: line {e.lineno}, column {e.colno}\n\nError context:\n{context}\n\nPlease think and check and correct the JSON format, then try again.",
+                                "content": json_err,
                             }
                         )
                         start_new_stream["value"] = True

{pycoze-0.1.469.dist-info → pycoze-0.1.470.dist-info}/METADATA

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

{pycoze-0.1.469.dist-info → pycoze-0.1.470.dist-info}/RECORD

@@ -11,7 +11,7 @@ pycoze/api/lib/web.py,sha256=4HaOV_zYHq6-SSQQIc_O7REnC1asIlXIELxee-pU6zc,2421
 pycoze/api/lib/window.py,sha256=ZZacqnX0fvZUnLUhNVjbbjhBcKkYdi_6E0LswLp1MqM,2071
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
 pycoze/bot/chat.py,sha256=bScsMc0hGh2NlvhQxzWEbnA_WXU9JdAJv-rx27SpEB8,6554
-pycoze/bot/chat_base.py,sha256=a2LfIs7azCQfb2TWcEBAsBftJeogbrPMI6-9JmnMTDM,13133
+pycoze/bot/chat_base.py,sha256=CKinEQWFgV_QKHAXWNAwAzpIvkDStFQNLHd_5btsczk,14199
 pycoze/bot/lib.py,sha256=WU4h3B7SG7vh9p9BxhtPlaJ7TkU9VsL3HyCn9hKhWOo,7753
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
 pycoze/bot/prompt.md,sha256=gU79GrEEUsMc5aPrxcB7TC4YMHGCgo8GMsvG8LyNXgQ,14247
@@ -33,8 +33,8 @@ pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/process.py,sha256=U2MURGmxfyWBqdbKfy5UvyV17M40B6HHlNELgWfgrTE,3824
 pycoze/utils/socket.py,sha256=4Wm4LlwdWXC_kAV0NnZbUc0Y3Kc6KRMyFRqSw79u-9w,2468
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.469.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.469.dist-info/METADATA,sha256=tnTgmN4GAz0-BoaKPtO-knHbsOPy4hGrYUZYRpsWh3E,854
-pycoze-0.1.469.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.469.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.469.dist-info/RECORD,,
+pycoze-0.1.470.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.470.dist-info/METADATA,sha256=a2FEbeLLXzdKPjEqnRpVAJPyyrWHe1pqW4fX8buXs08,854
+pycoze-0.1.470.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.470.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.470.dist-info/RECORD,,