pro-craft 0.1.35__tar.gz → 0.1.36__tar.gz

{pro_craft-0.1.35 → pro_craft-0.1.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.35
+Version: 0.1.36
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -9,6 +9,7 @@ Requires-Dist: anyio>=4.11.0
 Requires-Dist: db-help>=0.2.2
 Requires-Dist: fastapi>=0.119.0
 Requires-Dist: llmada>=1.1.11
+Requires-Dist: plotly>=6.3.1
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: toml>=0.10.2
 Requires-Dist: utils-tool==0.1.3

{pro_craft-0.1.35 → pro_craft-0.1.36}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "pro-craft"
-version = "0.1.35"
+version = "0.1.36"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"
-dependencies = [ "aiomysql>=0.2.0", "anyio>=4.11.0", "db-help>=0.2.2", "fastapi>=0.119.0", "llmada>=1.1.11", "pyyaml>=6.0.3", "toml>=0.10.2", "utils-tool==0.1.3", "uvicorn>=0.38.0",]
+dependencies = [ "aiomysql>=0.2.0", "anyio>=4.11.0", "db-help>=0.2.2", "fastapi>=0.119.0", "llmada>=1.1.11", "plotly>=6.3.1", "pyyaml>=6.0.3", "toml>=0.10.2", "utils-tool==0.1.3", "uvicorn>=0.38.0",]
 
 [tool.setuptools.package-data]
 pro_craft = [ "config.yaml",]

pro_craft-0.1.36/src/pro_craft/__init__.py

@@ -0,0 +1,18 @@
+
+
+
+from dotenv import load_dotenv, find_dotenv
+
+dotenv_path = find_dotenv()
+load_dotenv(".env", override=True)
+
+from .log import Log
+import logging
+Log_ = Log(console_level = logging.WARNING, # 显示控制台的等级
+             log_file_name="app.log")
+logger = Log_.logger
+Log_.set_super_log(logger.critical) # 控制superlog 打印的等级 默认是最高级单独存储一个文件
+super_log = Log_.super_log # 调试工具
+inference_save_case = False
+
+from .prompt_craft import AsyncIntel, Intel, IntelNew

{pro_craft-0.1.35 → pro_craft-0.1.36}/src/pro_craft/log.py

@@ -12,6 +12,7 @@ class Log:
     def __init__(self, console_level = logging.INFO, log_file_name="app.log"):
         self.Console_LOG_LEVEL = console_level
         self.log_file_name = log_file_name
+        os.makedirs("logs", exist_ok=False)
         self.LOG_FILE_PATH = os.path.join("logs", log_file_name)
         self.logger = self.get_logger()
         self.super_log_level = self.logger.critical
@@ -60,23 +61,22 @@ class Log:
             )
             file_handler_debug.setLevel(logging.WARNING)  # 文件中显示所有指定级别的日志
             file_handler_debug.setFormatter(formatter)
-            logger.addHandler(file_handler_debug)
+
+            file_handler_cri = RotatingFileHandler(
+                self.LOG_FILE_PATH.replace('.log','_slog.log'),
+                maxBytes=5 * 1024 * 1024,  # 10 MB
+                backupCount=5,
+                encoding="utf-8",
+            )
+            file_handler_cri.setLevel(logging.CRITICAL)  # 文件中显示所有指定级别的日志
+            file_handler_cri.setFormatter(formatter)
+            logger.addHandler(file_handler_cri)
         return logger
     
     def set_super_log(self,logger_info):
         self.super_log_level = logger_info
 
-    def super_log(self,s, target: str = "target"):
-        COLOR_RED = "\033[91m"
-        COLOR_GREEN = "\033[92m"
-        COLOR_YELLOW = "\033[93m"
-        COLOR_BLUE = "\033[94m"
-        COLOR_RESET = "\033[0m" # 重置颜色
-        log_ = self.super_log_level
-
-        log_("\n"+f"{COLOR_GREEN}=={COLOR_RESET}" * 50)
-        log_(target + "\n       "+"--" * 40)
-        log_(type(s))
-        log_(s)
-        log_("\n"+f"{COLOR_GREEN}=={COLOR_RESET}" * 50)
+    def super_log(self,s, target: str = "target",logger = None):
+        logger = logger or self.super_log_level
+        logger("\n" + "=="*25 + target +"=="*25 +   f"\n   type:  {str(type(s))}" + f"\ncontent:  {s}")
 

{pro_craft-0.1.35 → pro_craft-0.1.36}/src/pro_craft/prompt_craft/async_.py

@@ -28,25 +28,11 @@ from sqlalchemy.orm import class_mapper # 用于检查对象是否是持久化
 import tqdm
 from tqdm.asyncio import tqdm
 import pandas as pd
+import plotly.graph_objects as go
+from pro_craft import super_log
 
-class IntellectRemoveFormatError(Exception):
-    pass
-
-class IntellectRemoveError(Exception):
-    pass
+BATCH_SIZE = int(os.getenv("DATABASE_SYNC_BATCH_SIZE",100))
 
