pro-craft 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

pro_craft/prompt_helper.py

@@ -379,7 +379,16 @@ class Intel():
                     prompt_id: str,
                     version: str = None,
                     inference_save_case = True,
+                    push_patch = False,
                     ):
+        """
+        使用指南:
+            1 训练, 使用单一例子做大量的沟通来奠定基础
+            2 总结, 将沟通好的总结成完整提示词
+            3 推理, 使用部署
+            4 微调, 针对一些格式性的, 问题进行微调
+            5 补丁, 微调无法解决的问题, 可以尝试使用补丁来解决
+        """
         if isinstance(input_data,dict):
             input_ = json.dumps(input_data,ensure_ascii=False)
         elif isinstance(input_data,str):
@@ -459,8 +468,18 @@ class Intel():
                                             session = session
                                             )
                 ai_result = self.llm.product(prompt + output_format + "\n-----input----\n" +  input_)
-            elif result_obj.action_type == "devide":
-                pass
+            elif result_obj.action_type == "patch":
+                
+                demand = result_obj.demand
+                assert demand
+
+                chat_history = prompt + demand
+                ai_result = self.llm.product(chat_history + output_format + "\n-----input----\n" +  input_)
+                if push_patch:
+                    self.save_prompt_increment_version(prompt_id, chat_history,
+                                            use_case = input_,
+                                            score = 60,
+                                            session = session)
             else:
                 raise
 
@@ -536,3 +555,48 @@ class Intel():
             return wrapper
         return outer_packing
 
+    def biger(self,tasks):
+        """
+        编写以下任务
+        任务1 从输入文本中提取知识片段
+        任务2 将知识片段总结为知识点
+        任务3 将知识点添加标签
+        任务4 为知识点打分1-10分
+        """
+
+        system_prompt = """
+根据需求, 以这个为模板, 编写这个程序 
+
+from procraft.prompt_helper import Intel, IntellectType
+intels = Intel()
+
+task_1 = "素材提取-从文本中提取素材"
+
+class Varit(BaseModel):
+    material : str
+    protagonist: str
+
+task_2 = "素材提取-验证素材的正确性"
+
+class Varit2(BaseModel):
+    material : str
+    real : str
+
+result0 = "输入"
+
+result1 = await intels.aintellect_remove_format(input_data = result0,
+                                          OutputFormat = Varit,
+                                          prompt_id = task_1,
+                                          version = None,
+                                          inference_save_case = True)
+
+result2 = await intels.aintellect_remove_format(input_data = result1,
+                                          OutputFormat = Varit2,
+                                          prompt_id = task_2,
+                                          version = None,
+                                          inference_save_case = True)
+
+print(result2)
+
+"""
+        return self.llm.product(system_prompt + tasks)

pro_craft/prompt_helper_async.py

@@ -21,10 +21,15 @@ import inspect
 from pydantic import BaseModel, Field, ValidationError, field_validator
 from datetime import datetime
 from pro_craft.utils import extract_
+from json.decoder import JSONDecodeError
 logger = Log.logger
 editing_log = logger.debug
 import re
 
+from sqlalchemy import select, desc
+
+
+
 def fix_broken_json_string(broken_json_str):
     # 移除 BOM
     broken_json_str = broken_json_str.lstrip('\ufeff')
@@ -63,26 +68,16 @@ class AsyncIntel():
                 ):
         database_url = database_url or os.getenv("database_url")
         assert database_url
-        self.engine = create_engine(database_url, echo=False, # echo=True 仍然会打印所有执行的 SQL 语句
+    
+        # async_engine
+        self.async_engine = create_async_engine(database_url, echo=True,
                                     pool_size=10,        # 连接池中保持的连接数
                                     max_overflow=20,     # 当pool_size不够时，允许临时创建的额外连接数
                                     pool_recycle=3600,   # 每小时回收一次连接
                                     pool_pre_ping=True,  # 使用前检查连接活性
                                     pool_timeout=30      # 等待连接池中连接的最长时间（秒）
-                                    ) 
-
-        # async_engine
-        # self.async_engine = create_async_engine(database_url, echo=False,
-        #                             pool_size=10,        # 连接池中保持的连接数
-        #                             max_overflow=20,     # 当pool_size不够时，允许临时创建的额外连接数
-        #                             pool_recycle=3600,   # 每小时回收一次连接
-        #                             pool_pre_ping=True,  # 使用前检查连接活性
-        #                             pool_timeout=30      # 等待连接池中连接的最长时间（秒）
-        #                                    )
-
-
-        PromptBase.metadata.create_all(self.engine)
-        
+                                           )
+    
         if model_name in ["gemini-2.5-flash-preview-05-20-nothinking",]:
             self.llm = BianXieAdapter(model_name = model_name)
         elif model_name in ["doubao-1-5-pro-256k-250115",]:
@@ -91,18 +86,26 @@ class AsyncIntel():
             print('Use BianXieAdapter')
             self.llm = BianXieAdapter()
             
