pro-craft 0.1.36__tar.gz → 0.1.37__tar.gz

{pro_craft-0.1.36 → pro_craft-0.1.37}/PKG-INFO

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

{pro_craft-0.1.36 → pro_craft-0.1.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pro-craft"
-version = "0.1.36"
+version = "0.1.37"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"

{pro_craft-0.1.36 → pro_craft-0.1.37}/src/pro_craft/log.py

@@ -12,7 +12,7 @@ class Log:
     def __init__(self, console_level = logging.INFO, log_file_name="app.log"):
         self.Console_LOG_LEVEL = console_level
         self.log_file_name = log_file_name
-        os.makedirs("logs", exist_ok=False)
+        os.makedirs("logs", exist_ok=True)
         self.LOG_FILE_PATH = os.path.join("logs", log_file_name)
         self.logger = self.get_logger()
         self.super_log_level = self.logger.critical

{pro_craft-0.1.36 → pro_craft-0.1.37}/src/pro_craft/prompt_craft/async_.py

@@ -364,7 +364,7 @@ class AsyncIntel():
                                   session = session)
         for use_case_old in use_cases:
             if use_case == use_case_old.use_case:
-                print("用例已经存在")
+                # print("用例已经存在")
                 return 
         
         use_case = UseCase(prompt_id=prompt_id,
@@ -654,36 +654,34 @@ class AsyncIntel():
                     version=version,
                     inference_save_case=inference_save_case,
                 )
-
-        try:
-            json_str = extract_(ai_result,r'json')
-            ai_result = json.loads(json_str)
-            if OutputFormat:
-                OutputFormat(**ai_result)
-
-        except JSONDecodeError as e:
+        if OutputFormat:
             try:
-                self.logger.error(f"尝试补救")
-                json_str = fix_broken_json_string(json_str)
+                json_str = extract_(ai_result,r'json')
                 ai_result = json.loads(json_str)
-                if OutputFormat:
-                    OutputFormat(**ai_result)
+                OutputFormat(**ai_result)
 
             except JSONDecodeError as e:
-                raise IntellectRemoveFormatError(f"prompt_id: {prompt_id} 生成的内容为无法被Json解析 {e}") from e
-        
-        except ValidationError as e:
-            err_info = e.errors()[0]
-            raise IntellectRemoveFormatError(f"{err_info["type"]}: 属性:{err_info['loc']}, 发生了如下错误: {err_info['msg']}, 格式校验失败, 当前输入为: {err_info['input']} 请检查") from e
+                try:
+                    self.logger.error(f"尝试补救")
+                    json_str = fix_broken_json_string(json_str)
+                    ai_result = json.loads(json_str)
+                    OutputFormat(**ai_result)
 
-        except Exception as e:
-            raise Exception(f"Error {prompt_id} : {e}") from e
+                except JSONDecodeError as e:
+                    raise IntellectRemoveFormatError(f"prompt_id: {prompt_id} 生成的内容为无法被Json解析 {e}") from e
+            
+            except ValidationError as e:
+                err_info = e.errors()[0]
+                raise IntellectRemoveFormatError(f"{err_info["type"]}: 属性:{err_info['loc']}, 发生了如下错误: {err_info['msg']}, 格式校验失败, 当前输入为: {err_info['input']} 请检查") from e
+
+            except Exception as e:
+                raise Exception(f"Error {prompt_id} : {e}") from e
 
         return ai_result
     
     async def intellect_formats(self,
                     input_datas: list[dict | str],
-                    OutputFormat: object,
+                    OutputFormat: object | None,
                     prompt_id: str,
                     ExtraFormats: list[object] = [],
                     version: str = None,
@@ -719,8 +717,7 @@ class AsyncIntel():
                 # 修改逻辑
                 assert kwargs.get('input_data') # 要求一定要有data入参
                 input_data = kwargs.get('input_data')
-                assert kwargs.get('OutputFormat') # 要求一定要有data入参
-                OutputFormat = kwargs.get('OutputFormat')
+                OutputFormat = kwargs.get('OutputFormat','')
 
                 if isinstance(input_data,dict):
                     input_ = output_ = json.dumps(input_data,ensure_ascii=False)

{pro_craft-0.1.36 → pro_craft-0.1.37}/src/pro_craft.egg-info/PKG-INFO

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