pro-craft 0.1.33__py3-none-any.whl → 0.1.35__py3-none-any.whl

pro_craft/prompt_craft/async_.py

@@ -25,7 +25,9 @@ from datetime import datetime, timedelta
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
 from sqlalchemy import select, and_ # 引入 select 和 and_
 from sqlalchemy.orm import class_mapper # 用于检查对象是否是持久化的
-
+import tqdm
+from tqdm.asyncio import tqdm
+import pandas as pd
 
 class IntellectRemoveFormatError(Exception):
     pass
@@ -166,6 +168,8 @@ class AsyncIntel():
             self.llm = ArkAdapter(model_name = model_name)
         else:
             raise Exception("error llm name")
+        
+        self.df = pd.DataFrame({"name":[],'status':[],"score":[],"total":[],"bad_case":[]})
             
     async def create_specific_database(self):
         tables_to_create_names = ["ai_prompts","ai_usecase"]
@@ -399,19 +403,30 @@ class AsyncIntel():
     async def save_use_case_by_sql(self,
                              prompt_id: str,
                              use_case:str = "",
+                             timestamp = "",
                              output = "",
                              solution: str = "",
+                             faired_time  = 0,
                              session = None
                             ):
+
         """
         从sql保存提示词
         """
         #TODO 存之前保证数据库中相同的prompt_id中没有重复的use_case
