pro-craft 0.1.15__tar.gz → 0.1.17__tar.gz

{pro_craft-0.1.15 → pro_craft-0.1.17}/PKG-INFO

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

{pro_craft-0.1.15 → pro_craft-0.1.17}/pyproject.toml

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

{pro_craft-0.1.15 → pro_craft-0.1.17}/src/pro_craft/code_helper/coder.py

@@ -1,4 +1,4 @@
-from pro_craft.prompt_helper import Intel,IntellectType
+from pro_craft import Intel
 from pro_craft.log import Log
 from pro_craft.utils import extract_
 from typing import List, Dict, Any

{pro_craft-0.1.15 → pro_craft-0.1.17}/src/pro_craft/file_manager.py

@@ -2,9 +2,8 @@
 from db_help.qdrant import QdrantManager
 from pydantic import BaseModel
 from datetime import datetime
-from pro_craft.utils import get_adler32_hash, embedding_inputs
-from pro_craft.prompt_helper import Intel, IntellectType
-from pro_craft.utils import extract_
+from pro_craft.utils import get_adler32_hash, embedding_inputs,extract_
+from pro_craft import Intel
 from enum import Enum
 import json
 

{pro_craft-0.1.15 → pro_craft-0.1.17}/src/pro_craft/prompt_craft/async_.py

@@ -1,6 +1,6 @@
 # 测试1
 from pro_craft.utils import extract_
-from pro_craft.log import Log
+from pro_craft import logger as pro_craft_logger
 from llmada.core import BianXieAdapter, ArkAdapter
 from datetime import datetime
 from enum import Enum
@@ -68,9 +68,10 @@ class AsyncIntel():
     def __init__(self,
                  database_url = "",
                  model_name = "",
+                 logger = None,
                 ):
         database_url = database_url or os.getenv("database_url")
-        self.logger = logger or Log.logger
+        self.logger = logger or pro_craft_logger
         try:
             assert database_url
             assert 'aio' in database_url
@@ -240,7 +241,8 @@ class AsyncIntel():
         chat_history = s_prompt or system_result
         await self.save_prompt_increment_version(prompt_id,
                                 new_prompt = chat_history,
-                                input_data = " summary ",
+                                use_case = " summary ",
+                                score = 60,
                                 session = session)
         
     async def prompt_finetune_to_sql(
@@ -289,7 +291,8 @@ class AsyncIntel():
             new_prompt = prompt
         await self.save_prompt_increment_version(prompt_id = prompt_id,
                             new_prompt = new_prompt,
-                            input_data = " finetune ",
+                            use_case = " finetune ",
+                            score = 60,
                             session = session)
 
 
@@ -343,6 +346,7 @@ class AsyncIntel():
                     prompt_id = prompt_id,
                     new_prompt = "做一些处理",
                     use_case = input_,
+                    score = 60,
                     session = session
                 )
                 ai_result = await self.intellect_remove(input_data = input_data,
@@ -389,6 +393,7 @@ class AsyncIntel():
                 chat_history = input_prompt + "\nassistant:\n" + ai_result # 用聊天记录作为完整提示词
                 await self.save_prompt_increment_version(prompt_id, chat_history,
                                         use_case = input_,
+                                        score = 60,
                                         session = session)
     
             elif result_obj.action_type == "summary":
@@ -507,6 +512,7 @@ class AsyncIntel():
                 chat_history = input_prompt + "\nassistant:\n" + ai_result # 用聊天记录作为完整提示词
                 await self.save_prompt_increment_version(prompt_id, chat_history,
                                         use_case = input_,
+                                        score = 60,
                                         session = session)
     
             elif result_obj.action_type == "summary":

{pro_craft-0.1.15 → pro_craft-0.1.17}/src/pro_craft/prompt_craft/new.py

@@ -1,7 +1,7 @@
 # 测试1
 
 from pro_craft.utils import extract_
-from pro_craft.log import Log
+from pro_craft import logger as pro_craft_logger
 from pro_craft.database import Prompt, UseCase, PromptBase
 from pro_craft.utils import create_session, create_async_session
 from llmada.core import BianXieAdapter, ArkAdapter
@@ -88,7 +88,7 @@ class IntelNew():
         else:
             print('Use BianXieAdapter')
             self.llm = BianXieAdapter()
-        self.logger = logger or Log.logger
+        self.logger = logger or pro_craft_logger
         
     def _get_latest_prompt_version(self,target_prompt_id,session):
         """

{pro_craft-0.1.15 → pro_craft-0.1.17}/src/pro_craft/prompt_craft/sync.py

@@ -1,7 +1,7 @@
 # 测试1
 
 from pro_craft.utils import extract_
-from pro_craft.log import Log
+from pro_craft import logger as pro_craft_logger
 from pro_craft.database import Prompt, UseCase, PromptBase
 from pro_craft.utils import create_session, create_async_session
 from llmada.core import BianXieAdapter, ArkAdapter
@@ -88,7 +88,7 @@ class Intel():
         else:
             print('Use BianXieAdapter')
             self.llm = BianXieAdapter()
-        self.logger = logger or Log.logger
+        self.logger = logger or pro_craft_logger
         
     def _get_latest_prompt_version(self,target_prompt_id,session):
         """
@@ -397,14 +397,10 @@ class Intel():
                     prompt_id = prompt_id,
                     new_prompt = "做一些处理",
                     use_case = input_,
+                    score = 60,
                     session = session
                 )
