pro-craft 0.1.37__py3-none-any.whl → 0.1.38__py3-none-any.whl

pro_craft/prompt_craft/async_.py

@@ -25,14 +25,14 @@ from datetime import datetime, timedelta
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
 from sqlalchemy import select, and_ # 引入 select 和 and_
 from sqlalchemy.orm import class_mapper # 用于检查对象是否是持久化的
-import tqdm
+
 from tqdm.asyncio import tqdm
 import pandas as pd
 import plotly.graph_objects as go
 from pro_craft import super_log
 
 BATCH_SIZE = int(os.getenv("DATABASE_SYNC_BATCH_SIZE",100))
-
+print(12)
 
 def fix_broken_json_string(broken_json_str):
     # 移除 BOM
@@ -642,7 +642,7 @@ class AsyncIntel():
 使用以下正则检出
 "```json([\s\S]*?)```"
 使用以下方式验证
-"""
+"""     
         if OutputFormat:
             output_format = base_format_prompt + "\n".join([inspect.getsource(outputformat) for outputformat in ExtraFormats]) + inspect.getsource(OutputFormat)
         else:
@@ -740,10 +740,12 @@ class AsyncIntel():
     async def intellect_format_eval(self,
                     OutputFormat: object,
                     prompt_id: str,
+                    database_url = None,
                     ExtraFormats: list[object] = [],
                     version: str = None,
                     MIN_SUCCESS_RATE = 80.0,
                     ConTent_Function = None,
+                    AConTent_Function = None,
                     ):
         """
         ConTent_Function: 
@@ -751,20 +753,32 @@ class AsyncIntel():
         # TODO llm 评价 eval
         """
         async with create_async_session(self.engine) as session:
-            use_cases = await self.get_use_case(target_prompt_id=prompt_id,session=session)
             prompt_result = await self.get_prompt_safe(prompt_id=prompt_id,
                                                                    session=session)
             if prompt_result is None:
                 raise IntellectRemoveError("不存在的prompt_id")
             if prompt_result.action_type != "inference":
                 raise IntellectRemoveError("请在inference模式下使用次类")
-            
+
+        if database_url:
+            eval_engine = create_async_engine(database_url, echo=False,
+                                pool_size=10,        # 连接池中保持的连接数
+                                max_overflow=20,     # 当pool_size不够时，允许临时创建的额外连接数
+                                pool_recycle=3600,   # 每小时回收一次连接
+                                pool_pre_ping=True,  # 使用前检查连接活性
+                                pool_timeout=30      # 等待连接池中连接的最长时间（秒）
+                                        )
+        else:
+            eval_engine = self.engine
+        async with create_async_session(eval_engine) as eval_session:
+            use_cases = await self.get_use_case(target_prompt_id=prompt_id,session=eval_session)
 
             total_assertions = len(use_cases)
             result_cases = []
 
             async def evals_func(use_case,prompt_id,OutputFormat,ExtraFormats,version):
                 try:
+
                     # 这里将参数传入
                     ai_result = await self.intellect_format(
                         input_data = use_case.use_case,
@@ -775,16 +789,25 @@ class AsyncIntel():
                         inference_save_case = False,
                     )
                     if ConTent_Function:
-                        ConTent_Function()
+                        ConTent_Function(ai_result)
+                    
+                    if AConTent_Function:
+                        await AConTent_Function(ai_result)
+
                     result_cases.append({"type":"Successful","case":use_case.use_case,"reply":f"pass"})
-                    use_case.output = ai_result
+                    use_case.output = json.dumps(ai_result,ensure_ascii=False,indent=4)
+
+
                 except IntellectRemoveFormatError as e:
                     result_cases.append({"type":"FAILED","case":use_case.use_case,"reply":f"{e}"})
                     use_case.output = f"{"FAILED"}-{e}"
+                    use_case.faired_time +=1
+
                 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()
+                    use_case.faired_time +=1
+
 
             tasks = []
             for use_case in use_cases:
@@ -800,6 +823,7 @@ class AsyncIntel():
             await tqdm.gather(*tasks,total=len(tasks))
             # await asyncio.gather(*tasks, return_exceptions=False)
 
+            await eval_session.commit()
 
             successful_assertions = 0
             bad_case = []
@@ -818,7 +842,7 @@ class AsyncIntel():
 
 
 