-
-        use_case = UseCase(prompt_id=prompt_id, 
+        use_cases = await self.get_use_case_by_sql(target_prompt_id = prompt_id,
+                                  session = session)
+        for use_case_old in use_cases:
+            if use_case == use_case_old.use_case:
+                print("用例已经存在")
+                return 
+        
+        use_case = UseCase(prompt_id=prompt_id,
                         use_case = use_case,
+                        timestamp = timestamp,
                         output = output,
                         solution = solution,
+                        faired_time = faired_time,
                         )
 
         session.add(use_case)
@@ -557,8 +572,10 @@ class AsyncIntel():
                 if inference_save_case:
                     await self.save_use_case_by_sql(prompt_id,
                                         use_case = input_,
+                                        timestamp = datetime.now(),
                                         output = ai_result,
-                                        solution = "备注/理想回复",
+                                        solution = output_format,
+                                        faired_time = 0,
                                         session = session,
                                         )
                     
@@ -649,6 +666,7 @@ class AsyncIntel():
                                             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
@@ -664,138 +682,7 @@ class AsyncIntel():
                 raise
 
         return ai_result
-    
-    async def intellect_stream_remove(self,
-                    input_data: dict | str,
-                    output_format: str,
-                    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:
-            result_obj = await self.get_prompts_from_sql(prompt_id=prompt_id,session=session)
-
-            '''
-                        if result_obj is None:
-                            await self.save_prompt_increment_version(
-                                prompt_id = prompt_id,
-                                new_prompt = "做一些处理",
-                                use_case = input_,
-                                session = session
-                            )
-                            ai_result = await self.intellect_stream_remove(input_data = input_data,
-                                                output_format = output_format,
-                                                prompt_id = prompt_id,
-                                                version = version,
-                                                inference_save_case = inference_save_case
-                                                )
-                            return ai_result'''
-
-            prompt = result_obj.prompt
-            if result_obj.action_type == "inference":
-                # 直接推理即可
-                
-                ai_generate_result = self.llm.aproduct_stream(prompt + output_format +  "\n-----input----\n" +  input_)
-                ai_result = ""
-                async for word in ai_generate_result:
-                    ai_result += word
-                    yield word
-                if inference_save_case:
-                    await self.save_use_case_by_sql(prompt_id,
-                                        use_case = input_,
-                                        output = ai_result,
-                                        solution = "备注/理想回复",
-                                        session = session,
-                                        )
-                    
-            elif result_obj.action_type == "train":
-                assert result_obj.demand # 如果type = train 且 demand 是空 则报错
-                # 则训练推广
-
-                # 新版本 默人修改会 inference 状态
-                chat_history = prompt
-                before_input = result_obj.use_case
-                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_
-            
-                ai_generate_result = self.llm.aproduct_stream(input_prompt)
-                ai_result = ""
-                async for word in ai_generate_result:
-                    ai_result += word
-                    yield word
-
-                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":
-
-                await self.summary_to_sql(prompt_id = prompt_id,
-                            prompt = prompt,
-                            session = session
-                            )
-                input_prompt = prompt + output_format + "\n-----input----\n" +  input_
-                ai_generate_result = self.llm.aproduct_stream(input_prompt)
-                ai_result = ""
-                async for word in ai_generate_result:
-                    ai_result += word
-                    yield word
-                
-            elif result_obj.action_type == "finetune":
-                demand = result_obj.demand
-            
-                assert demand
-                await self.prompt_finetune_to_sql(prompt_id = prompt_id,
-                                            demand = demand,
-                                            session = session
-                                            )
-                input_prompt = prompt + output_format + "\n-----input----\n" +  input_
-                ai_generate_result = self.llm.aproduct_stream(input_prompt)
-                ai_result = ""
-                async for word in ai_generate_result:
-                    ai_result += word
-                    yield word
-
-            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
-
     async def intellect_remove_format(self,
                     input_data: dict | str,
                     OutputFormat: object,
@@ -845,7 +732,16 @@ 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,
@@ -912,7 +808,8 @@ class AsyncIntel():
                     prompt_id: str,
                     ExtraFormats: list[object] = [],
                     version: str = None,
-                    MIN_SUCCESS_RATE = 80.0
+                    MIN_SUCCESS_RATE = 80.0,
+                    ConTent_Function = None,
                     ):
         
         async with create_async_session(self.engine) as session:
@@ -942,6 +839,8 @@ class AsyncIntel():
                     # 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"
                 except IntellectRemoveFormatError as e:
@@ -953,7 +852,7 @@ class AsyncIntel():
                     await session.commit()
 
             tasks = []
-            for use_case in use_cases:
+            for use_case in tqdm.tqdm(use_cases):
                 tasks.append(
                     evals_func(
                         use_case = use_case,
@@ -963,7 +862,8 @@ class AsyncIntel():
                         version = version
                     )
                 )
-            await asyncio.gather(*tasks, return_exceptions=False)
+            await tqdm.gather(*tasks,total=len(tasks))
+            # await asyncio.gather(*tasks, return_exceptions=False)
 
 
             successful_assertions = 0
@@ -977,8 +877,82 @@ class AsyncIntel():
             success_rate = (successful_assertions / total_assertions) * 100
 
             if success_rate >= MIN_SUCCESS_RATE:
-                return "通过", success_rate, total_assertions, json.dumps(bad_case,ensure_ascii=False),
+                return "通过", success_rate, str(total_assertions), json.dumps(bad_case,ensure_ascii=False),
             else:
-                return "未通过",success_rate, total_assertions, json.dumps(bad_case,ensure_ascii=False),
+                return "未通过",success_rate, str(total_assertions), json.dumps(bad_case,ensure_ascii=False),
+
+
+
+    def draw_data(self):
+        df = self.df
+        # --- 可视化部分 ---
+        fig = go.Figure()
+
+        # 为每个条形图动态设置颜色
+        colors = []
+        for status_val in df['status']:
+            if status_val == '通过':
+                colors.append('mediumseagreen') # 通过为绿色
+            else: # 假设其他所有状态都视为“未通过”
+                colors.append('lightcoral') # 未通过为红色
+
+        fig.add_trace(go.Bar(
+            y=df['name'], # Y轴显示项目名称
+            x=df['score'],       # X轴显示通过百分比 (score列现在代表通过百分比)
+            orientation='h',     # 设置为横向
+            name='通过率',       # 这个 name 可能会在图例中显示
+            marker_color=colors, # !!! 这里根据 status 动态设置颜色 !!!
+            text=df['score'].apply(lambda x: f'{x:.2f}%'), # 在条形图上显示百分比文本
+            textposition='inside',
+            insidetextanchor='middle',
+            hovertemplate="<b>prompt:</b> %{y}<br><b>状态:</b> " + df['status'] + "<br><b>总量:</b> "+ df['total'] + "<br><b>通过百分比:</b> %{x:.2f}%<extra></extra>"
+        ))
+
+        # 添加一个辅助的条形图作为背景，表示总的100%
+        fig.add_trace(go.Bar(
+            y=df['name'],
+            x=[100] * len(df), # 所有项目都填充到100%
+            orientation='h',
+            name='总计',
+            marker_color='lightgray', # 背景用灰色
+            hoverinfo='none', # 不显示hover信息
+            opacity=0.5, # 设置透明度
+            showlegend=False # 不显示图例
+        ))
+
+        fig.update_layout(
+            title='各项目/批次通过百分比及状态',
+            xaxis=dict(
+                title='通过百分比 (%)',
+                range=[0, 100], # X轴范围0-100
+                tickvals=[0, 25, 50, 75, 100],
+                showgrid=True,
+                gridcolor='lightgray'
+            ),
+            yaxis=dict(
+                title='项目/批次',
+                autorange="reversed"
+            ),
+            barmode='overlay', # 仍使用 overlay 模式，因为背景条是独立的
+            hovermode="y unified",
+            margin=dict(l=100, r=20, t=60, b=50),
+            height=400 + len(df) * 30
+        )
+
+        fig.show()
+        pass
+
+    async def _evals(self,prompt_id, OutputFormat, ExtraFormats_list = [],**kwargs):
+        
+        status,score, total, bad_case = await self.intellect_remove_format_eval(
+            prompt_id=prompt_id,
+            OutputFormat = OutputFormat,
+            ExtraFormats = ExtraFormats_list,
+            version = None,
+            **kwargs
+        )
+        self.df.loc[len(self.df)] = {"name":prompt_id,
+                           'status':status,"score":score,
+                           "total":total,"bad_case":bad_case}
 
 # 整体测试d, 测试未通过d, 大模型调整再测试, 依旧不通过, 大模型裂变, 仍不通过, 互换人力

{pro_craft-0.1.33.dist-info → pro_craft-0.1.35.dist-info}/METADATA

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

{pro_craft-0.1.33.dist-info → pro_craft-0.1.35.dist-info}/RECORD

@@ -6,14 +6,14 @@ pro_craft/utils.py,sha256=R1DFkS4dsm5dIhg8lLTgBBvItvIYyyojROdh-ykqiYk,5250
 pro_craft/code_helper/coder.py,sha256=L6pRQr0pYRIHrMFZ4-pO_tZf1koxgGgF3L7Vl-GIyjM,24687
 pro_craft/code_helper/designer.py,sha256=3gyCqrjcw61sHzDjUPKhL1LOAE8xWLLbNT8NlK2mFLc,4739
 pro_craft/prompt_craft/__init__.py,sha256=83ruWO1Oci-DWvdVhPqcQrgdZTNfbmK72VQCkWASk7A,80
-pro_craft/prompt_craft/async_.py,sha256=5WMrCeh-N0UH81QhO4K6a8VmOhCs7qSmc46jp6yvEgo,43628
+pro_craft/prompt_craft/async_.py,sha256=egt_C0SSWSHJ0MhcHMLTDEePPzfslA57x_A6BAZVPUE,41702
 pro_craft/prompt_craft/new.py,sha256=ULjGGl95vmHrOs7XECJGlaqj1NE9BypE5WnFYhGugRY,25903
 pro_craft/prompt_craft/sync.py,sha256=4bms8Qvzq5QqgwHWwiyjrcl7hdkSqE7Kne5s3Ex8bBU,26217
 pro_craft/server/mcp/__init__.py,sha256=4dbl-lFcm0r2tkOP04OxqiZG2jR-rqF181qi2AfU6UA,123
 pro_craft/server/mcp/prompt.py,sha256=OZrsyUfSQMOY_KX7dWthW209adz5JfELsQ0ODfuQR44,1245
 pro_craft/server/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pro_craft/server/router/prompt.py,sha256=Wa4FfYRL6oeyA3F-79pmPeIH0Vo8wSEv7RH1lP6jXck,2907
-pro_craft-0.1.33.dist-info/METADATA,sha256=c7FkqpLAUEZe8tH76I-ZdxHWIhsR9UxEscHcO5BmLQo,1689
-pro_craft-0.1.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pro_craft-0.1.33.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
-pro_craft-0.1.33.dist-info/RECORD,,
+pro_craft-0.1.35.dist-info/METADATA,sha256=fG6de7HZSZdzh75n5_nurl6jv-udfwWcQ1oXzYqNenk,1689
+pro_craft-0.1.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pro_craft-0.1.35.dist-info/top_level.txt,sha256=yqYDHArnYMWpeCxkmGRwlL6sJtxiOUnYylLDx9EOgFg,10
+pro_craft-0.1.35.dist-info/RECORD,,