itam-assistant 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

itam_assistant/do_ai.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import time
-from itam_assistant1.ailyapp_client import AilyLarkClient
-from itam_assistant1.lark_client import LarkdocsClient
-from itam_assistant1.intent_detail import *
-from itam_assistant1.openapi import *
+from itam_assistant.ailyapp_client import AilyLarkClient
+from itam_assistant.lark_client import LarkdocsClient
+from itam_assistant.intent_detail import *
+from itam_assistant.openapi import *
 import datetime
 import copy
 import os
@@ -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(3)
                 if not seseion_id:
                     raise ValueError("未能成功创建会话")
                 # 创建消息
                 message_id = AilyLarkClient(clientinfo).create_ailysessionaily_message(tenant_access_token, seseion_id,
                                                                                        aa)
-                time.sleep(5)
+                time.sleep(3)
                 if not message_id:
                     raise ValueError("未能成功创建消息")
                 # 创建运行实例
                 runs = AilyLarkClient(clientinfo).create_ailysession_run(tenant_access_token, seseion_id)
-                time.sleep(5)
+                time.sleep(4)
                 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 技能分发 用户输入
@@ -895,7 +939,7 @@ def write_excletolist(data_name):
     try:
         # 查看当前工作目录
         print(f"当前工作目录: {os.getcwd()}")
-        # /Users/bytedance/itam_assistant1/itam_assistant1/accessory.csv
+        # /Users/bytedance/itam_assistant/itam_assistant/accessory.csv
         # 构建文件路径
         file_path = f'data/{data_name}.csv'
         Candidates = []
@@ -926,3 +970,91 @@ def write_excletolist(data_name):
 
 
 
+def do_waterlevelline_autotest_fix(collections, clientinfo, score_threshold):
+    """
+    水位线评测- 返回 符合报告模式的结果
+    """
+    keywprd= []
+    info_list = []
+    info = {
+        "input": {
+            "用户输入/userInput": "我要申请软件，名字叫：ai_xzh_all_restricted_software完全受限软件"
+        },
+        "output": {
+            "用户输入/output": "我要申请软件，名字叫：ai_xzh_all_restricted_software完全受限软件"
+        },
+        "rt": True,
+        "label": [{"label": "GUI 软件申请", "score": 0.6}, {"label": "软件申请", "score": 0.5}],
+        "exp": [{"label": "GUI 软件申请", " score": 0.9}, {"label": "软件申请", "score": 0.8
+                                                       }],
+        "artificial": []
+    }
+    a =0
+    for i in collections:
+        info['input']['用户输入/userInput'] = i['ext']['资产名称']
+        info['output']['用户输入/output'] = i['ext']['资产名称']
+        info['exp'] = []
+        for j in [i['ext']['匹配型号1'], i['ext'].get('匹配型号2'),i['ext'].get('匹配型号3'),i['ext'].get('匹配型号4'),i['ext'].get('匹配型号5'),i['ext'].get('匹配型号6'),i['ext'].get('匹配型号7'),i['ext'].get('匹配型号8'),i['ext'].get('匹配型号9'),i['ext'].get('匹配型号10')]:
+            if j:
+                info['exp'].append({'label': j, 'score': score_threshold})
+        #判断i['ext']['BPO标注-AP-资产型号']是否为空，为空就不用读取，不为空就读取
+        if i['ext']['资产名称']:
+            asset_name = i['ext']['资产名称']
+            try:
+                if isinstance(asset_name, str):
+                    asset_name = json.loads(asset_name)
+            except json.JSONDecodeError:
+                # 若解析失败，说明不是 JSON 格式，保持原样
+                pass
+        info['artificial'] = info['exp']
+        if i['ext']['资产名称']:
+            asset_name = i['ext']['资产名称']
+            try:
+                if isinstance(asset_name, str):
+                    asset_name = json.loads(asset_name)
+            except json.JSONDecodeError:
+                # 若解析失败，说明不是 JSON 格式，保持原样
+                pass
+            if "设备领用" in i['ext']['评测集标签']:
+                keywprd = GetBestMatchItemandres_new(asset_name, i['ext']['资产类型'], clientinfo)
+
+        else:
+            res = ""
+        infoout = do_waterlevellineres_listv3(keywprd, info)
+        info_list.append(copy.deepcopy(infoout))
+        a = a+1
+        print("这是"+str(a))
+        bbb = a
+    return info_list
+
+
+def do_waterlevellineres_listv3(res, info):
+    """
+    获取结果，并组装水位线info
+    """
+    if res == '':
+        info['label'] = [{'label': '', 'score': 0}, {'label': '', 'score': 0}]
+        info['rt'] = False
+        return info
+    reslist = res['res']
+    info['output']['用户输入/output'] = 'log_id:' + res.get('log')
+    if reslist:
+        #取所有结果并追加到info['label']
+        info['label'] = []
+        if len(reslist) > 0:
+            for j in range(len(reslist)):
+                aaa = {'label': reslist[j]['Name'],
+                       'score': reslist[j]['Score']}
+                info['label'].append(copy.deepcopy(aaa))
+        # 判断exp和label是否一致，一致则：rt=True，不一致则：rt=False
+        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
+
+    return info

