itam-assistant 0.1.7__tar.gz → 0.1.8__tar.gz

{itam_assistant-0.1.7 → itam_assistant-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itam_assistant
-Version: 0.1.7
+Version: 0.1.8
 Summary: 优化版本--技能分发的结果展示
 Home-page: https://github.com/liujunmeiD/itam_assistant
 Author: liujunmeiD

{itam_assistant-0.1.7 → itam_assistant-0.1.8}/itam_assistant/do_ai.py

@@ -68,7 +68,7 @@ def do_ai_auto(Testk_data, clientinfo):
                             # 可不需等待运行实例创建完成
                             # if not runs:
                             #    raise ValueError("未能成功创建运行实例")
-                            time.sleep(5)
+                            time.sleep(2)
                         else:
                             return startAt, i
                             break
@@ -81,23 +81,26 @@ def do_ai_auto(Testk_data, clientinfo):
                 tenant_access_token = AilyLarkClient(clientinfo).get_tenant_access_token()
                 if not tenant_access_token:
                     raise ValueError("未能获取到有效的租户访问令牌")
-                aa = i['ext']['input']
+                if i['ext'].get('input'):
+                    aa = i['ext']['input']
+                else:
+                    aa = i['ext']['用户输入']                    
                 if startAt == 0:
                     startAt = int(time.time())
                 # 创建会话
                 seseion_id = AilyLarkClient(clientinfo).create_ailysession(tenant_access_token)
-                time.sleep(10)
+                time.sleep(2)
                 if not seseion_id:
                     raise ValueError("未能成功创建会话")
                 # 创建消息
                 message_id = AilyLarkClient(clientinfo).create_ailysessionaily_message(tenant_access_token, seseion_id,
                                                                                        aa)
-                time.sleep(5)
+                time.sleep(2)
                 if not message_id:
                     raise ValueError("未能成功创建消息")
                 # 创建运行实例
                 runs = AilyLarkClient(clientinfo).create_ailysession_run(tenant_access_token, seseion_id)
-                time.sleep(5)
+                time.sleep(2)
                 num = num + 1
             return startAt, num
     except KeyError as ke:
@@ -316,12 +319,13 @@ def do_waterlevellineres_sr(res, info,hardtype):
                    info['label'].append(copy.deepcopy(aaa))
         # 判断label0和label1是否为空，为空则：label默认2级
         # 判断exp和label是否一致，一致则：rt=True，不一致则：rt=False
-        if info['exp'][0]['label'] == info['label'][0]['label'] and info['exp'][1]['label'] == info['label'][1][
-            'label'] and info['exp'][0]['score'] <= info['label'][0]['score'] and info['exp'][1]['score'] <= \
-                info['label'][1]['score']:
-            info['rt'] = True
-        else:
-            info['rt'] = False
+           # 判断label0和label1是否为空，为空则：label默认2级
+        for a in range(len(info['exp'])):
+            if info['exp'][a]['label'] == info['label'][a]['label']:
+                   info['rt'] = True
+            else:
+                   info['rt'] = False
+                   break
     else:
         info['label'] = info['label'] = [{'label': '', 'score': 0}, {'label': '', 'score': 0}]
         info['rt'] = False
@@ -334,10 +338,10 @@ def do_metricsevaluation_list(collections,data,score_threshold):
     """
     info = {
         "input": {
-            "用户输入/userInput": "测试数据"
+            "用户输入": "测试数据"
         },
         "output": {
-            "用户输入/output": "测试数据"
+            "output": "测试数据"
         },
         "rt": False,
         "label": [{"label": "测试"}, {"label": "测试"}],
@@ -351,20 +355,20 @@ def do_metricsevaluation_list(collections,data,score_threshold):
             cleaned_content = i['content'].replace('\r', '').replace('\n', '').replace('\\', '')
             cleaned_userInput = j['用户输入/userInput'].replace('\r', '').replace('\n', '').replace('\\', '')
             if cleaned_content == cleaned_userInput:
-                info['input']['用户输入/userInput'] = i['ext']['input']
-                info['output']['用户输入/output'] = "对话id："+j['对话日志/intentID']+"    对话内容："+j['用户输入/userInput']
-                if i['ext']['BPO标注-AP-分发技能'] != '' and i['ext']['BPO标注-AP-分发技能'] in j['分发技能/skill'][0]:
+                info['input']['用户输入'] = i['ext'].get('input') or i['ext']['用户输入']
+                info['output']['output'] = "对话id："+j['对话日志/intentID']+"    对话内容："+j['用户输入/userInput']
+                if i['ext']['分发技能'] != '' and i['ext']['分发技能'] in j['分发技能/skill'][0]:
                     info['rt'] = True
                     info['label'] = [{'label': j['分发技能/skill'][0]}]
-                    info['exp'] = [{'label': i['ext']['BPO标注-AP-分发技能']}]
+                    info['exp'] = [{'label': i['ext']['分发技能']}]
                     info['artificial'] = info['exp']
                 else:
                     info['rt'] = False
                     info['label'] = [{'label': j['分发技能/skill'][0]}]
-                    info['exp'] = [{'label': i['ext']['BPO标注-AP-分发技能']}]
+                    info['exp'] = [{'label': i['ext']['分发技能']}]
                     info['artificial'] = info['exp']
-                if i['ext']['BPO标注-AP-分发技能'] not in businessscenario:
-                    businessscenario.append(i['ext']['BPO标注-AP-分发技能'])
+                if i['ext']['分发技能'] not in businessscenario:
+                    businessscenario.append(i['ext']['分发技能'])
                 #将data中的j删除
                 data.remove(j)
                 info_list.append(copy.deepcopy(info))
@@ -725,7 +729,7 @@ def do_waterlevelline_autotest_SoftwareApplyRecommendList(collections, clientinf
             "用户输入/userInput": "我要申请软件，名字叫：ai_xzh_all_restricted_software完全受限软件"
         },
         "output": {
-            "用户输入/output": "我要申请软件，名字叫：ai_xzh_all_restricted_software完全受限软件"
+            "实际输出/output": "我要申请软件，名字叫：ai_xzh_all_restricted_software完全受限软件"
         },
         "rt": True,
         "label": [{"label": "GUI 软件申请", "score": 0.6}, {"label": "软件申请", "score": 0.5}],
@@ -735,16 +739,24 @@ def do_waterlevelline_autotest_SoftwareApplyRecommendList(collections, clientinf
     }
     a =0
     for i in collections:
-        info['input']['用户输入/userInput'] = i['ext'].get('BP标注-AP-资产名称') or i['ext'].get('BPO标注-AP-资产名称')
-        info['output']['用户输入/output'] = i['ext']['BP标注-AP-资产名称']
-        info['exp'] = [
-            {'label': i['ext']['BP标注-AP-资产名称'], 'score': score_threshold},
-            {'label': i['ext'].get('BP标注-AP-资产型号1', ''), 'score': score_threshold}]
+        info['input']['用户输入/userInput'] = i['ext'].get('BPO标注-AP-资产名称') or i['ext'].get('BPO标注-AP-资产名称')
+        info['output']['实际输出/output'] = i['ext']['BPO标注-AP-资产名称']
+        info['exp'] = []
+        for j in [i['ext']['BPO标注-AP-资产型号'], i['ext'].get('BPO标注-AP-资产型号1'),
+                  i['ext'].get('BPO标注-AP-资产型号2'), i['ext'].get('BPO标注-AP-资产型号3'),
+                  i['ext'].get('BPO标注-AP-资产型号4'), i['ext'].get('BPO标注-AP-资产型号5'),
+                  i['ext'].get('BPO标注-AP-资产型号6'), i['ext'].get('BPO标注-AP-资产型号7'),
+                  i['ext'].get('BPO标注-AP-资产型号8'), i['ext'].get('BPO标注-AP-资产型号9'),
+                  i['ext'].get('BPO标注-AP-资产型号10')]:
+            if j:
+                info['exp'].append({'label': j, 'score': score_threshold})
+            if info['exp'] == '':
+                break
         info['artificial'] = info['exp']
         info['label']=[]
-        if i['ext']['BP标注-AP-资产名称']:
-            if "软件" in i['ext']['BP标注-AP-分发技能']:
-                asset_name = i['ext']['BP标注-AP-资产名称']
+        if i['ext']['BPO标注-AP-资产名称']:
+            if "软件" in i['ext']['BPO标注-AP-分发技能']:
+                asset_name = i['ext']['BPO标注-AP-资产名称']
                 try:
                     # 尝试将其解析为 JSON 对象
                     if isinstance(asset_name, str):
@@ -780,6 +792,7 @@ def do_waterlevellineres_software(res, info):
         return info
     reslist=res["data"]["SoftwareApplyRecommendList"]
     aaa ={}
+    info['output']['实际输出/output'] = 'requestId:'+res.get('requestId')
     # 判断res["body"]["Results"]不为空，空则：label0 label1 为空，label默认2级
     if reslist:
         # 取["Results"]下前2个结果，若只有1个结果，label1为空
@@ -788,15 +801,46 @@ def do_waterlevellineres_software(res, info):
                aaa = {'label': reslist[j]['Data']['Name']['ValueZh'],
                       'score': reslist[j]['Score']}
                info['label'].append(copy.deepcopy(aaa))
-        if info['exp'][0]['label'] == info['label'][0]['label'] and info['exp'][0]['score'] <= info['label'][0]['score']:
-            info['rt'] = True
-        else:
-            info['rt'] = False
+
+        info['rt'] = do_businessassertionrules(info['label'],info['exp'])
     else:
         info['label'] = info['label'] = [{'label': '', 'score': 0}, {'label': '', 'score': 0}]
         info['rt'] = False
     return info
 
+def do_businessassertionrules(label, epx):
+    """
+    业务断言
+    :param res:
+    :param info:
+    :return:
+    """
+    # 当预期值或实际值列表为空时，直接返回 False
+    if not epx or not label:
+        return False
+
+    # 规则1：当预期值为1维时
+    if len(epx) == 1:
+        return epx[0]['label'] == label[0]['label']
+
+    # 规则2：当预期值大于等于 实际值时，判断预期值包含实际值
+    if len(epx) >= len(label):
+        for i in range(len(label)):
+            if epx[i]['label'] != label[i]['label']:
+                return False
+        return True
+
+    # 规则3：当预期值小于 实际值时，判断实际值包含预期值
+    for i in range(len(epx)):
+        if epx[i]['label'] != label[i]['label']:
+            return False
+    return True
+
+
+
+
+
+
 def get_conversationlogs1(startAt):
     """
     对话ID 技能分发 用户输入

{itam_assistant-0.1.7 → itam_assistant-0.1.8}/itam_assistant.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itam-assistant
-Version: 0.1.7
+Version: 0.1.8
 Summary: 优化版本--技能分发的结果展示
 Home-page: https://github.com/liujunmeiD/itam_assistant
 Author: liujunmeiD

{itam_assistant-0.1.7 → itam_assistant-0.1.8}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="itam_assistant",  # 包名称
-    version="0.1.7",    # 版本号
+    version="0.1.8",    # 版本号
     author="liujunmeiD",
     author_email="1105030421@qq.com",
     description="优化版本--技能分发的结果展示",

{itam_assistant-0.1.7 → itam_assistant-0.1.8}/test/test.py

@@ -2,10 +2,10 @@
 import csv
 import json
 import copy
-from itam_assistant.do_ai import do_ai_auto
+from itam_assistant1.do_ai import do_ai_auto
 
 # 假设 Testsuitelink 是一个有效的文档链接
-from itam_assistant.openapi import get_query_vector
+from itam_assistant1.openapi import get_query_vector
 
 Testsuitelink = "your_testsuitelink_here"