pro-craft 0.1.24__tar.gz → 0.1.26__tar.gz

{pro_craft-0.1.24 → pro_craft-0.1.26}/PKG-INFO

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

{pro_craft-0.1.24 → pro_craft-0.1.26}/pyproject.toml

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

{pro_craft-0.1.24 → pro_craft-0.1.26}/src/pro_craft/database.py

@@ -72,7 +72,7 @@ PromptBase = declarative_base()
 
 class SyncMetadata(PromptBase):
     """用于存储同步元数据的表模型"""
-    __tablename__ = "sync_metadata"
+    __tablename__ = "ai_sync_metadata"
     id = Column(Integer, primary_key=True, autoincrement=True)
     last_sync_time = Column(DateTime, default=datetime(1970, 1, 1))
     table_name = Column(String(255), unique=True)
@@ -80,9 +80,8 @@ class SyncMetadata(PromptBase):
     def __repr__(self):
         return f"<SyncMetadata(table_name='{self.table_name}', last_sync_time='{self.last_sync_time}')>"
 
-
 class Prompt(PromptBase):
-    __tablename__ = 'prompts_table' # 数据库中的表名，你可以改成你希望的名字
+    __tablename__ = 'ai_prompts' # 数据库中的表名，你可以改成你希望的名字
     # __tablename__ = 'llm_prompt' # 数据库中的表名，你可以改成你希望的名字
 
     # 定义联合唯一约束
@@ -177,9 +176,8 @@ class Prompt(PromptBase):
                 f"is_deleted='{self.is_deleted}...'>"
                 )
 
-
 class UseCase(PromptBase):
-    __tablename__ = 'usecase' # 数据库中的表名，你可以改成你希望的名字
+    __tablename__ = 'ai_usecase' # 数据库中的表名，你可以改成你希望的名字
 
     # id (int, primary_key=True, autoincrement=True)
     # 你的属性表中 id 为 int, true (not null), true (primary key), 0 (length), ASC (key order), true (auto increment)

{pro_craft-0.1.24 → pro_craft-0.1.26}/src/pro_craft/prompt_craft/async_.py

@@ -34,6 +34,8 @@ class IntellectRemoveError(Exception):
     pass
 
 BATCH_SIZE = 100
+MIN_SUCCESS_RATE = 00.0 # 这里定义通过阈值, 高于该比例则通过
+
 
 def slog(s, target: str = "target",logger = None):
     COLOR_GREEN = "\033[92m"
@@ -94,7 +96,7 @@ async def get_last_sync_time(target_session: AsyncSession) -> datetime:
     """从目标数据库获取上次同步时间"""
     # 修正点：使用 select() 和 execute()
     result = await target_session.execute(
-        select(SyncMetadata).filter_by(table_name="sync_metadata")
+        select(SyncMetadata).filter_by(table_name="ai_sync_metadata")
     )
     metadata_entry = result.scalar_one_or_none() # 获取单个对象或 None
 
