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

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

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

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

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

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

@@ -14,7 +14,7 @@ from sqlalchemy import select, delete # 导入 select, delete 用于异步操作
 import inspect
 from datetime import datetime
 from pro_craft.utils import extract_
-
+import asyncio
 import re
 
 from sqlalchemy import select, desc
@@ -349,12 +349,7 @@ class AsyncIntel():
                     score = 60,
                     session = session
                 )
-                ai_result = await 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
@@ -379,22 +374,39 @@ class AsyncIntel():
                 demand = result_obj.demand
             
 
-                assert demand
-                # 注意, 这里的调整要求使用最初的那个输入, 最好一口气调整好
-                chat_history = prompt
-                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_
+                # assert demand
+                # # 注意, 这里的调整要求使用最初的那个输入, 最好一口气调整好
+                # chat_history = prompt
+                # 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 = await self.llm.aproduct(input_prompt)
-                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)
+                # ai_result = await self.llm.aproduct(input_prompt)
+                # 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)
+
+                if input_ == before_input:
+                    new_prompt = prompt + "\nuser:" + demand
+                else:
+                    new_prompt = prompt + "\nuser:" + input_
+
+                ai_result = await self.llm.aproduct(new_prompt + output_format)
+
+                save_new_prompt = new_prompt + "\nassistant:\n" + ai_result
+
+
+                await self.save_prompt_increment_version(
+                    prompt_id, 
+                    new_prompt=save_new_prompt,
+                    use_case = input_,
+                    score = 60,
+                    session = session)
     
             elif result_obj.action_type == "summary":
 
@@ -514,6 +526,7 @@ class AsyncIntel():
                                         use_case = input_,
                                         score = 60,
                                         session = session)
+
     
             elif result_obj.action_type == "summary":
 
@@ -608,6 +621,35 @@ class AsyncIntel():
 
         return ai_result
     
+    async def intellect_remove_formats(self,
+                    input_datas: list[dict | str],
+                    OutputFormat: object,
+                    prompt_id: str,
+                    ExtraFormats: list[object] = [],
+                    version: str = None,
+                    inference_save_case = True,
+                    ):
+                
+        async with create_async_session(self.engine) as session:
+            prompt_result = await self.get_prompts_from_sql(prompt_id=prompt_id,
+                                                                   session=session)
+        if prompt_result.action_type != "inference":
+            input_datas = input_datas[:1]
+        tasks = []
+        for input_data in input_datas:
+            tasks.append(
+                self.intellect_remove_format(
+                    input_data = input_data,
+                    prompt_id = prompt_id,
+                    OutputFormat = OutputFormat,
+                    ExtraFormats = ExtraFormats,
+                    version = version,
+                    inference_save_case = inference_save_case,
+                )
+            )
+        results = await asyncio.gather(*tasks, return_exceptions=False)
+        return results
+
     
     def intellect_remove_warp(self,prompt_id: str):
         def outer_packing(func):

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

@@ -71,7 +71,7 @@ def create_router(database_url: str,
                             demand = "",
                             score = 61,
                             session = session)
-        return {"message": "success","result":result.version}
+        return {"message": "success"}
     
     return router
 

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

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