pro-craft 0.1.16__tar.gz → 0.1.18__tar.gz

{pro_craft-0.1.16 → pro_craft-0.1.18}/PKG-INFO

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

{pro_craft-0.1.16 → pro_craft-0.1.18}/pyproject.toml

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

{pro_craft-0.1.16 → pro_craft-0.1.18}/src/pro_craft/prompt_craft/async_.py

@@ -241,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(
@@ -290,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)
 
 
@@ -344,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,
@@ -390,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":
@@ -508,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.16 → pro_craft-0.1.18}/src/pro_craft/prompt_craft/sync.py

@@ -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":
@@ -423,24 +419,35 @@ class Intel():
                 # 则训练推广
 
                 # 新版本 默人修改会 inference 状态
-                chat_history = prompt
+                prompt = result_obj.prompt
                 before_input = result_obj.use_case
                 demand = result_obj.demand
+
+                # assert demand
+                # # 注意, 这里的调整要求使用最初的那个输入, 最好一口气调整好
+                
+                # if input_ == before_input: # 输入没变, 说明还是针对同一个输入进行讨论
+                #     # input_prompt = chat_history + "\nuser:" + demand
+                #     input_prompt = chat_history + "\nuser:" + demand + output_format 
+                # else:
+                #     # input_prompt = chat_history + "\nuser:" + demand + "\n-----input----\n" + input_
+                #     input_prompt = chat_history + "\nuser:" + demand + output_format  + "\n-----input----\n" + input_
             
+                # ai_result = self.llm.product(input_prompt)
+                # chat_history = input_prompt + "\nassistant:\n" + ai_result # 用聊天记录作为完整提示词
 
-                assert demand
-                # 注意, 这里的调整要求使用最初的那个输入, 最好一口气调整好
-                chat_history = prompt
-                if input_ == before_input: # 输入没变, 说明还是针对同一个输入进行讨论
-                    # input_prompt = chat_history + "\nuser:" + demand
-                    input_prompt = chat_history + "\nuser:" + demand + output_format 
+                if input_ == before_input:
+                    new_prompt = prompt + "\nuser:" + demand
                 else:
-                    # input_prompt = chat_history + "\nuser:" + demand + "\n-----input----\n" + input_
-                    input_prompt = chat_history + "\nuser:" + demand + output_format  + "\n-----input----\n" + input_
-            
-                ai_result = self.llm.product(input_prompt)
-                chat_history = input_prompt + "\nassistant:\n" + ai_result # 用聊天记录作为完整提示词
-                self.save_prompt_increment_version(prompt_id, chat_history,
+                    new_prompt = prompt + "\nuser:" + input_
+
+                ai_result = self.llm.product(new_prompt + output_format)
+
+                save_new_prompt = new_prompt + "\nassistant:\n" + ai_result
+
+
+                self.save_prompt_increment_version(prompt_id, 
+                                        new_prompt=save_new_prompt,
                                         use_case = input_,
                                         score = 60,
                                         session = session)

{pro_craft-0.1.16 → pro_craft-0.1.18}/src/pro_craft/server/router/prompt.py

@@ -29,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,
@@ -52,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 = result.use_case,
+                            action_type = "inference",
+                            demand = "",
+                            score = 61,
+                            session = session)
+        return {"message": "success","result":result.version}
+    
     return router
+

{pro_craft-0.1.16 → pro_craft-0.1.18}/src/pro_craft.egg-info/PKG-INFO

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