pro-craft 0.1.53__tar.gz → 0.1.55__tar.gz

{pro_craft-0.1.53 → pro_craft-0.1.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.53
+Version: 0.1.55
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -10,6 +10,7 @@ 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: modusched==0.1.5
 Requires-Dist: plotly>=6.3.1
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: toml>=0.10.2

{pro_craft-0.1.53 → pro_craft-0.1.55}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "pro-craft"
-version = "0.1.53"
+version = "0.1.55"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"
-dependencies = [ "aiomysql>=0.2.0", "anyio>=4.11.0", "db-help>=0.2.2", "fastapi>=0.119.0", "llmada>=1.1.11", "mcp[cli]>=1.19.0", "plotly>=6.3.1", "pyyaml>=6.0.3", "toml>=0.10.2", "utils-tool==0.1.3", "uvicorn>=0.38.0",]
+dependencies = [ "aiomysql>=0.2.0", "anyio>=4.11.0", "db-help>=0.2.2", "fastapi>=0.119.0", "llmada>=1.1.11", "mcp[cli]>=1.19.0", "modusched==0.1.5", "plotly>=6.3.1", "pyyaml>=6.0.3", "toml>=0.10.2", "utils-tool==0.1.3", "uvicorn>=0.38.0",]
 
 [tool.setuptools.package-data]
 pro_craft = [ "config.yaml",]

{pro_craft-0.1.53 → pro_craft-0.1.55}/src/pro_craft/prompt_craft/async_.py

@@ -25,6 +25,7 @@ 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 # 用于检查对象是否是持久化的
+from datetime import datetime, timedelta
 
 from tqdm.asyncio import tqdm
 import pandas as pd
@@ -333,6 +334,8 @@ class AsyncIntel():
 
     async def get_use_case(self,
                              target_prompt_id: str,
+                             start_time: datetime = None,  # 新增：开始时间
+                             end_time: datetime = None,    # 新增：结束时间
                              session = None
                             ):
         """
@@ -341,6 +344,11 @@ class AsyncIntel():
         stmt = select(UseCase).filter(UseCase.is_deleted == 0,
                                       UseCase.prompt_id == target_prompt_id)
         
+        if start_time:
+            stmt = stmt.filter(UseCase.created_at >= start_time)  # 假设你的UseCase模型有一个created_at字段
+
+        if end_time:
+            stmt = stmt.filter(UseCase.created_at <= end_time)
         result = await session.execute(stmt)
         # use_case = result.scalars().one_or_none()
         use_case = result.scalars().all()
@@ -665,8 +673,7 @@ class AsyncIntel():
             output_format = ""
 
         if logger:
-            logger.info(f'{type(input_data)} $ intellect输入 input_data $ {input_data}')
-            logger.info(f'{type(output_format)} $ intellect输入 output_format $ {output_format}')
+            logger.info(f'{type(input_data)} $ intellect-输入 $ {input_data} \noutput_format: \n{output_format}')
 
         ai_result = await self.intellect(
                     input_data=input_data,
@@ -683,12 +690,13 @@ class AsyncIntel():
 
             except JSONDecodeError as e:
                 try:
-                    self.logger.error(f"尝试补救")
+                    self.logger.error(f'{type(json_str)} $ intellect尝试补救 $ {json_str}')
                     json_str = fix_broken_json_string(json_str)
                     ai_result = json.loads(json_str)
                     OutputFormat(**ai_result)
 
                 except JSONDecodeError as e:
+                    self.logger.error(f'{type(json_str)} $ {prompt_id}intellect生成的内容为无法被Json解析 $ {json_str}')
                     raise IntellectRemoveFormatError(f"prompt_id: {prompt_id} 生成的内容为无法被Json解析 {e}") from e
             
             except ValidationError as e:
@@ -791,6 +799,122 @@ class AsyncIntel():
             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:
+            # start = datetime(2023, 1, 1, 10, 0, 0)
+            # end = datetime(2023, 1, 15, 12, 30, 0)
+            use_cases = await self.get_use_case(target_prompt_id=prompt_id,session=eval_session,
+                                                start_time=None,
+                                                end_time=None,)
+
+            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,
+                        prompt_id = prompt_id,
+                        OutputFormat = OutputFormat,
+                        ExtraFormats = ExtraFormats,
+                        version = version,
+                        inference_save_case = False,
+                        ConTent_Function = ConTent_Function,
+                        AConTent_Function = AConTent_Function,
+                    )
+
+                    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)
+
+
+                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}"
+                    use_case.faired_time +=1
+
+
+            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 tqdm.gather(*tasks,total=len(tasks))
+            # await asyncio.gather(*tasks, return_exceptions=False)
+
+            await eval_session.commit()
+
+            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
+
+
+            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),
+
+
+    async def function_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: 
+        # TODO 人类评价 eval
+        # TODO llm 评价 eval
+        """
+        async with create_async_session(self.engine) as 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,        # 连接池中保持的连接数
@@ -879,6 +1003,7 @@ class AsyncIntel():
                                                    "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
         # --- 可视化部分 ---

{pro_craft-0.1.53 → pro_craft-0.1.55}/src/pro_craft.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.53
+Version: 0.1.55
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -10,6 +10,7 @@ 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: modusched==0.1.5
 Requires-Dist: plotly>=6.3.1
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: toml>=0.10.2

{pro_craft-0.1.53 → pro_craft-0.1.55}/src/pro_craft.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ src/pro_craft/server/mcp/models.py
 src/pro_craft/server/mcp/prompt.py
 src/pro_craft/server/router/__init__.py
 src/pro_craft/server/router/models.py
-src/pro_craft/server/router/prompt copy.py
 src/pro_craft/server/router/prompt.py
 tests/test22.py
 tests/test_11.py

{pro_craft-0.1.53 → pro_craft-0.1.55}/src/pro_craft.egg-info/requires.txt

@@ -4,6 +4,7 @@ db-help>=0.2.2
 fastapi>=0.119.0
 llmada>=1.1.11
 mcp[cli]>=1.19.0
+modusched==0.1.5
 plotly>=6.3.1
 pyyaml>=6.0.3
 toml>=0.10.2

pro_craft-0.1.53/src/pro_craft/server/router/prompt copy.py

@@ -1,183 +0,0 @@
-
-
-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 *
-from fastapi import APIRouter, Depends, HTTPException, status, Header
-import os
-
-
-def create_router(database_url: str,
-                  slave_database_url: str,
-                  model_name: str,
-                  logger = None):
-    """
-    # TODO 整理改为异步
-    创建一个包含 ProCraft 路由的 FastAPI APIRouter 实例。
-
-    Args:
-        database_url (str): 数据库连接字符串。
-        model_name (str): 用于 Intel 实例的模型名称。
-        api_key_secret (str, optional): 用于验证 API Key 的秘密字符串。
-                                        如果提供，它将覆盖环境变量 PRO_CRAFT_API_KEY。
-                                        如果都不提供，会使用硬编码的 'your_default_secret_key'。
-    Returns:
-        APIRouter: 配置好的 FastAPI APIRouter 实例。
-    """
-
-    intels = AsyncIntel(
-        database_url=database_url,
-        model_name=model_name,
-        logger=logger
-        )
-
-    async def verify_api_key(authorization: Optional[str] = Header(None)):
-        # if not authorization:
-        #     raise HTTPException(status_code=401, detail="Invalid authorization scheme")
-        # if not authorization.startswith("Bearer "):
-        #     raise HTTPException(status_code=401, detail="Invalid authorization scheme")
-        
-        # token = authorization.split(" ")[1]
-
-        key = os.getenv("prompt_api_key")
-        key_ = "123578"
-        if key_ != key:
-            raise HTTPException(status_code=401, detail="Error Server Position2")
-
-    router = APIRouter(
-        tags=["prompt"], # 这里使用 Depends 确保每次请求都验证
-        dependencies = [Depends(verify_api_key)]
-    )
-
-    # 自动修改
-    @router.post("/push_order",
-                description="可选 train,inference,summary,finetune,patch",
-                response_model=PromptResponse,
-                )
-    async def push_order(request: PushOrderRequest):
-        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}"
-            )
-
-    # 人为干预
-
-    @router.get("/registered_prompt",
-                description="获取以注册的提示词",
-                response_model=PromptResponse)
-    async def registered_prompt():
-        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_material_add",
-            "biograph_material_init",
-            "biograph-writer"]
-
-            return PromptResponse(msg = "success",content='  |  '.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):
-        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
-                )
-            return PromptResponse(msg = "success",content={"prompt": result.prompt, "version": result.version})
-    
-        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):
-        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="")
-        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):
-        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="")
-        except Exception as e:
-            raise HTTPException(
-                status_code=500, detail=f"{e}"
-            )
-        
-
-    #系统级别服务
-    
-    @router.post("/sync_database")
-    async def sync_database():
-        try:
-            result = await intels.sync_production_database(slave_database_url)
-            return PromptResponse(msg = "success",content="")
-        except Exception as e:
-            raise HTTPException(
-                status_code=500, detail=f"{e}"
-            )
-    return router
-