-BATCH_SIZE = 100
-MIN_SUCCESS_RATE = 00.0 # 这里定义通过阈值, 高于该比例则通过
-
-
-def slog(s, target: str = "target",logger = None):
-    COLOR_GREEN = "\033[92m"
-    COLOR_RESET = "\033[0m" # 重置颜色
-    logger("\n"+f"{COLOR_GREEN}=={COLOR_RESET}" * 50)
-    logger(target + "\n       "+"--" * 40)
-    logger(type(s))
-    logger(s)
-    logger("\n"+f"{COLOR_GREEN}=={COLOR_RESET}" * 50)
 
 def fix_broken_json_string(broken_json_str):
     # 移除 BOM
@@ -73,27 +59,6 @@ def fix_broken_json_string(broken_json_str):
 
     return fixed_json_str
 
-
-# def get_last_sync_time(target_session) -> datetime:
-#     """从目标数据库获取上次同步时间"""
-#     metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="sync_metadata").first()
-#     if metadata_entry:
-#         return metadata_entry.last_sync_time
-#     return datetime(1970, 1, 1) # 默认一个很早的时间
-
-# def update_last_sync_time(target_session, new_sync_time: datetime):
-#     """更新目标数据库的上次同步时间"""
-#     metadata_entry = target_session.query(SyncMetadata).filter_by(table_name="sync_metadata").first()
-#     if metadata_entry:
-#         metadata_entry.last_sync_time = new_sync_time
-#     else:
-#         # 如果不存在，则创建
-#         new_metadata = SyncMetadata(table_name="sync_metadata", last_sync_time=new_sync_time)
-#         target_session.add(new_metadata)
-#     target_session.commit()
-#     print(f"Updated last sync time to: {new_sync_time}")
-
-
 async def get_last_sync_time(target_session: AsyncSession) -> datetime:
     """从目标数据库获取上次同步时间"""
     # 修正点：使用 select() 和 execute()
@@ -106,10 +71,6 @@ async def get_last_sync_time(target_session: AsyncSession) -> datetime:
         return metadata_entry.last_sync_time
     return datetime(1970, 1, 1) # 默认一个很早的时间
 
-
-# from your_module import SyncMetadata # 假设 SyncMetadata 已导入
-# from sqlalchemy import select # 确保引入 select
-
 async def update_last_sync_time(target_session: AsyncSession, new_sync_time: datetime):
     """更新目标数据库的上次同步时间"""
     # 修正点：使用 select() 和 execute()
