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

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

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

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

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

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

@@ -1,7 +1,7 @@
 # 测试1
 from pro_craft.utils import extract_
 from pro_craft import logger as pro_craft_logger
-from llmada.core import BianXieAdapter, ArkAdapter
+from modusched.core import BianXieAdapter, ArkAdapter
 from datetime import datetime
 from enum import Enum
 import functools
@@ -626,6 +626,8 @@ class AsyncIntel():
                                 session = session)
                 ai_result = await self.llm.aproduct(prompt_obj.prompt + output_format + "\nuser:" +  input_)
                 
+            elif result_obj.action_type == "pass":
+                pass
             else:
                 raise
 
@@ -640,6 +642,7 @@ class AsyncIntel():
                     inference_save_case = True,
                     ConTent_Function = None,
                     AConTent_Function = None,
+                    logger = None,
                     ):
         """
         这个format 是严格校验模式, 是interllect 的增强版, 会主动校验内容,并及时抛出异常(或者伺机修正)
@@ -647,8 +650,8 @@ class AsyncIntel():
         AConTent_Function
         两种方式的传入方式, 内容未通过就抛出异常
 
-        """
-                
+        # TODO 增加兜底版本
+        """                
         base_format_prompt = """
 按照一定格式输出, 以便可以通过如下校验
 
@@ -660,6 +663,11 @@ class AsyncIntel():
             output_format = base_format_prompt + "\n".join([inspect.getsource(outputformat) for outputformat in ExtraFormats]) + inspect.getsource(OutputFormat)
         else:
             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}')
+
         ai_result = await self.intellect(
                     input_data=input_data,
                     output_format=output_format,
@@ -691,11 +699,13 @@ class AsyncIntel():
                 raise Exception(f"Error {prompt_id} : {e}") from e
             
         if ConTent_Function:
-            ConTent_Function(ai_result)
+            ConTent_Function(ai_result,input_data)
         
         if AConTent_Function:
-            await AConTent_Function(ai_result)
+            await AConTent_Function(ai_result,input_data)
 
+        if logger:
+            logger.info(f'{type(ai_result)} $ intellect输出 ai_result $ {ai_result}')
         return ai_result
     
     async def intellect_formats(self,
@@ -869,7 +879,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):
+    def draw_data(self,save_html_path = ""):
         df = self.eval_df
         # --- 可视化部分 ---
         fig = go.Figure()

{pro_craft-0.1.51 → pro_craft-0.1.53}/src/pro_craft/server/router/models.py

@@ -17,6 +17,7 @@ class PushOrderRequest(BaseModel):
 
 class GetPromptRequest(BaseModel):
     prompt_id: str = Field(..., description="提示词id")
+    version: str = Field(None, description="提示词id")
 
 class UpdatePromptRequest(BaseModel):
     prompt_id: str = Field(..., description="提示词id")
@@ -32,4 +33,4 @@ class RollBackPromptRequest(BaseModel):
 
 class PromptResponse(BaseModel):
     msg: str = Field(..., description="信息")
-    content: str = None
+    content: dict| str = None

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

@@ -0,0 +1,183 @@
+
+
+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
+

{pro_craft-0.1.51 → pro_craft-0.1.53}/src/pro_craft/server/router/prompt.py

@@ -5,6 +5,9 @@ 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,
@@ -30,8 +33,22 @@ def create_router(database_url: str,
         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 确保每次请求都验证
+        tags=["prompt"], # 这里使用 Depends 确保每次请求都验证
+        dependencies = [Depends(verify_api_key)]
     )
 
     # 自动修改
@@ -57,7 +74,7 @@ def create_router(database_url: str,
     @router.get("/registered_prompt",
                 description="获取以注册的提示词",
                 response_model=PromptResponse)
-    async def get_prompt():
+    async def registered_prompt():
         try:
             result = ["memorycard-format",
             "memorycard-polish",
@@ -94,9 +111,10 @@ def create_router(database_url: str,
             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=f"prompt: {result.prompt}, version: {result.version}")
+            return PromptResponse(msg = "success",content={"prompt": result.prompt, "version": result.version})
     
         except Exception as e:
             raise HTTPException(

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

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

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

@@ -21,6 +21,7 @@ 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