+    async def create_database(self):
+        async with self.async_engine.begin() as conn:
+            await conn.run_sync(PromptBase.metadata.create_all)
             
     async def _aget_latest_prompt_version(self,target_prompt_id,session):
         """
         获取指定 prompt_id 的最新版本数据，通过创建时间判断。
         """
-        
-        result = session.query(Prompt).filter(
+        stmt = select(Prompt).filter(
             Prompt.prompt_id == target_prompt_id
         ).order_by(
-            Prompt.timestamp.desc(),
-            Prompt.version.desc()
-        ).first()
+            desc(Prompt.timestamp), # 使用 sqlalchemy.desc() 来指定降序
+            desc(Prompt.version)    # 使用 sqlalchemy.desc() 来指定降序
+        )
+        
+        result = await session.execute(stmt)
+        # 3. 从 Result 对象中获取第一个模型实例
+        # .scalars() 用于从结果行中获取第一个列的值（这里是Prompt对象本身）
+        # .first() 获取第一个结果
+        result = result.scalars().first()
 
         if result:
             editing_log(f"找到 prompt_id '{target_prompt_id}' 的最新版本 (基于时间): {result.version}")
@@ -110,7 +113,6 @@ 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):
         """
         获取指定 prompt_id 和特定版本的数据。
@@ -125,16 +127,19 @@ class AsyncIntel():
             dict or None: 如果找到，返回包含 id, prompt_id, version, timestamp, prompt 字段的字典；
                         否则返回 None。
         """
+        stmt = select(Prompt).filter(
+        Prompt.prompt_id == target_prompt_id,
+        Prompt.version == target_version
+        )
+        result = await session.execute(stmt)
 
-        result = await session.query(Prompt).filter(
-            Prompt.prompt_id == target_prompt_id,
-            Prompt.version == target_version
-        ).first() # 因为 (prompt_id, version) 是唯一的，所以 first() 足够
-        if result:
+        specific_prompt = result.scalars().one_or_none()
+
+        if specific_prompt:
             editing_log(f"找到 prompt_id '{target_prompt_id}', 版本 '{target_version}' 的提示词数据。")
         else:
             editing_log(f"未找到 prompt_id '{target_prompt_id}', 版本 '{target_version}' 的提示词数据。")
-        return result
+        return specific_prompt
 
     async def aget_prompts_from_sql(self,
                              prompt_id: str,
@@ -191,7 +196,7 @@ class AsyncIntel():
                         )
 
         session.add(prompt1)
-        session.commit() # 提交事务，将数据写入数据库
+        await session.commit() # 提交事务，将数据写入数据库
 
     async def asave_use_case_by_sql(self,
                              prompt_id: str,
@@ -210,7 +215,7 @@ class AsyncIntel():
                         )
 
         session.add(use_case)
