pro-craft 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

pro_craft/prompt_helper_async.py

@@ -23,6 +23,33 @@ from datetime import datetime
 from pro_craft.utils import extract_
 logger = Log.logger
 editing_log = logger.debug
+import re
+
+def fix_broken_json_string(broken_json_str):
+    # 移除 BOM
+    broken_json_str = broken_json_str.lstrip('\ufeff')
+    # 移除大部分非法 ASCII 控制字符
+    broken_json_str = re.sub(r'[\x00-\x08\x0b\x0c\x0e-\x1f]', '', broken_json_str)
+
+    # 尝试找到 "content": " 和它对应的结束 "
+    # 这是一个挑战，因为中间有未转义的换行。
+    # 我们会寻找 "content": "，然后捕获从那以后直到最后一个 " 的所有内容，并替换其中的裸换行。
+
+    # 注意：这个正则假设 "content" 的值是最后一个键值对，并且直到字符串末尾的 " 才结束
+    # 并且假设其他字段都是合法的单行字符串
+    fixed_json_str = re.sub(
+        r'("content":\s*")(.+?)"\s*}',  # 匹配 "content": "，然后捕获所有内容直到最后一个 " }
+        lambda m: m.group(1) + m.group(2).replace('\n', '\\n').replace('\r', '\\r') + '"\n}',
+        broken_json_str,
+        flags=re.DOTALL # 允许 . 匹配换行
+    )
+
+    # 修正可能的最后一行丢失的 }
+    if not fixed_json_str.strip().endswith('}'):
+        fixed_json_str += '\n}' # 补上结束的 }
+
+    return fixed_json_str
+
 
 class IntellectType(Enum):
     train = "train"
@@ -501,6 +528,7 @@ class AsyncIntel():
                     input_data: dict | str,
                     OutputFormat: object,
                     prompt_id: str,
+                    ExtraFormats: list[object] = [],
                     version: str = None,
                     inference_save_case = True,
                     ):
@@ -512,7 +540,7 @@ class AsyncIntel():
 "```json([\s\S]*?)```"
 使用以下方式验证
 """
-        output_format = base_format_prompt + inspect.getsource(OutputFormat)
+        output_format = base_format_prompt + "\n".join([inspect.getsource(outputformat) for outputformat in ExtraFormats]) + inspect.getsource(OutputFormat)
 
         ai_result = await self.aintellect_remove(
                     input_data=input_data,
@@ -523,7 +551,10 @@ class AsyncIntel():
                 )
 
         try:
-            ai_result = json.loads(extract_(ai_result,r'json'))
+
+            json_str = extract_(ai_result,r'json')
+            json_str = fix_broken_json_string(json_str)
+            ai_result = json.loads(json_str)
             OutputFormat(**ai_result)
         except ValidationError as e:
             log_ = "记忆卡片合并 - 大模型生成的格式未通过校验"

{pro_craft-0.1.5.dist-info → pro_craft-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.5
+Version: 0.1.7
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{pro_craft-0.1.5.dist-info → pro_craft-0.1.7.dist-info}/RECORD

@@ -5,7 +5,7 @@ pro_craft/evals.py,sha256=1T86jur4k3cLk43j1GyAW4JS0nPNfl6P0ZOQmu-SgpA,1928
 pro_craft/file_manager.py,sha256=2j7lCt9L4mtvAy8_76ibTthXLwKKmVatWIB3DSvQM7U,3805
 pro_craft/log.py,sha256=MZf9jCZsiRoAq8v4FxVnJqeSXxgzAiiKf7mxz6bFtwM,4263
 pro_craft/prompt_helper.py,sha256=SFIhju0Y3rRdb-T1WocUgz7qCocq1Ja2zlaEZo1RM3o,23832
-pro_craft/prompt_helper_async.py,sha256=tvs2NywEqv_THvMpalu5PfewhhTm9wP89JqdKiKIUbU,25004
+pro_craft/prompt_helper_async.py,sha256=Hk4xr-5_l2ApUlSpuQj6uj6qJ8ISq8yuNvf19j8otao,26406
 pro_craft/server.py,sha256=fPAosQIU0d7gxICiALl8u6QwbLI4cawVFyoRYebRES0,2827
 pro_craft/utils.py,sha256=27A3CFhbRsEAP5GY6oxAz2M-beiIuPgCNSjQUyzOVW0,5685
 pro_craft/code_helper/coder.py,sha256=NXglF1KiPtGe4HZN0MZvFJ8p9Iyd5kzIt72DQGgRwXA,24715
@@ -17,7 +17,7 @@ pro_craft/server/mcp/math.py,sha256=OOzGXx64nK4bOVlu33PtVddcCQ9ilqA3Em9yxjSX9cg,
 pro_craft/server/mcp/resource.py,sha256=z94jP3qZofO-1lZCM3TuOfLajw41HARs1ojXab1ymas,776
 pro_craft/server/mcp/weather.py,sha256=RAGuf4sgjlTQSfRRZ1Fo18JnuMQRS_Db9p6AqBQrl8E,455
 pro_craft/server/router/recommended.py,sha256=IAZFdmb8HSl2_TOJeuv5uOKIX47XyX4p4sEwxG-0vt0,9968
-pro_craft-0.1.5.dist-info/METADATA,sha256=5k1tJo4_cu_HdDlHPGfnewUC50IlCl1HN495U5t5_rw,1768
-pro_craft-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pro_craft-0.1.5.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
-pro_craft-0.1.5.dist-info/RECORD,,
+pro_craft-0.1.7.dist-info/METADATA,sha256=dTEP9fECNy_xPQ1KsKnn5A8K3mzm5s3acltOqkjxZeQ,1768
+pro_craft-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pro_craft-0.1.7.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
+pro_craft-0.1.7.dist-info/RECORD,,