-    def draw_data(self):
+    def draw_data(self,save_html_path):
         df = self.eval_df
         # --- 可视化部分 ---
         fig = go.Figure()
@@ -899,18 +923,20 @@ class AsyncIntel():
         )
 
         fig.show()
-        pass
+        if save_html_path:
+            fig.write_html(save_html_path)
 
-    async def _evals(self,prompt_id, OutputFormat, ExtraFormats_list = [],**kwargs):
+    async def _evals(self,prompt_id, OutputFormat, ExtraFormats_list = [],database_url = None,**kwargs):
         
         status,score, total, bad_case = await self.intellect_format_eval(
             prompt_id=prompt_id,
             OutputFormat = OutputFormat,
             ExtraFormats = ExtraFormats_list,
             version = None,
+            database_url = database_url,
             **kwargs
         )
-        self.df.loc[len(self.df)] = {"name":prompt_id,
+        self.eval_df.loc[len(self.eval_df)] = {"name":prompt_id,
                            'status':status,"score":score,
                            "total":total,"bad_case":bad_case}
 

pro_craft/server/router/models.py

@@ -0,0 +1,35 @@
+from typing import Dict, Any, Optional, List
+from pydantic import BaseModel, Field, model_validator, field_validator, RootModel
+import re
+
+class PushOrderRequest(BaseModel):
+    demand: str = Field(None, description="信息")
+    prompt_id: str = Field(..., description="提示词id")
+    action_type: str = Field(..., description="执行动作",min_length=1, max_length=10)
+
+    @field_validator('action_type')
+    @classmethod
+    def validate_action_type(cls, v: str) -> str:
+        if v in ['train','inference','summary','finetune','patch']:
+            return v
+        else:
+            raise ValueError(f"无效action_type: {v}")
+
+class GetPromptRequest(BaseModel):
+    prompt_id: str = Field(..., description="提示词id")
+
+class UpdatePromptRequest(BaseModel):
+    prompt_id: str = Field(..., description="提示词id")
+    prompt: str = Field(..., description="新的提示词")
+
+class RollBackPromptRequest(BaseModel):
+    prompt_id: str = Field(..., description="提示词id")
+    version: str = Field(..., description="版本号")
+
+class SyncDataBaseRequest(BaseModel):
+    slave_database_url: str = Field(None, description="从属数据库url")
+    
+
+class PromptResponse(BaseModel):
+    msg: str = Field(..., description="信息")
+    content: str = None

pro_craft/server/router/prompt.py

@@ -3,6 +3,7 @@
 from fastapi import APIRouter
 from pro_craft import Intel,AsyncIntel
 from pro_craft.utils import create_async_session
+from .models import *
 
 def create_router(database_url: str,
                   slave_database_url: str,
@@ -32,49 +33,100 @@ def create_router(database_url: str,
         tags=["prompt"] # 这里使用 Depends 确保每次请求都验证
     )
 
-    @router.get("/push_order",
-                description="可选 train,inference,summary,finetune,patch",)
-    async def push_order(demand: str, prompt_id: str, action_type: str = "train"):
+    # 自动修改
+    @router.post("/push_order",
+                description="可选 train,inference,summary,finetune,patch",
+                response_model=PromptResponse,
+                )
+    async def push_order(request: PushOrderRequest):
         result = await intels.push_action_order(
-            demand=demand,
-            prompt_id=prompt_id,
-            action_type=action_type
+            demand=request.demand,
+            prompt_id=request.prompt_id,
+            action_type=request.action_type
         )
-        return {"message": "success", "result": result}
+        return PromptResponse(msg = "success",content=result)
 
-    @router.get("/get_latest_prompt")
-    async def get_latest_prompt(prompt_id: str):
+    # 人为干预
+
+    @router.get("/registered_prompt",
+                description="获取以注册的提示词",
+                response_model=PromptResponse)
+    async def get_prompt():
+        result = ["memorycard-format",
+        "memorycard-polish",
+        "memorycard-merge",
+        "memorycard-score",
+        "memorycard-generate-content",
+        "user-overview",
+        "user-relationship-extraction",
+        "avatar-brief",
+        "avatar-personality-extraction",
+        "avatar-desensitization",
+        "biograph-free-writer",
+        "biograph-paid-title",
+        "biograph-outline",
+        "biograph-brief",
+        "biograph-extract-person-name",
+        "biograph-extract-place",
+        "biograph-extract-material",
+        "biograph-writer"]
+        
+        return PromptResponse(msg = "success",content=result)
+
+    @router.post("/get_prompt",
+                description="获得现行提示词",
+                response_model=PromptResponse)
+    async def get_prompt(request: GetPromptRequest):
         async with create_async_session(intels.engine) as session:
-            result = await intels.get_prompts_from_sql(
-                prompt_id=prompt_id,
+            result = await intels.get_prompt_safe(
+                prompt_id=request.prompt_id,
                 session=session
             )
-        return {"message": "success", "result": result}
-
-    @router.get("/sync_database")
-    async def sync_database():
-        result = await intels.sync_prompt_data_to_database(slave_database_url)
-        return {"message": "success","result":result}
+        return PromptResponse(msg = "success",content=result)
     
+    @router.post("/update_prompt",
+                description="更新现行提示词",
+                response_model=PromptResponse)
+    async def update_prompt(request: UpdatePromptRequest):
+        async with create_async_session(intels.engine) as session:
+            await intels.save_prompt(
+                            prompt_id = request.prompt_id,
+                            new_prompt = request.prompt,
+                            use_case = "",
+                            action_type = "inference",
+                            demand = "上传",
+                            score = 70,
+                            session = session)
+        return PromptResponse(msg = "success",content=None)
 
-    @router.get("/roll_back")
-    async def roll_back(prompt_id:str,version:str):
+    @router.post("/rollback_prompt",
+                description="回滚现行提示词",
+                response_model=PromptResponse)
+    async def roll_back(request: RollBackPromptRequest):
         async with create_async_session(intels.engine) as session:
-            result = await intels.get_prompts_from_sql(
-                prompt_id=prompt_id,
-                version = version,
+            result = await intels.get_prompt_safe(
+                prompt_id=request.prompt_id,
+                version = request.version,
                 session=session
             )
-            assert result.version == version
-            await intels.save_prompt_increment_version(
-                            prompt_id = prompt_id,
+            assert result.version == request.version
+            await intels.save_prompt(
+                            prompt_id = request.prompt_id,
                             new_prompt = result.prompt,
                             use_case = result.use_case,
                             action_type = "inference",
                             demand = "",
                             score = 61,
                             session = session)
-        return {"message": "success"}
+        return PromptResponse(msg = "success",content=None)
+
+    #系统级别服务
     
+    @router.post("/sync_database")
+    async def sync_database(request: SyncDataBaseRequest):
+        slave_database_url = request.slave_database_url or slave_database_url
+        result = await intels.sync_production_database(slave_database_url)
+        return PromptResponse(msg = "success",content=result)
+
     return router
 

{pro_craft-0.1.37.dist-info → pro_craft-0.1.38.dist-info}/METADATA

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

{pro_craft-0.1.37.dist-info → pro_craft-0.1.38.dist-info}/RECORD

@@ -6,14 +6,15 @@ 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=orxKDtxZSrx3uqHCOijqFcX2-436Cz2eakG03m33C9M,40426
+pro_craft/prompt_craft/async_.py,sha256=bPQNottHtgfvUSPTBS7rw0Gvy3d0XQT1ffNiLPgWNDw,41653
 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.37.dist-info/METADATA,sha256=r2xyJiA_x6zoAv-GhhXVi6IG-V-Vt_YOJkpuN7Du-l0,1718
-pro_craft-0.1.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pro_craft-0.1.37.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
-pro_craft-0.1.37.dist-info/RECORD,,
+pro_craft/server/router/models.py,sha256=0QlohI7aSVjYjMdXK9Rq19Dp7b2LnjLKIiArDzI1ufg,1272
+pro_craft/server/router/prompt.py,sha256=muayKf9oHsFQpNE_ZBPflACv4QQhKbiS5vIREmeV-lg,4952
+pro_craft-0.1.38.dist-info/METADATA,sha256=IMRCNvx1yYSjx1Mb-glmdiAH8Z-OOVgsSdKaIHPaZnI,1718
+pro_craft-0.1.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pro_craft-0.1.38.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
+pro_craft-0.1.38.dist-info/RECORD,,