pro-craft 0.1.11__py3-none-any.whl → 0.1.12__py3-none-any.whl

pro_craft/prompt_helper_async.py

@@ -68,9 +68,8 @@ class AsyncIntel():
                 ):
         database_url = database_url or os.getenv("database_url")
         assert database_url
-    
-        # async_engine
-        self.async_engine = create_async_engine(database_url, echo=True,
+
+        self.engine = create_async_engine(database_url, echo=True,
                                     pool_size=10,        # 连接池中保持的连接数
                                     max_overflow=20,     # 当pool_size不够时，允许临时创建的额外连接数
                                     pool_recycle=3600,   # 每小时回收一次连接
@@ -87,10 +86,10 @@ class AsyncIntel():
             self.llm = BianXieAdapter()
             
     async def create_database(self):
-        async with self.async_engine.begin() as conn:
+        async with self.engine.begin() as conn:
             await conn.run_sync(PromptBase.metadata.create_all)
             
-    async def _aget_latest_prompt_version(self,target_prompt_id,session):
+    async def _get_latest_prompt_version(self,target_prompt_id,session):
         """
         获取指定 prompt_id 的最新版本数据，通过创建时间判断。
         """
@@ -113,7 +112,7 @@ class AsyncIntel():
             editing_log(f"未找到 prompt_id '{target_prompt_id}' 的任何版本。")
         return result
 
-    async def _aget_specific_prompt_version(self,target_prompt_id, target_version,session):
+    async def _get_specific_prompt_version(self,target_prompt_id, target_version,session):
         """
         获取指定 prompt_id 和特定版本的数据。
 
@@ -141,7 +140,7 @@ class AsyncIntel():
             editing_log(f"未找到 prompt_id '{target_prompt_id}', 版本 '{target_version}' 的提示词数据。")
         return specific_prompt
 
-    async def aget_prompts_from_sql(self,
+    async def get_prompts_from_sql(self,
                              prompt_id: str,
                              version = None,
                              session = None) -> Prompt:
@@ -150,15 +149,15 @@ class AsyncIntel():
         """
         # 查看是否已经存在
         if version:
-            prompts_obj = await self._aget_specific_prompt_version(prompt_id,version,session=session)
+            prompts_obj = await self._get_specific_prompt_version(prompt_id,version,session=session)
             if not prompts_obj:
-                prompts_obj = await self._aget_latest_prompt_version(prompt_id,session = session)
+                prompts_obj = await self._get_latest_prompt_version(prompt_id,session = session)
         else:
-            prompts_obj = await self._aget_latest_prompt_version(prompt_id,session = session)     
+            prompts_obj = await self._get_latest_prompt_version(prompt_id,session = session)     
         return prompts_obj
         
             
-    async def asave_prompt_increment_version(self,
+    async def save_prompt_increment_version(self,
                            prompt_id: str,
                            new_prompt: str,
                            use_case:str = "",
@@ -171,7 +170,7 @@ class AsyncIntel():
         input_data 指的是输入用例, 可以为空
         """
         # 查看是否已经存在
-        prompts_obj = await self.aget_prompts_from_sql(prompt_id=prompt_id,session=session)
+        prompts_obj = await self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
 
         if prompts_obj:
             # 如果存在版本加1
@@ -198,7 +197,7 @@ class AsyncIntel():
         session.add(prompt1)
         await session.commit() # 提交事务，将数据写入数据库
 
-    async def asave_use_case_by_sql(self,
+    async def save_use_case_by_sql(self,
                              prompt_id: str,
                              use_case:str = "",
                              output = "",
@@ -237,7 +236,7 @@ class AsyncIntel():
 
         s_prompt = extract_(system_result,pattern_key=r"prompt")
         chat_history = s_prompt or system_result
-        await self.asave_prompt_increment_version(prompt_id,
+        await self.save_prompt_increment_version(prompt_id,
                                 new_prompt = chat_history,
                                 input_data = " summary ",
                                 session = session)
@@ -279,20 +278,20 @@ class AsyncIntel():
 {opinion}
 """
 
-        prompt, _ = await self.aget_prompts_from_sql(prompt_id = prompt_id,version = version)
+        prompt, _ = await self.get_prompts_from_sql(prompt_id = prompt_id,version = version)
         if demand:
             new_prompt = await self.llm.aproduct(
                 change_by_opinion_prompt.format(old_system_prompt=prompt, opinion=demand)
             )
         else:
             new_prompt = prompt
-        await self.asave_prompt_increment_version(prompt_id = prompt_id,
+        await self.save_prompt_increment_version(prompt_id = prompt_id,
                             new_prompt = new_prompt,
                             input_data = " finetune ",
                             session = session)
 
 
-    async def apush_action_order(self,demand : str,prompt_id: str,
+    async def push_action_order(self,demand : str,prompt_id: str,
                          action_type = 'train'):
 
         """
@@ -302,11 +301,11 @@ class AsyncIntel():
         将打算修改的状态推上数据库 # 1
         """
         # 查看是否已经存在
-        async with create_async_session(self.async_engine) as session:
+        async with create_async_session(self.engine) as session:
 
-            latest_prompt = await self.aget_prompts_from_sql(prompt_id=prompt_id,session=session)
+            latest_prompt = await self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
 
-            await self.asave_prompt_increment_version(prompt_id=latest_prompt.prompt_id,
+            await self.save_prompt_increment_version(prompt_id=latest_prompt.prompt_id,
                                     new_prompt = latest_prompt.prompt,
                                     use_case = latest_prompt.use_case,
                                     action_type=action_type,
@@ -319,7 +318,7 @@ class AsyncIntel():
 
 
 
-    async def aintellect_remove(self,
+    async def intellect_remove(self,
                     input_data: dict | str,
                     output_format: str,
                     prompt_id: str,
@@ -333,18 +332,18 @@ class AsyncIntel():
             input_ = input_data
         
         # 查数据库, 获取最新提示词对象
-        async with create_async_session(self.async_engine) as session:
-            result_obj = await self.aget_prompts_from_sql(prompt_id=prompt_id,session=session)
+        async with create_async_session(self.engine) as session:
+            result_obj = await self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
 
 
             if result_obj is None:
-                await self.asave_prompt_increment_version(
+                await self.save_prompt_increment_version(
                     prompt_id = prompt_id,
                     new_prompt = "做一些处理",
                     use_case = input_,
                     session = session
                 )
-                ai_result = await self.aintellect_remove(input_data = input_data,
+                ai_result = await self.intellect_remove(input_data = input_data,
                                        output_format = output_format,
                                        prompt_id = prompt_id,
                                        version = version,
@@ -357,7 +356,7 @@ class AsyncIntel():
                 # 直接推理即可
                 ai_result = await self.llm.aproduct(prompt + output_format + "\n-----input----\n" +  input_)
                 if inference_save_case:
-                    await self.asave_use_case_by_sql(prompt_id,
+                    await self.save_use_case_by_sql(prompt_id,
                                         use_case = input_,
                                         output = ai_result,
                                         solution = "备注/理想回复",
@@ -386,7 +385,7 @@ class AsyncIntel():
             
                 ai_result = await self.llm.aproduct(input_prompt)
                 chat_history = input_prompt + "\nassistant:\n" + ai_result # 用聊天记录作为完整提示词
-                await self.asave_prompt_increment_version(prompt_id, chat_history,
+                await self.save_prompt_increment_version(prompt_id, chat_history,
                                         use_case = input_,
                                         session = session)
     
@@ -426,7 +425,7 @@ class AsyncIntel():
 
         return ai_result
     
-    async def aintellect_stream_remove(self,
+    async def intellect_stream_remove(self,
                     input_data: dict | str,
                     output_format: str,
                     prompt_id: str,
@@ -441,18 +440,18 @@ class AsyncIntel():
 
         
         # 查数据库, 获取最新提示词对象
-        with create_session(self.async_engine) as session:
-            result_obj = await self.aget_prompts_from_sql(prompt_id=prompt_id,session=session)
+        with create_session(self.engine) as session:
+            result_obj = await self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
 
             '''
                         if result_obj is None:
-                            await self.asave_prompt_increment_version(
+                            await self.save_prompt_increment_version(
                                 prompt_id = prompt_id,
                                 new_prompt = "做一些处理",
                                 use_case = input_,
                                 session = session
                             )
-                            ai_result = await self.aintellect_stream_remove(input_data = input_data,
+                            ai_result = await self.intellect_stream_remove(input_data = input_data,
                                                 output_format = output_format,
                                                 prompt_id = prompt_id,
                                                 version = version,
@@ -470,7 +469,7 @@ class AsyncIntel():
                     ai_result += word
                     yield word
                 if inference_save_case:
-                    await self.asave_use_case_by_sql(prompt_id,
+                    await self.save_use_case_by_sql(prompt_id,
                                         use_case = input_,
                                         output = ai_result,
                                         solution = "备注/理想回复",
@@ -504,7 +503,7 @@ class AsyncIntel():
                     yield word
 
                 chat_history = input_prompt + "\nassistant:\n" + ai_result # 用聊天记录作为完整提示词
-                await self.asave_prompt_increment_version(prompt_id, chat_history,
+                await self.save_prompt_increment_version(prompt_id, chat_history,
                                         use_case = input_,
                                         session = session)
     
@@ -555,7 +554,7 @@ class AsyncIntel():
             else:
                 raise
 
-    async def aintellect_remove_format(self,
+    async def intellect_remove_format(self,
                     input_data: dict | str,
                     OutputFormat: object,
                     prompt_id: str,
@@ -573,7 +572,7 @@ class AsyncIntel():
 """
         output_format = base_format_prompt + "\n".join([inspect.getsource(outputformat) for outputformat in ExtraFormats]) + inspect.getsource(OutputFormat)
 
-        ai_result = await self.aintellect_remove(
+        ai_result = await self.intellect_remove(
                     input_data=input_data,
                     output_format=output_format,
                     prompt_id=prompt_id,
@@ -606,7 +605,7 @@ class AsyncIntel():
         return ai_result
     
     
-    def aintellect_remove_warp(self,prompt_id: str):
+    def intellect_remove_warp(self,prompt_id: str):
         def outer_packing(func):
             @functools.wraps(func)
             async def wrapper(*args, **kwargs):
@@ -621,7 +620,7 @@ class AsyncIntel():
                 elif isinstance(input_data,str):
                     input_ = output_ = input_data
 
-                output_ = await self.aintellect_remove_format(
+                output_ = await self.intellect_remove_format(
                         input_data = input_data,
                         prompt_id = prompt_id,
                         OutputFormat = OutputFormat,

{pro_craft-0.1.11.dist-info → pro_craft-0.1.12.dist-info}/METADATA

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

{pro_craft-0.1.11.dist-info → pro_craft-0.1.12.dist-info}/RECORD

@@ -5,7 +5,7 @@ pro_craft/evals.py,sha256=1T86jur4k3cLk43j1GyAW4JS0nPNfl6P0ZOQmu-SgpA,1928
 pro_craft/file_manager.py,sha256=2j7lCt9L4mtvAy8_76ibTthXLwKKmVatWIB3DSvQM7U,3805
 pro_craft/log.py,sha256=MZf9jCZsiRoAq8v4FxVnJqeSXxgzAiiKf7mxz6bFtwM,4263
 pro_craft/prompt_helper.py,sha256=GClPsomdGdo6FXlp8VdiQy8GaBtj3oLeq2oFw0RiM3k,26592
-pro_craft/prompt_helper_async.py,sha256=Ej0JXwev0FmPSoOE5iEXtZxQ3pXoqcaulyyUuC7WyC4,27859
+pro_craft/prompt_helper_async.py,sha256=-EtwjDUL2Xoi4qjZpzgnUyAVBkt-WCocGgVl5PgA4Js,27771
 pro_craft/prompt_helper_new.py,sha256=DV871XElJmHDO2xis1mC1f3QFvq3ll81VGGD9aj0Eiw,23542
 pro_craft/server.py,sha256=fPAosQIU0d7gxICiALl8u6QwbLI4cawVFyoRYebRES0,2827
 pro_craft/utils.py,sha256=cpvwk68mD9hYY8WCq2JXzfrrXqpshiscz_OSav4tC7U,5687
@@ -18,7 +18,7 @@ pro_craft/server/mcp/math.py,sha256=OOzGXx64nK4bOVlu33PtVddcCQ9ilqA3Em9yxjSX9cg,
 pro_craft/server/mcp/resource.py,sha256=z94jP3qZofO-1lZCM3TuOfLajw41HARs1ojXab1ymas,776
 pro_craft/server/mcp/weather.py,sha256=RAGuf4sgjlTQSfRRZ1Fo18JnuMQRS_Db9p6AqBQrl8E,455
 pro_craft/server/router/recommended.py,sha256=IAZFdmb8HSl2_TOJeuv5uOKIX47XyX4p4sEwxG-0vt0,9968
-pro_craft-0.1.11.dist-info/METADATA,sha256=Delq6mCu7BWJGL6LhC5054iGNkXnRGsiLaD6apL6m1w,1800
-pro_craft-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pro_craft-0.1.11.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
-pro_craft-0.1.11.dist-info/RECORD,,
+pro_craft-0.1.12.dist-info/METADATA,sha256=VKEqBoEWYaOP0Ue2BSZ3iKZ1W_MYqsaRS7f3lQ-bscs,1800
+pro_craft-0.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pro_craft-0.1.12.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
+pro_craft-0.1.12.dist-info/RECORD,,