itam_assistant-0.1.10.dist-info/METADATA

@@ -0,0 +1,25 @@
+Metadata-Version: 2.4
+Name: itam_assistant
+Version: 0.1.10
+Summary: 优化版本--技能分发的结果展示-新增时间控制
+Home-page: https://github.com/liujunmeiD/itam_assistant
+Author: liujunmeiD
+Author-email: 1105030421@qq.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+Requires-Dist: requests>=2.25.1
+Requires-Dist: numpy>=1.20.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+详见https://bytedance.feishu.cn/docs/doccnSOL0o2qtnElftgd2rir2Dc

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

@@ -10,7 +10,7 @@ it_assistant/test.py,sha256=qGSihMYmtZkz_vifwEOz579f_wPBJAx5_rz1sABUyo4,581
 itam_assistant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 itam_assistant/ailyapp_client.py,sha256=w-ihtcmRgOQCgWK0jB8eHGCikjo1tbre3xCiEKhLrUA,6357
 itam_assistant/config.py,sha256=L_5grm2ZWwg_S1JTOU6XLhQ5GPeYJaBFBLwzP2JA5Ys,5498
-itam_assistant/do_ai.py,sha256=esVBjVZb_D_lxWng3X9nUj8s_qSYKaCorlhhfPn8I68,41603
+itam_assistant/do_ai.py,sha256=zrJ8a4ZiZC1aBYBBto0yXncROMM7yYY34jTVdis_5MU,46739
 itam_assistant/intent_detail.py,sha256=hmEj1KpcuKNvsoBZmn5PnbsBIIx6XGmQBJWdW_ICFmg,16831
 itam_assistant/lark_client.py,sha256=ZVDsdt7ucQvJN1-khC3TR-0IMeYaQXfdWF5DxRrkBH4,6665
 itam_assistant/logger.py,sha256=W3-tbQ4J-QKSrQSpaNBruzoyMuWYrUkrIY0uBZ1o-lw,1583
@@ -22,7 +22,7 @@ main/do_ai.py,sha256=rxsTRdd3oBs-gsIssHz3XV-6lIC5Bq4qoyNuyQzjidg,6879
 main/intent_detail.py,sha256=Fo76c4BpGya-znCnKH7YAcr_2UJtbi3WPQN-PwtVsXc,18533
 main/lark_client.py,sha256=ZVDsdt7ucQvJN1-khC3TR-0IMeYaQXfdWF5DxRrkBH4,6665
 main/logger.py,sha256=W3-tbQ4J-QKSrQSpaNBruzoyMuWYrUkrIY0uBZ1o-lw,1583
-itam_assistant-0.1.8.dist-info/METADATA,sha256=b-0yfthQ4e7IQ6a6iFDpQh9LkZV029snjIlO1VFgeII,556
-itam_assistant-0.1.8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-itam_assistant-0.1.8.dist-info/top_level.txt,sha256=KpZA4H04XBVAB3NLq0AAEOrAGEurwMnWw41AhJVqVFI,15
-itam_assistant-0.1.8.dist-info/RECORD,,
+itam_assistant-0.1.10.dist-info/METADATA,sha256=FDUQr4eOtmJ5KI6SZJVRCmjlRIqVZIyB2SFd5ZZLCko,771
+itam_assistant-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+itam_assistant-0.1.10.dist-info/top_level.txt,sha256=KpZA4H04XBVAB3NLq0AAEOrAGEurwMnWw41AhJVqVFI,15
+itam_assistant-0.1.10.dist-info/RECORD,,

{itam_assistant-0.1.8.dist-info → itam_assistant-0.1.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

itam_assistant-0.1.8.dist-info/METADATA

@@ -1,16 +0,0 @@
-Metadata-Version: 2.1
-Name: itam-assistant
-Version: 0.1.8
-Summary: 优化版本--技能分发的结果展示
-Home-page: https://github.com/liujunmeiD/itam_assistant
-Author: liujunmeiD
-Author-email: 1105030421@qq.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-Requires-Dist: requests >=2.25.1
-Requires-Dist: numpy >=1.20.0
-
-详见https://bytedance.feishu.cn/docs/doccnSOL0o2qtnElftgd2rir2Dc