-        session.commit() # 提交事务，将数据写入数据库
+        await session.commit() # 提交事务，将数据写入数据库
 
     async def summary_to_sql(
             self,
@@ -297,8 +302,8 @@ class AsyncIntel():
         将打算修改的状态推上数据库 # 1
         """
         # 查看是否已经存在
-        # async with create_async_session(self.async_engine) as session:
-        with create_session(self.engine) as session:
+        async with create_async_session(self.async_engine) as session:
+
             latest_prompt = await self.aget_prompts_from_sql(prompt_id=prompt_id,session=session)
 
             await self.asave_prompt_increment_version(prompt_id=latest_prompt.prompt_id,
@@ -320,15 +325,15 @@ class AsyncIntel():
                     prompt_id: str,
                     version: str = None,
                     inference_save_case = True,
+                    push_patch = False,
                     ):
         if isinstance(input_data,dict):
             input_ = json.dumps(input_data,ensure_ascii=False)
         elif isinstance(input_data,str):
             input_ = input_data
-
         
         # 查数据库, 获取最新提示词对象
-        with create_session(self.engine) as session:
+        async with create_async_session(self.async_engine) as session:
             result_obj = await self.aget_prompts_from_sql(prompt_id=prompt_id,session=session)
 
 
@@ -402,12 +407,23 @@ class AsyncIntel():
                                             session = session
                                             )
                 ai_result = await self.llm.aproduct(prompt + output_format + "\n-----input----\n" +  input_)
-            elif result_obj.action_type == "devide":
-                pass
+            elif result_obj.action_type == "patch":
+                
+                demand = result_obj.demand
+                assert demand
+
+                chat_history = prompt + demand
+                ai_result = await self.llm.aproduct(chat_history + output_format + "\n-----input----\n" +  input_)
+
+                if push_patch:
+                    self.save_prompt_increment_version(prompt_id, chat_history,
+                                            use_case = input_,
+                                            score = 60,
+                                            session = session)
+
             else:
                 raise
 
-
         return ai_result
     
     async def aintellect_stream_remove(self,
@@ -416,6 +432,7 @@ class AsyncIntel():
                     prompt_id: str,
                     version: str = None,
                     inference_save_case = True,
+                    push_patch = False,
                     ):
         if isinstance(input_data,dict):
             input_ = json.dumps(input_data,ensure_ascii=False)
@@ -424,7 +441,7 @@ class AsyncIntel():
 
         
         # 查数据库, 获取最新提示词对象
-        with create_session(self.engine) as session:
+        with create_session(self.async_engine) as session:
             result_obj = await self.aget_prompts_from_sql(prompt_id=prompt_id,session=session)
 
             '''
@@ -519,8 +536,22 @@ class AsyncIntel():
                     ai_result += word
                     yield word
 
-            elif result_obj.action_type == "devide":
-                pass
+            elif result_obj.action_type == "patch":
+                
+                demand = result_obj.demand
+                assert demand
+
+                chat_history = prompt + demand
+                ai_generate_result = self.llm.aproduct_stream(chat_history + output_format + "\n-----input----\n" +  input_)
+                ai_result = ""
+                async for word in ai_generate_result:
+                    ai_result += word
+                    yield word
+                if push_patch:
+                    self.save_prompt_increment_version(prompt_id, chat_history,
+                                            use_case = input_,
+                                            score = 60,
+                                            session = session)
             else:
                 raise
 
@@ -556,6 +587,13 @@ class AsyncIntel():
             # json_str = fix_broken_json_string(json_str)
             ai_result = json.loads(json_str)
             OutputFormat(**ai_result)
+        except JSONDecodeError as e:
+            logger.error(f"json 解析出现错误: {e}")
+            logger.error(f"尝试补救")
+            json_str = fix_broken_json_string(json_str)
+            ai_result = json.loads(json_str)
+            OutputFormat(**ai_result)
+
         except ValidationError as e:
             log_ = "记忆卡片合并 - 大模型生成的格式未通过校验"
             logger.error(log_)

pro_craft/utils.py

@@ -150,7 +150,7 @@ async def create_async_session(async_engine):
     session = Session()
     try:
         yield session
-        await session.commit() # 在成功的情况下自动提交事务
+        # await session.commit() # 在成功的情况下自动提交事务
 
     except Exception as e:
         print(f"An error occurred: {e}")

{pro_craft-0.1.8.dist-info → pro_craft-0.1.10.dist-info}/METADATA

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.8
+Version: 0.1.10
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
+Requires-Dist: aiomysql>=0.2.0
 Requires-Dist: anyio>=4.11.0
 Requires-Dist: db-help>=0.2.2
 Requires-Dist: fastapi>=0.119.0

{pro_craft-0.1.8.dist-info → pro_craft-0.1.10.dist-info}/RECORD

@@ -4,10 +4,10 @@ pro_craft/designer.py,sha256=3gyCqrjcw61sHzDjUPKhL1LOAE8xWLLbNT8NlK2mFLc,4739
 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=SFIhju0Y3rRdb-T1WocUgz7qCocq1Ja2zlaEZo1RM3o,23832
-pro_craft/prompt_helper_async.py,sha256=z0W4uDoxqCSBYlKtkXU1l_E1TUFz_9wMUWhV0rAGhNo,26408
+pro_craft/prompt_helper.py,sha256=1EDGP2sKoUCrLXiR0kD2AqzT9LcFYWO8S2FyaZlBoxc,26150
+pro_craft/prompt_helper_async.py,sha256=Ej0JXwev0FmPSoOE5iEXtZxQ3pXoqcaulyyUuC7WyC4,27859
 pro_craft/server.py,sha256=fPAosQIU0d7gxICiALl8u6QwbLI4cawVFyoRYebRES0,2827
-pro_craft/utils.py,sha256=27A3CFhbRsEAP5GY6oxAz2M-beiIuPgCNSjQUyzOVW0,5685
+pro_craft/utils.py,sha256=cpvwk68mD9hYY8WCq2JXzfrrXqpshiscz_OSav4tC7U,5687
 pro_craft/code_helper/coder.py,sha256=NXglF1KiPtGe4HZN0MZvFJ8p9Iyd5kzIt72DQGgRwXA,24715
 pro_craft/server/__main__.py,sha256=LDTERPMe7RKj3eifVRo9aO9fNXdd16W5Hzr1APd04T0,4227
 pro_craft/server/models.py,sha256=CiUK8e73Bl7fo7ZbnwNTLYLeD4pb1fHMzWR13d3Y6vs,112
@@ -17,7 +17,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.8.dist-info/METADATA,sha256=i7V4hsLUgvdbdeFGW4FqsnqqxPMY9Hb6JjU6g4_7O0s,1768
-pro_craft-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pro_craft-0.1.8.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
-pro_craft-0.1.8.dist-info/RECORD,,
+pro_craft-0.1.10.dist-info/METADATA,sha256=d0eKMauNY8YEx9A8ZAtIvGXEVYTER04UwYCscH7ifHY,1800
+pro_craft-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pro_craft-0.1.10.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
+pro_craft-0.1.10.dist-info/RECORD,,