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

pro_craft/database.py

@@ -1,5 +1,5 @@
 
-from sqlalchemy import Column, Integer, String, Text, DateTime, text, UniqueConstraint, Boolean, func
+from sqlalchemy import Column, Integer, String, Text, DateTime, text, UniqueConstraint, Boolean, func, Float
 from sqlalchemy.orm import declarative_base
 
 from datetime import datetime, timedelta
@@ -248,3 +248,72 @@ class UseCase(PromptBase):
                 f"is_deleted='{self.is_deleted}...'>")
 
 
+class EvalsInfo(PromptBase):
+    __tablename__ = 'ai_evals' # 数据库中的表名，你可以改成你希望的名字
+
+    # __table_args__ = (
+    #     UniqueConstraint('prompt_id', 'use_case', name='_prompt_id_version_uc'),
+    #     # 'name' 参数是可选的，用于给数据库中的约束指定一个名称，方便管理和调试
+    # )
+
+    # id (int, primary_key=True, autoincrement=True)
+    # 你的属性表中 id 为 int, true (not null), true (primary key), 0 (length), ASC (key order), true (auto increment)
+    id = Column(
+        Integer,
+        primary_key=True,
+        autoincrement=True, # 自动递增
+        nullable=False,     # 不能为空
+        comment="Primary key ID"
+    )
+
+    # prompt_id (varchar 255, not null, unique)
+    # 你的属性表中 prompt_id 为 varchar, 255 (length), true (not null)
+    prompt_id = Column(
+        String(255),        # VARCHAR 类型，长度 255
+        nullable=False,     # 不能为空    # 必须是唯一的，这会创建唯一索引
+        comment="Unique identifier for the prompt"
+    )
+    status = Column(
+        String(255),        # VARCHAR 类型，长度 255
+        nullable=False,     # 不能为空    # 必须是唯一的，这会创建唯一索引
+        comment="通过/未通过"
+    )
+
+    score = Column(
+        Float,
+        nullable=False,     # 不能为空
+        comment="失败次数"
+    )
+
+    total = Column(
+        Integer,
+        nullable=False,     # 不能为空
+        comment="失败次数"
+    )
+
+    # prompt (text, not null)
+    # 你的属性表中 prompt 为 text, true (not null)
+    bad_case = Column(
+        Text,               # TEXT 类型，适用于长文本
+        nullable=False,     # 不能为空
+        comment="用例"
+    )
+
+    timestamp = Column(
+        DateTime,
+        nullable=False,      # 不能为空
+        server_default=text('CURRENT_TIMESTAMP'),
+        onupdate=text('CURRENT_TIMESTAMP'),
+        comment="时间戳"
+    )
+
+
+    is_deleted = Column(Boolean, default=False, server_default=text('0')) 
+
+    # 定义 __repr__ 方法以便打印对象时有清晰的表示
+    def __repr__(self):
+        return (f"<Prompt(id={self.id}, prompt_id='{self.prompt_id}', "
+                f"status='{self.status}...', score='{self.score}')>"
+                f"total='{self.total}...', score='{self.score}')>"
+                f"is_deleted='{self.is_deleted}...'>")
+

pro_craft/prompt_craft/async_.py

@@ -421,6 +421,10 @@ class AsyncIntel():
                     inference_save_case = True,
                     change_case = False,
                     ):
+        """
+        自定自动化执行命令的方法, 
+        不涉及严格的校验, 主要职能在自动化的修改提示词, 或者管理提示词上
+        """
         if isinstance(input_data,dict):
             input_ = json.dumps(input_data,ensure_ascii=False)
         elif isinstance(input_data,str):
@@ -634,7 +638,16 @@ class AsyncIntel():
                     ExtraFormats: list[object] = [],
                     version: str = None,
                     inference_save_case = True,
+                    ConTent_Function = None,
+                    AConTent_Function = None,
                     ):