@@ -110,7 +112,7 @@ async def update_last_sync_time(target_session: AsyncSession, new_sync_time: dat
     """更新目标数据库的上次同步时间"""
     # 修正点：使用 select() 和 execute()
     result = await target_session.execute(
-        select(SyncMetadata).filter_by(table_name="sync_metadata")
+        select(SyncMetadata).filter_by(table_name="ai_sync_metadata")
     )
     metadata_entry = result.scalar_one_or_none()
 
@@ -118,7 +120,7 @@ async def update_last_sync_time(target_session: AsyncSession, new_sync_time: dat
         metadata_entry.last_sync_time = new_sync_time
     else:
         # 如果不存在，则创建
-        new_metadata = SyncMetadata(table_name="sync_metadata", last_sync_time=new_sync_time)
+        new_metadata = SyncMetadata(table_name="ai_sync_metadata", last_sync_time=new_sync_time)
         target_session.add(new_metadata)
     
     # 异步提交事务
@@ -128,6 +130,8 @@ async def update_last_sync_time(target_session: AsyncSession, new_sync_time: dat
 
 
 
+
+
 class IntellectType(Enum):
     train = "train"
     inference = "inference"
@@ -364,6 +368,21 @@ class AsyncIntel():
         session.add(prompt1)
         await session.commit() # 提交事务，将数据写入数据库
 
+    async def get_use_case_by_sql(self,
+                             target_prompt_id: str,
+                             session = None
+                            ):
+        """
+        从sql保存提示词
+        """
+        stmt = select(UseCase).filter(UseCase.is_deleted == 0,
+                                      UseCase.prompt_id == target_prompt_id)
+        
+        result = await session.execute(stmt)
+        # use_case = result.scalars().one_or_none()
+        use_case = result.scalars().all()
+        return use_case
+
     async def save_use_case_by_sql(self,
                              prompt_id: str,
                              use_case:str = "",
@@ -374,6 +393,8 @@ class AsyncIntel():
         """
         从sql保存提示词
         """
+        #TODO 存之前保证数据库中相同的prompt_id中没有重复的use_case
+
         use_case = UseCase(prompt_id=prompt_id, 
                         use_case = use_case,
                         output = output,
@@ -496,10 +517,6 @@ class AsyncIntel():
                 return "init"
 
 
-            
-            
-
-
 
     async def intellect_remove(self,
                     input_data: dict | str,
@@ -793,7 +810,6 @@ class AsyncIntel():
                 )
 
         try:
-
             json_str = extract_(ai_result,r'json')
             # json_str = fix_broken_json_string(json_str)
             ai_result = json.loads(json_str)
@@ -808,7 +824,7 @@ class AsyncIntel():
                 OutputFormat(**ai_result)
 
             except JSONDecodeError as e:
-                raise IntellectRemoveFormatError(f"prompt_id: {prompt_id} 在生成后做json解析时报错") from e
+                raise IntellectRemoveFormatError(f"prompt_id: {prompt_id} 生成的内容为无法被Json解析 {e}") from e
         
         except ValidationError as e:
             err_info = e.errors()[0]
@@ -849,7 +865,6 @@ class AsyncIntel():
             )
         results = await asyncio.gather(*tasks, return_exceptions=False)
         return results
-
     
     def intellect_remove_warp(self,prompt_id: str):
         def outer_packing(func):
@@ -878,3 +893,90 @@ class AsyncIntel():
                 return result
             return wrapper
         return outer_packing
+
+    async def intellect_remove_format_eval(self,
+                    OutputFormat: object,
+                    prompt_id: str,
+                    ExtraFormats: list[object] = [],
+                    version: str = None,
+                    ):
+        
+        async with create_async_session(self.engine) as session:
+            use_cases = await self.get_use_case_by_sql(target_prompt_id=prompt_id,session=session)
+            prompt_result = await self.get_prompts_from_sql(prompt_id=prompt_id,
+                                                                   session=session)
+            if prompt_result is None:
+                raise IntellectRemoveError("不存在的prompt_id")
+            if prompt_result.action_type != "inference":
+                raise IntellectRemoveError("请在inference模式下使用次类")
+            
+
+            total_assertions = len(use_cases)
+            result_cases = []
+
+            async def evals_func(use_case,prompt_id,OutputFormat,ExtraFormats,version):
+                try:
+                    # 这里将参数传入
+                    await self.intellect_remove_format(
+                        input_data = use_case.use_case,
+                        prompt_id = prompt_id,
+                        OutputFormat = OutputFormat,
+                        ExtraFormats = ExtraFormats,
+                        version = version,
+                        inference_save_case = False,
+                    )
+                    # TODO base_eval
+                    # TODO 人类评价 eval
+                    # TODO llm 评价 eval
+                    result_cases.append({"type":"Successful","case":use_case.use_case,"reply":f"pass"})
+                    use_case.output = "Successful"
+                except IntellectRemoveFormatError as e:
+                    result_cases.append({"type":"FAILED","case":use_case.use_case,"reply":f"{e}"})
+                    use_case.output = f"{"FAILED"}-{e}"
+                except Exception as e: # 捕获其他可能的错误
+                    result_cases.append({"type":"FAILED","case":use_case.use_case,"reply":f"Exp {e}"})
+                    use_case.output = f"{"FAILED"}-{e}"
+                    await session.commit()
+
+            tasks = []
+            for use_case in use_cases:
+                tasks.append(
+                    evals_func(
+                        use_case = use_case,
+                        prompt_id = prompt_id,
+                        OutputFormat = OutputFormat,
+                        ExtraFormats = ExtraFormats,
+                        version = version
+                    )
+                )
+            await asyncio.gather(*tasks, return_exceptions=False)
+
+
+            successful_assertions = 0
+            bad_case = []
+            for i in result_cases:
+                if i['type'] == "Successful":
+                    successful_assertions += 1
+                else:
+                    bad_case.append(i)
+
+            success_rate = (successful_assertions / total_assertions) * 100
+            print(f"\n--- Aggregated Results ---")
+            print(f"Total test cases: {total_assertions}")
+            print(f"Successful cases: {successful_assertions}")
+            print(f"Success Rate: {success_rate:.2f}%")
+
+            # if success_rate >= MIN_SUCCESS_RATE:
+            #     return "通过", json.dumps(result_cases,ensure_ascii=False)
+            # else:
+            #     return "未通过",json.dumps(result_cases,ensure_ascii=False)
+
+            print(bad_case)
+
+            
+            # return results
+
+
+
+
+# 整体测试d, 测试未通过d, 大模型调整再测试, 依旧不通过, 大模型裂变, 仍不通过, 互换人力

{pro_craft-0.1.24 → pro_craft-0.1.26}/src/pro_craft/prompt_craft/new.py

@@ -37,19 +37,19 @@ def slog(s, target: str = "target",logger = None):
 
 def get_last_sync_time(target_session) -> datetime:
     """从目标数据库获取上次同步时间"""
-    metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="sync_metadata").first()
+    metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="ai_sync_metadata").first()
     if metadata_entry:
         return metadata_entry.last_sync_time
     return datetime(1970, 1, 1) # 默认一个很早的时间
 
 def update_last_sync_time(target_session, new_sync_time: datetime):
     """更新目标数据库的上次同步时间"""
-    metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="sync_metadata").first()
+    metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="ai_sync_metadata").first()
     if metadata_entry:
         metadata_entry.last_sync_time = new_sync_time
     else:
         # 如果不存在，则创建
