pro-craft 0.1.22__py3-none-any.whl → 0.1.36__py3-none-any.whl

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/prompt_craft/sync.py

@@ -22,6 +22,8 @@ BATCH_SIZE = 1000
 class IntellectRemoveFormatError(Exception):
     pass
 
+class IntellectRemoveError(Exception):
+    pass
 
 def slog(s, target: str = "target",logger = None):
     COLOR_GREEN = "\033[92m"
@@ -37,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}")
@@ -71,6 +73,7 @@ class Intel():
                 ):
         database_url = database_url or os.getenv("database_url")
         assert database_url
+        assert "aiomysql" not in database_url
         self.engine = create_engine(database_url, echo=False, # echo=True 仍然会打印所有执行的 SQL 语句
                                     pool_size=10,        # 连接池中保持的连接数
                                     max_overflow=20,     # 当pool_size不够时，允许临时创建的额外连接数
@@ -83,11 +86,10 @@ class Intel():
         
         if model_name in ["gemini-2.5-flash-preview-05-20-nothinking",]:
             self.llm = BianXieAdapter(model_name = model_name)
-        elif model_name in ["doubao-1-5-pro-256k-250115",]:
+        elif model_name in ["doubao-1-5-pro-256k-250115","doubao-1-5-pro-32k-250115"]:
             self.llm = ArkAdapter(model_name = model_name)
         else:
-            print('Use BianXieAdapter')
-            self.llm = BianXieAdapter()
+            raise Exception("error llm name")
         self.logger = logger or pro_craft_logger
         
     def _get_latest_prompt_version(self,target_prompt_id,session):
@@ -354,17 +356,28 @@ class Intel():
         # 查看是否已经存在
         with create_session(self.engine) as session:
             latest_prompt = self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
-
-            self.save_prompt_increment_version(prompt_id=latest_prompt.prompt_id,
-                                    new_prompt = latest_prompt.prompt,
-                                    use_case = latest_prompt.use_case,
-                                    action_type=action_type,
+               
+            if latest_prompt:
+                self.save_prompt_increment_version(prompt_id=latest_prompt.prompt_id,
+                                        new_prompt = latest_prompt.prompt,
+                                        use_case = latest_prompt.use_case,
+                                        action_type=action_type,
+                                        demand=demand,
+                                        score=latest_prompt.score,
+                                        session=session
+                                        )
+                
+                return "success"
+            else:
+                self.save_prompt_increment_version(prompt_id=prompt_id,
+                                    new_prompt = demand,
+                                    use_case = "init",
+                                    action_type="inference",
                                     demand=demand,
-                                    score=latest_prompt.score,
+                                    score=60,
                                     session=session
                                     )
-            
-            return "success"
+                return "init"
 
     def intellect_remove(self,
                     input_data: dict | str,
@@ -393,15 +406,7 @@ class Intel():
             result_obj = self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
 
             if result_obj is None:
-                self.save_prompt_increment_version(
-                    prompt_id = prompt_id,
-                    new_prompt = "做一些处理",
-                    use_case = input_,
-                    score = 60,
-                    session = session
-                )
-                ai_result = "初始化完成"
-                return ai_result
+                raise IntellectRemoveError("不存在的prompt_id")
             prompt = result_obj.prompt
             if result_obj.action_type == "inference":
                 # 直接推理即可

pro_craft/server/router/prompt.py

@@ -1,13 +1,15 @@
 
 
 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 实例。
 
     Args:
@@ -20,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(
@@ -32,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
@@ -41,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
             )
@@ -50,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.22.dist-info → pro_craft-0.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.22
+Version: 0.1.36
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -9,6 +9,7 @@ Requires-Dist: anyio>=4.11.0
 Requires-Dist: db-help>=0.2.2
 Requires-Dist: fastapi>=0.119.0
 Requires-Dist: llmada>=1.1.11
+Requires-Dist: plotly>=6.3.1
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: toml>=0.10.2
 Requires-Dist: utils-tool==0.1.3

pro_craft-0.1.36.dist-info/RECORD

@@ -0,0 +1,19 @@
+pro_craft/__init__.py,sha256=CkERhdDQyrPWpOb5nArMt2UCcX8STJLF7JC2x7yTBYM,515
+pro_craft/database.py,sha256=cbUcy4_e9RgcDVBNMvERNmTv_pZWgd4ox4a4drBWS6w,9310
+pro_craft/file_manager.py,sha256=abVAlJ07_egWNuTj4JiP4me8NloQrsXGNd-SP63ab94,3738
+pro_craft/log.py,sha256=EXrNt2kYYPdO3RSr79lpfr5nh0sxRSiYGmswl8-PAzo,3262
+pro_craft/utils.py,sha256=R1DFkS4dsm5dIhg8lLTgBBvItvIYyyojROdh-ykqiYk,5250
+pro_craft/code_helper/coder.py,sha256=L6pRQr0pYRIHrMFZ4-pO_tZf1koxgGgF3L7Vl-GIyjM,24687
+pro_craft/code_helper/designer.py,sha256=3gyCqrjcw61sHzDjUPKhL1LOAE8xWLLbNT8NlK2mFLc,4739
+pro_craft/prompt_craft/__init__.py,sha256=83ruWO1Oci-DWvdVhPqcQrgdZTNfbmK72VQCkWASk7A,80
+pro_craft/prompt_craft/async_.py,sha256=6IqV_2KYSFjS4rzHzoTbz0Sy6g9toJS5HHLs1EW2_E0,40469
+pro_craft/prompt_craft/new.py,sha256=ULjGGl95vmHrOs7XECJGlaqj1NE9BypE5WnFYhGugRY,25903
+pro_craft/prompt_craft/sync.py,sha256=4bms8Qvzq5QqgwHWwiyjrcl7hdkSqE7Kne5s3Ex8bBU,26217
+pro_craft/server/mcp/__init__.py,sha256=4dbl-lFcm0r2tkOP04OxqiZG2jR-rqF181qi2AfU6UA,123
+pro_craft/server/mcp/prompt.py,sha256=OZrsyUfSQMOY_KX7dWthW209adz5JfELsQ0ODfuQR44,1245
+pro_craft/server/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pro_craft/server/router/prompt.py,sha256=Wa4FfYRL6oeyA3F-79pmPeIH0Vo8wSEv7RH1lP6jXck,2907
+pro_craft-0.1.36.dist-info/METADATA,sha256=yjrUmXcrIENwRaz8POKuLPWkmCxi9xYKoxOzqWGjIoc,1718
+pro_craft-0.1.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pro_craft-0.1.36.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
+pro_craft-0.1.36.dist-info/RECORD,,

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
-
-
-
-
-

pro_craft-0.1.22.dist-info/RECORD

@@ -1,20 +0,0 @@
-pro_craft/__init__.py,sha256=KU9yexREoJVO5eyDNnOCzdYC8Bfo6p4Z45KWZTeO63U,698
-pro_craft/database.py,sha256=5dV-h9dVaS6euHLCtf0gYfq2pchl2QFdb2PEM4gTEU4,8740
-pro_craft/file_manager.py,sha256=93m3AkS6R88pJ5NBwaePyngM-YwSuiPh-9Sx7YPh3B8,3748
-pro_craft/log.py,sha256=x9RS_0LITN2SE8dcVaEcUFdcfr__jCYpFkIkVmqE5f0,3061
-pro_craft/utils.py,sha256=R1DFkS4dsm5dIhg8lLTgBBvItvIYyyojROdh-ykqiYk,5250
-pro_craft/code_helper/coder.py,sha256=L6pRQr0pYRIHrMFZ4-pO_tZf1koxgGgF3L7Vl-GIyjM,24687
-pro_craft/code_helper/designer.py,sha256=3gyCqrjcw61sHzDjUPKhL1LOAE8xWLLbNT8NlK2mFLc,4739
-pro_craft/prompt_craft/__init__.py,sha256=83ruWO1Oci-DWvdVhPqcQrgdZTNfbmK72VQCkWASk7A,80
-pro_craft/prompt_craft/async_.py,sha256=CzphO_1zrRpJ__7g5FnBWr7RonK0uwe8uMtV9qA65uY,29099
-pro_craft/prompt_craft/evals.py,sha256=XzaaQgA-Vgo8MNPYTdN0hyFJNmgTvw2jroWmeA02pBs,1847
-pro_craft/prompt_craft/new.py,sha256=cHugfhLNUMQk_l8JQBg5ZQXPYXqspexnCOgp3YUzoD0,25894
-pro_craft/prompt_craft/sync.py,sha256=-rY1KxAP5FhxI6Vmm2hHoLvYMmtL7rbLcFQMqD9g8ZU,25841
-pro_craft/server/mcp/__init__.py,sha256=4dbl-lFcm0r2tkOP04OxqiZG2jR-rqF181qi2AfU6UA,123
-pro_craft/server/mcp/prompt.py,sha256=OZrsyUfSQMOY_KX7dWthW209adz5JfELsQ0ODfuQR44,1245
-pro_craft/server/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pro_craft/server/router/prompt.py,sha256=ecf8kpVqPp7q_VTcUNej3MAzpO4oywgY7TAV7R6qaBw,2745
-pro_craft-0.1.22.dist-info/METADATA,sha256=zWNEnMPy98Uf1yuXtIujwtbnxTOYPULo6gHsmsrTOZk,1689
-pro_craft-0.1.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pro_craft-0.1.22.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
-pro_craft-0.1.22.dist-info/RECORD,,