+        """
+        这个format 是严格校验模式, 是interllect 的增强版, 会主动校验内容,并及时抛出异常(或者伺机修正)
+        ConTent_Function
+        AConTent_Function
+        两种方式的传入方式, 内容未通过就抛出异常
+
+        """
                 
         base_format_prompt = """
 按照一定格式输出, 以便可以通过如下校验
@@ -676,6 +689,12 @@ class AsyncIntel():
 
             except Exception as e:
                 raise Exception(f"Error {prompt_id} : {e}") from e
+            
+        if ConTent_Function:
+            ConTent_Function(ai_result)
+        
+        if AConTent_Function:
+            await AConTent_Function(ai_result)
 
         return ai_result
     
@@ -686,6 +705,7 @@ class AsyncIntel():
                     ExtraFormats: list[object] = [],
                     version: str = None,
                     inference_save_case = True,
+                    **kwargs,
                     ):
                 
         async with create_async_session(self.engine) as session:
@@ -705,6 +725,7 @@ class AsyncIntel():
                     ExtraFormats = ExtraFormats,
                     version = version,
                     inference_save_case = inference_save_case,
+                    **kwargs,
                 )
             )
         results = await asyncio.gather(*tasks, return_exceptions=False)
@@ -717,8 +738,7 @@ class AsyncIntel():
                 # 修改逻辑
                 assert kwargs.get('input_data') # 要求一定要有data入参
                 input_data = kwargs.get('input_data')
-                OutputFormat = kwargs.get('OutputFormat','')
-
+                kwargs.pop(input_data)
                 if isinstance(input_data,dict):
                     input_ = output_ = json.dumps(input_data,ensure_ascii=False)
                 elif isinstance(input_data,str):
@@ -727,7 +747,8 @@ class AsyncIntel():
                 output_ = await self.intellect_format(
                         input_data = input_data,
                         prompt_id = prompt_id,
-                        OutputFormat = OutputFormat,
+                        **kwargs,
+                        
                 )
 
                 #######
@@ -787,12 +808,9 @@ class AsyncIntel():
                         ExtraFormats = ExtraFormats,
                         version = version,
                         inference_save_case = False,
+                        ConTent_Function = ConTent_Function,
+                        AConTent_Function = AConTent_Function,
                     )
-                    if 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 = json.dumps(ai_result,ensure_ascii=False,indent=4)
@@ -835,13 +853,22 @@ class AsyncIntel():
 
             success_rate = (successful_assertions / total_assertions) * 100
 
+
             if success_rate >= MIN_SUCCESS_RATE:
+                self.eval_df.loc[len(self.eval_df)] = {"name":prompt_id,
+                                                   'status':"通过",
+                                                   "score":success_rate,
+                                                   "total":str(total_assertions),
+                                                   "bad_case":json.dumps(bad_case,ensure_ascii=False)}
                 return "通过", success_rate, str(total_assertions), json.dumps(bad_case,ensure_ascii=False),
             else:
+                self.eval_df.loc[len(self.eval_df)] = {"name":prompt_id,
+                                                   'status':"未通过",
+                                                   "score":success_rate,
+                                                   "total":str(total_assertions),
+                                                   "bad_case":json.dumps(bad_case,ensure_ascii=False)}
                 return "未通过",success_rate, str(total_assertions), json.dumps(bad_case,ensure_ascii=False),
 
-
-
     def draw_data(self,save_html_path):
         df = self.eval_df
         # --- 可视化部分 ---
@@ -926,18 +953,5 @@ class AsyncIntel():
         if save_html_path:
             fig.write_html(save_html_path)
 
-    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.eval_df.loc[len(self.eval_df)] = {"name":prompt_id,
-                           'status':status,"score":score,
-                           "total":total,"bad_case":bad_case}
 
 # 整体测试d, 测试未通过d, 大模型调整再测试, 依旧不通过, 大模型裂变, 仍不通过, 互换人力

pro_craft/server/mcp/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/mcp/prompt.py

@@ -1,44 +1,77 @@
 from mcp.server.fastmcp import FastMCP
 
-from pro_craft import Intel
+from pro_craft import Intel,AsyncIntel
+from .models import *
 
 def create_mcp(database_url: str,
                   slave_database_url: str,
-                  model_name: str):
+                  model_name: str,
+                  logger = None):
     # region MCP Weather
-    mcp = FastMCP("PromptManager")
+    mcp = FastMCP("Prompt")
 
-    intels = Intel(
+    intels = AsyncIntel(
         database_url=database_url,
-        model_name=model_name
+        model_name=model_name,
+        logger=logger
         )
 
     @mcp.tool()
-    def push_order(demand: str, prompt_id: str, action_type: str = "train") -> str:
-        result = intels.push_action_order(
-            demand=demand,
-            prompt_id=prompt_id,
-            action_type=action_type
-        )
-        return {"message": "success", "result": result}
-
-    @mcp.tool()
-    def get_latest_prompt(prompt_id: str) -> str:
-        with create_session(intels.engine) as session:
-            result = intels.get_prompts_from_sql(
+    async def push_order(demand: str, prompt_id: str, action_type: str):
+        """
+        希望大模型进行哪种模式的调整
+        demand: str = Field(None, description="信息")
+        prompt_id: str = Field(..., description="提示词id")
+        action_type: str = Field(..., description="执行动作",min_length=1, max_length=10)
+        """
+        try:
+            PushOrderRequest(demand=demand,prompt_id=prompt_id,action_type=action_type)
+            result = await intels.push_action_order(
+                demand=demand,
                 prompt_id=prompt_id,
-                session=session
+                action_type=action_type
             )
-        return {"message": "success", "result": result}
+            return PromptResponse(msg = "success",content=result)
+        except Exception as e:
+            return f"Error : {e}"
+        
+    @mcp.tool()
+    async def get_registered_prompt():
+        "获取以注册的可修改的提示词id"
+        try:
+            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)
+        except Exception as e:
+            return f"Error : {e}"
 
 
     @mcp.tool()
-    def sync_database() -> str:
-        result = intels.sync_prompt_data_to_database(slave_database_url)
-        return {"message": "success","result":result}
-    
-    return mcp
+    async def sync_database():
+        try:
+            result = await intels.sync_production_database(slave_database_url)
+            return PromptResponse(msg = "success",content=result)
+        except Exception as e:
+            return f"Error : {e}"
 
+    return mcp
 
 if __name__ == "__main__":
     mcp = create_mcp()

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 fastapi import FastAPI, HTTPException
 from .models import *
 
 def create_router(database_url: str,
@@ -39,12 +40,17 @@ def create_router(database_url: str,
                 response_model=PromptResponse,
                 )
     async def push_order(request: PushOrderRequest):
-        result = await intels.push_action_order(
-            demand=request.demand,
-            prompt_id=request.prompt_id,
-            action_type=request.action_type
-        )
-        return PromptResponse(msg = "success",content=result)
+        try:
+            result = await intels.push_action_order(
+                demand=request.demand,
+                prompt_id=request.prompt_id,
+                action_type=request.action_type
+            )
+            return PromptResponse(msg = "success",content=result)
+        except Exception as e:
+            raise HTTPException(
+                status_code=500, detail=f"{e}"
+            )
 
     # 人为干预
 
@@ -52,81 +58,106 @@ def create_router(database_url: str,
                 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)
+        try:
+            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='\n'.join(result))
+        except Exception as e:
+            raise HTTPException(
+                status_code=500, detail=f"{e}"
+            )
     @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_prompt_safe(
-                prompt_id=request.prompt_id,
-                session=session
-            )
-        return PromptResponse(msg = "success",content=result)
+        try:
+            async with create_async_session(intels.engine) as session:
+                result = await intels.get_prompt_safe(
+                    prompt_id=request.prompt_id,
+                    session=session
+                )
+            return PromptResponse(msg = "success",content=result)
     
+        except Exception as e:
+            raise HTTPException(
+                status_code=500, detail=f"{e}"
+            )
+        
     @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)
+        try:
+            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)
+        except Exception as e:
+            raise HTTPException(
+                status_code=500, detail=f"{e}"
+            )
 
     @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_prompt_safe(
-                prompt_id=request.prompt_id,
-                version = request.version,
-                session=session
+        try:
+            async with create_async_session(intels.engine) as session:
+                result = await intels.get_prompt_safe(
+                    prompt_id=request.prompt_id,
+                    version = request.version,
+                    session=session
+                )
+                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 PromptResponse(msg = "success",content=None)
+        except Exception as e:
+            raise HTTPException(
+                status_code=500, detail=f"{e}"
             )
-            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 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)
-
+        try:
+            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)
+        except Exception as e:
+            raise HTTPException(
+                status_code=500, detail=f"{e}"
+            )
     return router
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.38
+Version: 0.1.40
 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: mcp[cli]>=1.19.0
 Requires-Dist: plotly>=6.3.1
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: toml>=0.10.2

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

@@ -1,20 +1,21 @@
 pro_craft/__init__.py,sha256=CkERhdDQyrPWpOb5nArMt2UCcX8STJLF7JC2x7yTBYM,515
-pro_craft/database.py,sha256=cbUcy4_e9RgcDVBNMvERNmTv_pZWgd4ox4a4drBWS6w,9310
+pro_craft/database.py,sha256=qA9MP5oNOPp7YmZPg6GQwohitNdt2PwvYBFlYH_jX-A,11737
 pro_craft/file_manager.py,sha256=abVAlJ07_egWNuTj4JiP4me8NloQrsXGNd-SP63ab94,3738
 pro_craft/log.py,sha256=Ft5pKvdmNeXg7BPtc1H8vBi5r6p0vyKP5X_HVEEwE8U,3261
 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=bPQNottHtgfvUSPTBS7rw0Gvy3d0XQT1ffNiLPgWNDw,41653
+pro_craft/prompt_craft/async_.py,sha256=bDcXQ3rfLOFOD_d5ImsBkP6FeWj-n69w6KfFIUE-5P4,42529
 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/mcp/models.py,sha256=0QlohI7aSVjYjMdXK9Rq19Dp7b2LnjLKIiArDzI1ufg,1272
+pro_craft/server/mcp/prompt.py,sha256=zZ58zb422vhwoL_uYCVBdOwOR-xy69MLQ5tyVfbpBlU,2505
 pro_craft/server/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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,,
+pro_craft/server/router/prompt.py,sha256=oaFUfBmOtQYYD1CeSXLv1zwRID1gZ7oZgMITjX67A-o,6086
+pro_craft-0.1.40.dist-info/METADATA,sha256=wpwBOFs1LBZHNscFoi0Aa33Jai7XZqlWmRUeUp59Zx0,1750
+pro_craft-0.1.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pro_craft-0.1.40.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
+pro_craft-0.1.40.dist-info/RECORD,,