pro-craft 0.1.52__py3-none-any.whl → 0.1.54__py3-none-any.whl

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,
@@ -675,12 +683,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:
@@ -691,11 +700,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 +880,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/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/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.52.dist-info → pro_craft-0.1.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.52
+Version: 0.1.54
 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.52.dist-info → pro_craft-0.1.54.dist-info}/RECORD

@@ -6,16 +6,16 @@ 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=bDcXQ3rfLOFOD_d5ImsBkP6FeWj-n69w6KfFIUE-5P4,42529
+pro_craft/prompt_craft/async_.py,sha256=AkHU06zJE0gVLJC1s_5ViQ3htO0hzaqLFkzpIjieh4w,43191
 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/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=0LAFXsPQnDCUK_VNiS4xE_oXTyV5Mb0nzt_O5mWmne4,1276
-pro_craft/server/router/prompt.py,sha256=fDZu7bTE7dnztxxVcywNY5SY8YJrQh_llU3VGz979FA,6108
-pro_craft-0.1.52.dist-info/METADATA,sha256=VV8IXmZthjOBQ20zkQ18yeaeAh-0yweKkMDl09CX6ts,1750
-pro_craft-0.1.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pro_craft-0.1.52.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
-pro_craft-0.1.52.dist-info/RECORD,,
+pro_craft/server/router/models.py,sha256=o60_qHjFIHwH3Pp6jNmg3V23GyFeXJXH-V6uBVoztXQ,1340
+pro_craft/server/router/prompt.py,sha256=goKipoCX62BqtNXE2DSzpmqM2yzs2wvSzhvoDuuG5Ik,6862
+pro_craft-0.1.54.dist-info/METADATA,sha256=Mz50Pcur2gMzh1--beNQsEYslXnaqfswZvjz6TX32jc,1782
+pro_craft-0.1.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pro_craft-0.1.54.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
+pro_craft-0.1.54.dist-info/RECORD,,