-        new_metadata = SyncMetadata(table_name="sync_metadata", last_sync_time=new_sync_time)
+        new_metadata = SyncMetadata(table_name="ai_sync_metadata", last_sync_time=new_sync_time)
         target_session.add(new_metadata)
     target_session.commit()
     print(f"Updated last sync time to: {new_sync_time}")

{pro_craft-0.1.24 → pro_craft-0.1.26}/src/pro_craft/prompt_craft/sync.py

@@ -39,19 +39,19 @@ def slog(s, target: str = "target",logger = None):
 
 def get_last_sync_time(target_session) -> datetime:
     """从目标数据库获取上次同步时间"""
-    metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="sync_metadata").first()
+    metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="ai_sync_metadata").first()
     if metadata_entry:
         return metadata_entry.last_sync_time
     return datetime(1970, 1, 1) # 默认一个很早的时间
 
 def update_last_sync_time(target_session, new_sync_time: datetime):
     """更新目标数据库的上次同步时间"""
-    metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="sync_metadata").first()
+    metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="ai_sync_metadata").first()
     if metadata_entry:
         metadata_entry.last_sync_time = new_sync_time
     else:
         # 如果不存在，则创建
-        new_metadata = SyncMetadata(table_name="sync_metadata", last_sync_time=new_sync_time)
+        new_metadata = SyncMetadata(table_name="ai_sync_metadata", last_sync_time=new_sync_time)
         target_session.add(new_metadata)
     target_session.commit()
     print(f"Updated last sync time to: {new_sync_time}")

{pro_craft-0.1.24 → pro_craft-0.1.26}/src/pro_craft/server/router/prompt.py

@@ -1,12 +1,13 @@
 
 
 from fastapi import APIRouter
-from pro_craft import Intel
-from pro_craft.utils import create_session
+from pro_craft import Intel,AsyncIntel
+from pro_craft.utils import create_async_session
 
 def create_router(database_url: str,
                   slave_database_url: str,
-                  model_name: str):
+                  model_name: str,
+                  logger = None):
     """
     # TODO 整理改为异步
     创建一个包含 ProCraft 路由的 FastAPI APIRouter 实例。
@@ -21,9 +22,10 @@ def create_router(database_url: str,
         APIRouter: 配置好的 FastAPI APIRouter 实例。
     """
 