-                ai_result = self.intellect_remove(input_data = input_data,
-                                       output_format = output_format,
-                                       prompt_id = prompt_id,
-                                       version = version,
-                                       inference_save_case = inference_save_case
-                                       )
+                ai_result = "初始化完成"
                 return ai_result
             prompt = result_obj.prompt
             if result_obj.action_type == "inference":

pro_craft-0.1.15/src/pro_craft/server/mcp/weather.py → pro_craft-0.1.17/src/pro_craft/server/mcp/prompt.py

@@ -1,7 +1,6 @@
-from datetime import datetime
 from mcp.server.fastmcp import FastMCP
 
-from pro_craft.prompt_helper import IntellectType, Intel
+from pro_craft import Intel
 
 def create_mcp(database_url: str,
                   slave_database_url: str,

{pro_craft-0.1.15 → pro_craft-0.1.17}/src/pro_craft/server/router/prompt.py

@@ -1,9 +1,8 @@
 
 
 from fastapi import APIRouter
-from pro_craft.prompt_helper import IntellectType,Intel
+from pro_craft import Intel
 from pro_craft.utils import create_session
-import os
 
 def create_router(database_url: str,
                   slave_database_url: str,
@@ -30,7 +29,8 @@ def create_router(database_url: str,
         tags=["prompt"] # 这里使用 Depends 确保每次请求都验证
     )
 
-    @router.get("/push_order")
+    @router.get("/push_order",
+                description="可选 train,inference,summary,finetune,patch",)
     async def push_order(demand: str, prompt_id: str, action_type: str = "train"):
         result = intels.push_action_order(
             demand=demand,
@@ -53,4 +53,25 @@ def create_router(database_url: str,
         result = intels.sync_prompt_data_to_database(slave_database_url)
         return {"message": "success","result":result}
     
+
+    @router.get("/roll_back")
+    async def roll_back(prompt_id:str,version:str):
+        with create_session(intels.engine) as session:
+            result = intels.get_prompts_from_sql(
+                prompt_id=prompt_id,
+                version = version,
+                session=session
+            )
+            assert result.version == version
+            intels.save_prompt_increment_version(
+                            prompt_id = prompt_id,
+                            new_prompt = result.prompt,
+                            use_case = "roll_back",
+                            action_type = "inference",
+                            demand = "",
+                            score = 61,
+                            session = session)
+        return {"message": "success","result":result.version}
+    
     return router
+

{pro_craft-0.1.15 → pro_craft-0.1.17}/src/pro_craft.egg-info/PKG-INFO

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

{pro_craft-0.1.15 → pro_craft-0.1.17}/src/pro_craft.egg-info/SOURCES.txt

@@ -18,7 +18,7 @@ src/pro_craft/prompt_craft/evals.py
 src/pro_craft/prompt_craft/new.py
 src/pro_craft/prompt_craft/sync.py
 src/pro_craft/server/mcp/__init__.py
-src/pro_craft/server/mcp/weather.py
+src/pro_craft/server/mcp/prompt.py
 src/pro_craft/server/router/__init__.py
 src/pro_craft/server/router/prompt.py
 tests/test22.py