@@ -129,8 +90,14 @@ async def update_last_sync_time(target_session: AsyncSession, new_sync_time: dat
     await target_session.commit() # TODO
     print(f"Updated last sync time to: {new_sync_time}")
 
+class IntellectRemoveFormatError(Exception):
+    pass
 
+class IntellectRemoveError(Exception):
+    pass
 
+class ModelNameError(Exception):
+    pass
 
 
 
@@ -151,7 +118,7 @@ class AsyncIntel():
             assert database_url
             assert 'aio' in database_url
         except AssertionError as e:
-            slog(database_url,'database_url',logger=self.logger.warning)
+            super_log(database_url,'database_url',logger=self.logger.warning)
             raise IntellectRemoveFormatError(f"异步服务url必须提供, 且必须是aiomysql配置") from e
 
         self.engine = create_async_engine(database_url, echo=False,
@@ -162,16 +129,16 @@ class AsyncIntel():
                                     pool_timeout=30      # 等待连接池中连接的最长时间（秒）
                                            )
 
-        if model_name in ["gemini-2.5-flash-preview-05-20-nothinking",]:
+        if "gemini" in model_name:
             self.llm = BianXieAdapter(model_name = model_name)
-        elif model_name in ["doubao-1-5-pro-256k-250115","doubao-1-5-pro-32k-250115"]:
+        elif "doubao" in model_name:
             self.llm = ArkAdapter(model_name = model_name)
         else:
-            raise Exception("error llm name")
-        
-        self.df = pd.DataFrame({"name":[],'status':[],"score":[],"total":[],"bad_case":[]})
+            raise ModelNameError("AsyncIntel init get error model_name from zxf")
+
+        self.eval_df = pd.DataFrame({"name":[],'status':[],"score":[],"total":[],"bad_case":[]})
             
-    async def create_specific_database(self):
+    async def create_main_database(self):
         tables_to_create_names = ["ai_prompts","ai_usecase"]
         async with self.engine.begin() as conn:
             # 从 metadata 中获取对应的 Table 对象
@@ -190,51 +157,31 @@ class AsyncIntel():
     async def create_database(self,engine):
         async with engine.begin() as conn:
             await conn.run_sync(PromptBase.metadata.create_all)
-            
-    async def _get_latest_prompt_version(self,target_prompt_id,session):
+
+    async def get_prompt(self,prompt_id,version,session):
         """
         获取指定 prompt_id 的最新版本数据，通过创建时间判断。
         """
-        stmt = select(Prompt).filter(
-            Prompt.prompt_id == target_prompt_id
-        ).order_by(
-            desc(Prompt.timestamp), # 使用 sqlalchemy.desc() 来指定降序
-            desc(Prompt.version)    # 使用 sqlalchemy.desc() 来指定降序
-        )
-        
+        if version:
+            stmt_ = select(Prompt).filter(
+                Prompt.prompt_id == prompt_id,
+                Prompt.version == version
+            )
+        else:  
+            stmt_ = select(Prompt).filter(
+                Prompt.prompt_id == prompt_id,
+            )
+        stmt = stmt_.order_by(
+                desc(Prompt.timestamp), # 使用 sqlalchemy.desc() 来指定降序
+                desc(Prompt.version)    # 使用 sqlalchemy.desc() 来指定降序
+            )
+
         result = await session.execute(stmt)
-        # 3. 从 Result 对象中获取第一个模型实例
-        # .scalars() 用于从结果行中获取第一个列的值（这里是Prompt对象本身）
-        # .first() 获取第一个结果
         result = result.scalars().first()
 
         return result
 
-    async def _get_specific_prompt_version(self,target_prompt_id, target_version,session):
-        """
-        获取指定 prompt_id 和特定版本的数据。
-
-        Args:
-            target_prompt_id (str): 目标提示词的唯一标识符。
-            target_version (int): 目标提示词的版本号。
-            table_name (str): 存储提示词数据的数据库表名。
-            db_manager (DBManager): 数据库管理器的实例，用于执行查询。
-
-        Returns:
-            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)
-
-        specific_prompt = result.scalars().one_or_none()
-
-        return specific_prompt
-
-    async def sync_prompt_data_to_database(self,database_url:str):
+    async def sync_production_database(self,database_url:str):
         target_engine = create_async_engine(database_url, echo=False)
         await self.create_database(target_engine) 
         async with create_async_session(self.engine) as source_session:
@@ -328,24 +275,23 @@ class AsyncIntel():
                     print("No new records to sync.")
 
 
-    async def get_prompts_from_sql(self,
+    async def get_prompt_safe(self,
                              prompt_id: str,
                              version = None,
                              session = None) -> Prompt:
         """
         从sql获取提示词
         """
-        # 查看是否已经存在
-        if version:
-            prompts_obj = await self._get_specific_prompt_version(prompt_id,version,session=session)
-            if not prompts_obj:
-                prompts_obj = await self._get_latest_prompt_version(prompt_id,session = session)
-        else:
-            prompts_obj = await self._get_latest_prompt_version(prompt_id,session = session)     
-        return prompts_obj
+        prompt_obj = await self.get_prompt(prompt_id=prompt_id,version=version,session=session)
+        if prompt_obj:
+            return prompt_obj
+
+        print("warnning 未找到制定版本, 默认使用最新版本")
+        prompt_obj = await self.get_prompt(prompt_id=prompt_id,version=None,session=session)
+        return prompt_obj
+
         
-            
-    async def save_prompt_increment_version(self,
+    async def save_prompt(self,
                            prompt_id: str,
                            new_prompt: str,
                            use_case:str = "",
@@ -358,7 +304,7 @@ class AsyncIntel():
         input_data 指的是输入用例, 可以为空
         """
         # 查看是否已经存在
-        prompts_obj = await self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
+        prompts_obj = await self.get_prompt_safe(prompt_id=prompt_id,session=session)
 
         if prompts_obj:
             # 如果存在版本加1
@@ -385,7 +331,7 @@ class AsyncIntel():
         session.add(prompt1)
         await session.commit() # 提交事务，将数据写入数据库
 
-    async def get_use_case_by_sql(self,
+    async def get_use_case(self,
                              target_prompt_id: str,
                              session = None
                             ):
@@ -400,7 +346,7 @@ class AsyncIntel():
         use_case = result.scalars().all()
         return use_case
 
-    async def save_use_case_by_sql(self,
+    async def save_use_case(self,
                              prompt_id: str,
                              use_case:str = "",
                              timestamp = "",
@@ -414,7 +360,7 @@ class AsyncIntel():
         从sql保存提示词
         """
         #TODO 存之前保证数据库中相同的prompt_id中没有重复的use_case
-        use_cases = await self.get_use_case_by_sql(target_prompt_id = prompt_id,
+        use_cases = await self.get_use_case(target_prompt_id = prompt_id,
                                   session = session)
         for use_case_old in use_cases:
             if use_case == use_case_old.use_case:
@@ -432,86 +378,8 @@ class AsyncIntel():
         session.add(use_case)
         await session.commit() # 提交事务，将数据写入数据库
 
-    async def summary_to_sql(
-            self,
-            prompt_id:str,
-            version = None,
-            prompt = "",
-            session = None
-        ):
-        """
-        让大模型微调已经存在的 system_prompt
-        """
-        system_prompt_created_prompt = """        
-很棒, 我们已经达成了某种默契, 我们之间合作无间, 但是, 可悲的是, 当我关闭这个窗口的时候, 你就会忘记我们之间经历的种种磨合, 这是可惜且心痛的, 所以你能否将目前这一套处理流程结晶成一个优质的prompt 这样, 我们下一次只要将prompt输入, 你就能想起我们今天的磨合过程,
-对了,我提示一点, 这个prompt的主角是你, 也就是说, 你在和未来的你对话, 你要教会未来的你今天这件事, 是否让我看懂到时其次
-
-只要输出提示词内容即可, 不需要任何的说明和解释
-"""
-        system_result = await self.llm.aproduct(prompt + system_prompt_created_prompt)
-
-        s_prompt = extract_(system_result,pattern_key=r"prompt")
-        chat_history = s_prompt or system_result
-        await self.save_prompt_increment_version(prompt_id,
-                                new_prompt = chat_history,
-                                use_case = "",
-                                score = 60,
-                                session = session)
-        
-    async def prompt_finetune_to_sql(
-            self,
-            prompt_id:str,
-            version = None,
-            demand: str = "",
-            session = None,
-        ):
-        """
-        让大模型微调已经存在的 system_prompt
-        """
-        change_by_opinion_prompt = """
-你是一个资深AI提示词工程师，具备卓越的Prompt设计与优化能力。
-我将为你提供一段现有System Prompt。你的核心任务是基于这段Prompt进行修改，以实现我提出的特定目标和功能需求。
-请你绝对严格地遵循以下原则：
- 极端最小化修改原则（核心）：
- 在满足所有功能需求的前提下，只进行我明确要求的修改。
- 即使你认为有更“优化”、“清晰”或“简洁”的表达方式，只要我没有明确要求，也绝不允许进行任何未经指令的修改。
- 目的就是尽可能地保留原有Prompt的字符和结构不变，除非我的功能要求必须改变。
- 例如，如果我只要求你修改一个词，你就不应该修改整句话的结构。
- 严格遵循我的指令：
- 你必须精确地执行我提出的所有具体任务和要求。
- 绝不允许自行添加任何超出指令范围的说明、角色扮演、约束条件或任何非我指令要求的内容。
- 保持原有Prompt的风格和语调：
- 尽可能地与现有Prompt的语言风格、正式程度和语调保持一致。
- 不要改变不相关的句子或其表达方式。
- 只提供修改后的Prompt：
- 直接输出修改后的完整System Prompt文本。
- 不要包含任何解释、说明或额外对话。
- 在你开始之前，请务必确认你已理解并能绝对严格地遵守这些原则。任何未经明确指令的改动都将视为未能完成任务。
-
-现有System Prompt:
-{old_system_prompt}
-
-功能需求:
-{opinion}
-"""
-
-        prompt_ = await self.get_prompts_from_sql(prompt_id = prompt_id,version = version,
-                                                    session=session)
-        if demand:
-            new_prompt = await self.llm.aproduct(
-                change_by_opinion_prompt.format(old_system_prompt=prompt_.prompt, opinion=demand)
-            )
-        else:
-            new_prompt = prompt_
-        await self.save_prompt_increment_version(prompt_id = prompt_id,
-                            new_prompt = new_prompt,
-                            use_case = "",
-                            score = 60,
-                            session = session)
-
-
     async def push_action_order(self,demand : str,prompt_id: str,
-                         action_type = 'train'):
+                         action_type = 'train'):# init
 
         """
         从sql保存提示词
@@ -522,9 +390,9 @@ class AsyncIntel():
         # 查看是否已经存在
         async with create_async_session(self.engine) as session:
 
-            latest_prompt = await self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
+            latest_prompt = await self.get_prompt_safe(prompt_id=prompt_id,session=session)
             if latest_prompt:
-                await self.save_prompt_increment_version(prompt_id=latest_prompt.prompt_id,
+                await self.save_prompt(prompt_id=latest_prompt.prompt_id,
                                     new_prompt = latest_prompt.prompt,
                                     use_case = latest_prompt.use_case,
                                     action_type=action_type,
@@ -534,9 +402,9 @@ class AsyncIntel():
                                     )
                 return "success"
             else:
-                await self.save_prompt_increment_version(prompt_id=prompt_id,
+                await self.save_prompt(prompt_id=prompt_id,
                                     new_prompt = demand,
-                                    use_case = "init",
+                                    use_case = "",
                                     action_type="inference",
                                     demand=demand,
                                     score=60,
@@ -545,8 +413,7 @@ class AsyncIntel():
                 return "init"
 
 
-
-    async def intellect_remove(self,
+    async def intellect(self,
                     input_data: dict | str,
                     output_format: str,
                     prompt_id: str,
@@ -561,7 +428,7 @@ class AsyncIntel():
         
         # 查数据库, 获取最新提示词对象
         async with create_async_session(self.engine) as session:
-            result_obj = await self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
+            result_obj = await self.get_prompt_safe(prompt_id=prompt_id,session=session)
             if result_obj is None:
                 raise IntellectRemoveError("不存在的prompt_id")
 
@@ -570,7 +437,8 @@ class AsyncIntel():
                 # 直接推理即可
                 ai_result = await self.llm.aproduct(prompt + output_format + "\nuser:" +  input_)
                 if inference_save_case:
-                    await self.save_use_case_by_sql(prompt_id,
+                    # 设计一个机制, 传输说获取300数据, 那么数据就一直流转获取, 知道300截止
+                    await self.save_use_case(prompt_id,
                                         use_case = input_,
                                         timestamp = datetime.now(),
                                         output = ai_result,
@@ -584,9 +452,6 @@ class AsyncIntel():
                 # 则训练推广
 
                 # 新版本 默人修改会 inference 状态
-                chat_history = prompt
-                before_input = result_obj.use_case
-                demand = result_obj.demand
             
 
                 # assert demand
@@ -601,7 +466,7 @@ class AsyncIntel():
             
                 # 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,
+                # await self.save_prompt(prompt_id, chat_history,
                 #                         use_case = input_,
                 #                         score = 60,
                 #                         session = session)
@@ -619,14 +484,17 @@ class AsyncIntel():
                 # save_new_prompt = new_prompt + "\nassistant:\n" + ai_result
 
 
-                # await self.save_prompt_increment_version(
+                # await self.save_prompt(
                 #     prompt_id, 
                 #     new_prompt=save_new_prompt,
                 #     use_case = input_,
                 #     action_type = "inference",
                 #     score = 60,
                 #     session = session)
-                
+                chat_history = prompt
+                before_input = result_obj.use_case
+                demand = result_obj.demand
+                input_data = input_
                 if before_input == "" or change_case is True:
                     result_obj.use_case = input_
                     await session.commit()
@@ -641,7 +509,7 @@ class AsyncIntel():
                 save_new_prompt = new_prompt + "\nassistant:\n" + ai_result
 
 
-                await self.save_prompt_increment_version(
+                await self.save_prompt(
                     prompt_id, 
                     new_prompt=save_new_prompt,
                     use_case = input_,
@@ -650,42 +518,118 @@ class AsyncIntel():
                     session = session)
     
             elif result_obj.action_type == "summary":
+                system_prompt_summary = """        
+很棒, 我们已经达成了某种默契, 我们之间合作无间, 但是, 可悲的是, 当我关闭这个窗口的时候, 你就会忘记我们之间经历的种种磨合, 这是可惜且心痛的, 所以你能否将目前这一套处理流程结晶成一个优质的prompt 这样, 我们下一次只要将prompt输入, 你就能想起我们今天的磨合过程,
+对了,我提示一点, 这个prompt的主角是你, 也就是说, 你在和未来的你对话, 你要教会未来的你今天这件事, 是否让我看懂到时其次
+
+只要输出提示词内容即可, 不需要任何的说明和解释
+"""
+                
+                latest_prompt = await self.get_prompt_safe(prompt_id=prompt_id,session=session)
+
+                system_result = await self.llm.aproduct(prompt + system_prompt_summary)
+                s_prompt = extract_(system_result,pattern_key=r"prompt")
+                new_prompt = s_prompt or system_result
+                await self.save_prompt(
+                    prompt_id,
+                    new_prompt = new_prompt,
+                    use_case = latest_prompt.use_case,
+                    score = 65,
+                    action_type = "inference",
+                    session = session
+                    )
 
-                await self.summary_to_sql(prompt_id = prompt_id,
-                            prompt = prompt,
-                            session = session
-                            )
                 ai_result = await self.llm.aproduct(prompt + output_format + "\nuser:" +  input_)
 
             elif result_obj.action_type == "finetune":
                 demand = result_obj.demand
-            
+                change_by_opinion_prompt = """
+你是一个资深AI提示词工程师，具备卓越的Prompt设计与优化能力。
+我将为你提供一段现有System Prompt。你的核心任务是基于这段Prompt进行修改，以实现我提出的特定目标和功能需求。
+请你绝对严格地遵循以下原则：
+极端最小化修改原则（核心）：
+在满足所有功能需求的前提下，只进行我明确要求的修改。
+即使你认为有更“优化”、“清晰”或“简洁”的表达方式，只要我没有明确要求，也绝不允许进行任何未经指令的修改。
+目的就是尽可能地保留原有Prompt的字符和结构不变，除非我的功能要求必须改变。
+例如，如果我只要求你修改一个词，你就不应该修改整句话的结构。
+严格遵循我的指令：
+你必须精确地执行我提出的所有具体任务和要求。
+绝不允许自行添加任何超出指令范围的说明、角色扮演、约束条件或任何非我指令要求的内容。
+保持原有Prompt的风格和语调：
+尽可能地与现有Prompt的语言风格、正式程度和语调保持一致。
+不要改变不相关的句子或其表达方式。
+只提供修改后的Prompt：
+直接输出修改后的完整System Prompt文本。
+不要包含任何解释、说明或额外对话。
+在你开始之前，请务必确认你已理解并能绝对严格地遵守这些原则。任何未经明确指令的改动都将视为未能完成任务。
+
+现有System Prompt:
+{old_system_prompt}
+
+功能需求:
+{opinion}
+"""
+
+                latest_prompt = await self.get_prompt_safe(prompt_id=prompt_id,session=session)
+                prompt_ = await self.get_prompt_safe(prompt_id = prompt_id,version = version,
+                                                                session=session)
                 assert demand
-                await self.prompt_finetune_to_sql(prompt_id = prompt_id,
-                                            demand = demand,
-                                            session = session
-                                            )
+                
+                if demand:
+                        new_prompt = await self.llm.aproduct(
+                            change_by_opinion_prompt.format(old_system_prompt=prompt_.prompt, opinion=demand)
+                        )
+                else:
+                    new_prompt = prompt_ 
+                await self.save_prompt(
+                    prompt_id,
+                    new_prompt = new_prompt,
+                    use_case = latest_prompt.use_case,
+                    score = 70,
+                    action_type = "inference",
+                    session = session
+                    )
+                
                 ai_result = await self.llm.aproduct(prompt + output_format + "\nuser:" +  input_)
 
             elif result_obj.action_type == "patch":
                 demand = result_obj.demand
                 assert demand
+                latest_prompt = await self.get_prompt_safe(prompt_id=prompt_id,session=session)
+                
                 chat_history = prompt + demand
+                await self.save_prompt(prompt_id, 
+                                chat_history,
+                                use_case = latest_prompt.use_case,
+                                score = 70,
+                                action_type = "inference",
+                                session = session)
+                
                 ai_result = await self.llm.aproduct(chat_history + output_format + "\nuser:" +  input_)
-                self.save_prompt_increment_version(prompt_id, 
-                                                   chat_history,
-                                                    use_case = input_,
-                                                    score = 60,
-                                                    session = session)
-
+                
+            elif result_obj.action_type.startswith("to:"):
+                target_version = result_obj.action_type.split(":")[-1]
+                latest_prompt = await self.get_prompt_safe(prompt_id=prompt_id,session=session)
+                prompt_obj = await self.get_prompt_safe(prompt_id=prompt_id,
+                                     version=target_version,
+                                     session=session)
+                
+                await self.save_prompt(prompt_id, 
+                                prompt_obj.prompt,
+                                use_case = latest_prompt.use_case,
+                                score = prompt_obj.score,
+                                action_type = "inference",
+                                session = session)
+                ai_result = await self.llm.aproduct(prompt_obj.prompt + output_format + "\nuser:" +  input_)
+                
             else:
                 raise
 
         return ai_result
         
-    async def intellect_remove_format(self,
+    async def intellect_format(self,
                     input_data: dict | str,
-                    OutputFormat: object,
+                    OutputFormat: object | None,
                     prompt_id: str,
                     ExtraFormats: list[object] = [],
                     version: str = None,
@@ -699,9 +643,11 @@ class AsyncIntel():
 "```json([\s\S]*?)```"
 使用以下方式验证
 """
-        output_format = base_format_prompt + "\n".join([inspect.getsource(outputformat) for outputformat in ExtraFormats]) + inspect.getsource(OutputFormat)
-
-        ai_result = await self.intellect_remove(
+        if OutputFormat:
+            output_format = base_format_prompt + "\n".join([inspect.getsource(outputformat) for outputformat in ExtraFormats]) + inspect.getsource(OutputFormat)
+        else:
+            output_format = ""
+        ai_result = await self.intellect(
                     input_data=input_data,
                     output_format=output_format,
                     prompt_id=prompt_id,
@@ -711,17 +657,17 @@ class AsyncIntel():
 
         try:
             json_str = extract_(ai_result,r'json')
-            # json_str = fix_broken_json_string(json_str)
             ai_result = json.loads(json_str)
-            OutputFormat(**ai_result)
+            if OutputFormat:
+                OutputFormat(**ai_result)
 
         except JSONDecodeError as e:
-            slog(ai_result,logger=self.logger.error)
             try:
                 self.logger.error(f"尝试补救")
                 json_str = fix_broken_json_string(json_str)
                 ai_result = json.loads(json_str)
-                OutputFormat(**ai_result)
+                if OutputFormat:
+                    OutputFormat(**ai_result)
 
             except JSONDecodeError as e:
                 raise IntellectRemoveFormatError(f"prompt_id: {prompt_id} 生成的内容为无法被Json解析 {e}") from e
@@ -732,19 +678,10 @@ class AsyncIntel():
 
         except Exception as e:
             raise Exception(f"Error {prompt_id} : {e}") from e
-        
-        # finally:
-        #     await self.save_use_case_by_sql(prompt_id,
-        #             use_case = input_data,
-        #             timestamp = datetime.now(),
-        #             output = ai_result,
-        #             solution = output_format,
-        #             faired_time = 1,
-        #             session = session,
-        #             )
+
         return ai_result
     
-    async def intellect_remove_formats(self,
+    async def intellect_formats(self,
                     input_datas: list[dict | str],
                     OutputFormat: object,
                     prompt_id: str,
@@ -754,7 +691,7 @@ class AsyncIntel():
                     ):
                 
         async with create_async_session(self.engine) as session:
-            prompt_result = await self.get_prompts_from_sql(prompt_id=prompt_id,
+            prompt_result = await self.get_prompt_safe(prompt_id=prompt_id,
                                                                    session=session)
             if prompt_result is None:
                 raise IntellectRemoveError("不存在的prompt_id")
@@ -763,7 +700,7 @@ class AsyncIntel():
         tasks = []
         for input_data in input_datas:
             tasks.append(
-                self.intellect_remove_format(
+                self.intellect_format(
                     input_data = input_data,
                     prompt_id = prompt_id,
                     OutputFormat = OutputFormat,
@@ -775,7 +712,7 @@ class AsyncIntel():
         results = await asyncio.gather(*tasks, return_exceptions=False)
         return results
     
-    def intellect_remove_warp(self,prompt_id: str):
+    def intellect_warp(self,prompt_id: str):
         def outer_packing(func):
             @functools.wraps(func)
             async def wrapper(*args, **kwargs):
@@ -790,7 +727,7 @@ class AsyncIntel():
                 elif isinstance(input_data,str):
                     input_ = output_ = input_data
 
-                output_ = await self.intellect_remove_format(
+                output_ = await self.intellect_format(
                         input_data = input_data,
                         prompt_id = prompt_id,
                         OutputFormat = OutputFormat,
@@ -803,7 +740,7 @@ class AsyncIntel():
             return wrapper
         return outer_packing
 
-    async def intellect_remove_format_eval(self,
+    async def intellect_format_eval(self,
                     OutputFormat: object,
                     prompt_id: str,
                     ExtraFormats: list[object] = [],
@@ -811,10 +748,14 @@ class AsyncIntel():
                     MIN_SUCCESS_RATE = 80.0,
                     ConTent_Function = None,
                     ):
-        
+        """
+        ConTent_Function: 
+        # TODO 人类评价 eval
+        # TODO llm 评价 eval
+        """
         async with create_async_session(self.engine) as session:
-            use_cases = await self.get_use_case_by_sql(target_prompt_id=prompt_id,session=session)
-            prompt_result = await self.get_prompts_from_sql(prompt_id=prompt_id,
+            use_cases = await self.get_use_case(target_prompt_id=prompt_id,session=session)
+            prompt_result = await self.get_prompt_safe(prompt_id=prompt_id,
                                                                    session=session)
             if prompt_result is None:
                 raise IntellectRemoveError("不存在的prompt_id")
@@ -828,7 +769,7 @@ class AsyncIntel():
             async def evals_func(use_case,prompt_id,OutputFormat,ExtraFormats,version):
                 try:
                     # 这里将参数传入
-                    await self.intellect_remove_format(
+                    ai_result = await self.intellect_format(
                         input_data = use_case.use_case,
                         prompt_id = prompt_id,
                         OutputFormat = OutputFormat,
@@ -836,23 +777,20 @@ class AsyncIntel():
                         version = version,
                         inference_save_case = False,
                     )
-                    # TODO base_eval
-                    # TODO 人类评价 eval
-                    # TODO llm 评价 eval
                     if ConTent_Function:
                         ConTent_Function()
                     result_cases.append({"type":"Successful","case":use_case.use_case,"reply":f"pass"})
-                    use_case.output = "Successful"
+                    use_case.output = ai_result
                 except IntellectRemoveFormatError as e:
                     result_cases.append({"type":"FAILED","case":use_case.use_case,"reply":f"{e}"})
                     use_case.output = f"{"FAILED"}-{e}"
                 except Exception as e: # 捕获其他可能的错误
                     result_cases.append({"type":"FAILED","case":use_case.use_case,"reply":f"Exp {e}"})
                     use_case.output = f"{"FAILED"}-{e}"
-                    await session.commit()
+                await session.commit()
 
             tasks = []
-            for use_case in tqdm.tqdm(use_cases):
+            for use_case in use_cases:
                 tasks.append(
                     evals_func(
                         use_case = use_case,
@@ -884,7 +822,7 @@ class AsyncIntel():
 
 
     def draw_data(self):
-        df = self.df
+        df = self.eval_df
         # --- 可视化部分 ---
         fig = go.Figure()
 
@@ -938,13 +876,37 @@ class AsyncIntel():
             margin=dict(l=100, r=20, t=60, b=50),
             height=400 + len(df) * 30
         )
+        error_message =str(df['bad_case'].to_dict())
+        fig.add_annotation(
+            text=f"<b>bad_case:</b> {error_message}", # 要显示的文本
+            xref="paper", yref="paper", # 使用“paper”坐标系，表示相对于图表区域
+            x=0.01, y=-0.15, # x=0.01 靠近左侧，y=-0.15 在图表底部下方 (您可以调整这些值)
+            showarrow=False, # 不显示箭头
+            align="left",
+            font=dict(
+                family="Arial, sans-serif",
+                size=12,
+                color="red" # 错误信息通常用红色
+            ),
+            bgcolor="white", # 背景颜色
+            bordercolor="red", # 边框颜色
+            borderwidth=1,
+            borderpad=4,
+            xanchor='left', # 文本框左对齐到x坐标
+            yanchor='top' # 文本框顶部对齐到y坐标
+        )
+        # 可能还需要调整底部的边距以容纳错误信息
+        fig.update_layout(
+            margin=dict(l=100, r=20, t=60, b=100), # 增加底部边距
+            height=400 + len(df) * 30 + 50 # 增加图表高度以适应文本框
+        )
 
         fig.show()
         pass
 
     async def _evals(self,prompt_id, OutputFormat, ExtraFormats_list = [],**kwargs):
         
-        status,score, total, bad_case = await self.intellect_remove_format_eval(
+        status,score, total, bad_case = await self.intellect_format_eval(
             prompt_id=prompt_id,
             OutputFormat = OutputFormat,
             ExtraFormats = ExtraFormats_list,

{pro_craft-0.1.35 → pro_craft-0.1.36}/src/pro_craft.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pro-craft
-Version: 0.1.35
+Version: 0.1.36
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -9,6 +9,7 @@ Requires-Dist: anyio>=4.11.0
 Requires-Dist: db-help>=0.2.2
 Requires-Dist: fastapi>=0.119.0
 Requires-Dist: llmada>=1.1.11
+Requires-Dist: plotly>=6.3.1
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: toml>=0.10.2
 Requires-Dist: utils-tool==0.1.3

{pro_craft-0.1.35 → pro_craft-0.1.36}/src/pro_craft.egg-info/SOURCES.txt

@@ -21,5 +21,6 @@ src/pro_craft/server/mcp/prompt.py
 src/pro_craft/server/router/__init__.py
 src/pro_craft/server/router/prompt.py
 tests/test22.py
+tests/test_11.py
 tests/test_coder.py
 tests/test_designer.py

{pro_craft-0.1.35 → pro_craft-0.1.36}/src/pro_craft.egg-info/requires.txt

@@ -3,6 +3,7 @@ anyio>=4.11.0
 db-help>=0.2.2
 fastapi>=0.119.0
 llmada>=1.1.11
+plotly>=6.3.1
 pyyaml>=6.0.3
 toml>=0.10.2
 utils-tool==0.1.3

pro_craft-0.1.36/tests/test_11.py

@@ -0,0 +1,42 @@
+from pro_craft.prompt_craft.async_ import AsyncIntel
+
+import os
+
+async def test_1():
+    intels = AsyncIntel(database_url=os.getenv("adatabase_url"),model_name="doubao-1-5-pro-32k-250115")
+    # 先使用该函数,实现,创建, 初始化, 训练等等
+    result = await intels.push_action_order(
+            # demand='以下是一个代码模板, 我希望你做的是, 根据要求微调代码模板来构建代码```pythonfrom pydantic import BaseModel, Fieldfrom pro_craft import AsyncIntelinference_save_case = Falsemodel_name = "doubao-1-5-pro-256k-250115"inters = AsyncIntel(model_name = model_name)## modelsclass Chapter(BaseModel):    """    表示文档中的一个记忆卡片（章节）。    """    title: str = Field(..., description="记忆卡片的标题")    content: str = Field(..., description="记忆卡片的内容")class Document(BaseModel):    """    表示一个包含标题和多个记忆卡片的文档。    """    title: str = Field(..., description="整个文档的标题内容")    chapters: List[Chapter] = Field(..., description="文档中包含的记忆卡片列表")    ## modelsasync def amemory_card_merge(memory_cards: list[str]):    memoryCards_str, memoryCards_time_str = memoryCards2str(memory_cards)    input_data = memoryCards_str + "各记忆卡片的时间" + memoryCards_time_str        result = await inters.intellect_remove_format(        input_data= input_data,        prompt_id = "memorycard-merge",        version = None,        inference_save_case=inference_save_case,        OutputFormat = Document,        ExtraFormats=[Chapter],    )    return result```',
+            demand="添加一些注释",
+            prompt_id="zxf_code_template_2",
+            action_type="to:1.8"
+        )
+    print(result)
+
+
+
+async def test_work():
+    intels = AsyncIntel(database_url=os.getenv("adatabase_url"),model_name="doubao-1-5-pro-32k-250115")
+    # @intels.intellect_warp("zxf_code_template")
+    # async def work_test(input_data, OutputFormat):
+    #     print(input_data)
+    await intels.create_main_database()
+    # 期间不断使用这个函数进行配合
+    input_data = "我要一个生成记忆卡片的程序,只包括文本即可"
+    result = await intels.intellect(input_data=input_data,
+                     output_format="",
+                     prompt_id="zxf_code_template_2")
+    
+    print(result)
+
+
+async def test_work2():
+    intels = AsyncIntel(database_url=os.getenv("adatabase_url"),model_name="doubao-1-5-pro-32k-250115")
+    
+    @intels.intellect_warp("zxf_code_template_2")
+    async def work_test(input_data, OutputFormat):
+        print(input_data)
+    input_data = "我要一个生成记忆卡片的程序, 记忆卡片包括标题(title), 内容(content), 时间(time), 标签(tag)"
+    
+    print(await work_test(input_data = input_data,
+                          OutputFormat = ""))

pro_craft-0.1.35/src/pro_craft/__init__.py

@@ -1,23 +0,0 @@
-from dotenv import load_dotenv, find_dotenv
-dotenv_path = find_dotenv()
-load_dotenv(".env", override=True)
-
-from .log import Log
-import logging
-Log_ = Log(console_level = logging.WARNING, 
-             log_file_name="app.log")
-logger = Log_.logger
-Log_.set_super_log(logger.critical)
-
-super_log = Log_.super_log # 调试工具
-
-def slog(s, target: str = "target",logger = logger.info):
-    COLOR_GREEN = "\033[92m"
-    COLOR_RESET = "\033[0m" # 重置颜色
-    logger("\n"+f"{COLOR_GREEN}=={COLOR_RESET}" * 50)
-    logger(target + "\n       "+"--" * 40)
-    logger(type(s))
-    logger(s)
-    logger("\n"+f"{COLOR_GREEN}=={COLOR_RESET}" * 50)
-
-from .prompt_craft import AsyncIntel, Intel, IntelNew