-    intels = Intel(
+    intels = AsyncIntel(
         database_url=database_url,
-        model_name=model_name
+        model_name=model_name,
+        logger=logger
         )
 
     router = APIRouter(
@@ -33,7 +35,7 @@ def create_router(database_url: str,
     @router.get("/push_order",
                 description="可选 train,inference,summary,finetune,patch",)
     async def push_order(demand: str, prompt_id: str, action_type: str = "train"):
-        result = intels.push_action_order(
+        result = await intels.push_action_order(
             demand=demand,
             prompt_id=prompt_id,
             action_type=action_type
@@ -42,8 +44,8 @@ def create_router(database_url: str,
 
     @router.get("/get_latest_prompt")
     async def get_latest_prompt(prompt_id: str):
-        with create_session(intels.engine) as session:
-            result = intels.get_prompts_from_sql(
+        async with create_async_session(intels.engine) as session:
+            result = await intels.get_prompts_from_sql(
                 prompt_id=prompt_id,
                 session=session
             )
@@ -51,20 +53,20 @@ def create_router(database_url: str,
 
     @router.get("/sync_database")
     async def sync_database():
-        result = intels.sync_prompt_data_to_database(slave_database_url)
+        result = await intels.sync_prompt_data_to_database(slave_database_url)
         return {"message": "success","result":result}
     
 
     @router.get("/roll_back")
     async def roll_back(prompt_id:str,version:str):
-        with create_session(intels.engine) as session:
-            result = intels.get_prompts_from_sql(
+        async with create_async_session(intels.engine) as session:
+            result = await intels.get_prompts_from_sql(
                 prompt_id=prompt_id,
                 version = version,
                 session=session
             )
             assert result.version == version
-            intels.save_prompt_increment_version(
+            await intels.save_prompt_increment_version(
                             prompt_id = prompt_id,
                             new_prompt = result.prompt,
                             use_case = result.use_case,

{pro_craft-0.1.24 → pro_craft-0.1.26}/src/pro_craft.egg-info/PKG-INFO

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

{pro_craft-0.1.24 → pro_craft-0.1.26}/src/pro_craft.egg-info/SOURCES.txt

@@ -14,7 +14,6 @@ src/pro_craft/code_helper/coder.py
 src/pro_craft/code_helper/designer.py
 src/pro_craft/prompt_craft/__init__.py
 src/pro_craft/prompt_craft/async_.py
-src/pro_craft/prompt_craft/evals.py
 src/pro_craft/prompt_craft/new.py
 src/pro_craft/prompt_craft/sync.py
 src/pro_craft/server/mcp/__init__.py

pro_craft-0.1.24/src/pro_craft/prompt_craft/evals.py

@@ -1,61 +0,0 @@
-
-import json
-
-
-############evals##############
-
- # 异步
-class Base_Evals():
-    def __init__(self):
-        """
-        # TODO 2 自动优化prompt 并提升稳定性, 并测试
-        通过重写继承来使用它
-        """
-        self.MIN_SUCCESS_RATE = 00.0 # 这里定义通过阈值, 高于该比例则通过
-
-
-    async def _assert_eval_function(self,params):
-        #这里定义函数的评价体系
-        print(params,'params')
-
-    async def get_success_rate(self,test_cases:list[tuple]):
-        """
-                # 这里定义数据
-
-        """
-
-        successful_assertions = 0
-        total_assertions = len(test_cases)
-        result_cases = []
-
-        for i, params in enumerate(test_cases):
-            try:
-                # 这里将参数传入
-                await self._assert_eval_function(params)
-                successful_assertions += 1
-                result_cases.append({"type":"Successful","--input--":params,"evaluate_info":f"满足要求"})
-            except AssertionError as e:
-                result_cases.append({"type":"FAILED","--input--":params,"evaluate_info":f"ERROR {e}"})
-            except Exception as e: # 捕获其他可能的错误
-                result_cases.append({"type":"FAILED","--input--":params,"evaluate_info":f"ERROR {e}"})
-
-
-        success_rate = (successful_assertions / total_assertions) * 100
-        print(f"\n--- Aggregated Results ---")
-        print(f"Total test cases: {total_assertions}")
-        print(f"Successful cases: {successful_assertions}")
-        print(f"Success Rate: {success_rate:.2f}%")
-
-        if success_rate >= self.MIN_SUCCESS_RATE:
-            return "通过", json.dumps(result_cases,ensure_ascii=False)
-        else:
-            return "未通过",json.dumps(result_cases,ensure_ascii=False)
-
-
-    def global_evals():
-        pass
-
-
-
-
-