itam-assistant 0.1.9__tar.gz → 0.1.10__tar.gz

{itam_assistant-0.1.9 → itam_assistant-0.1.10}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: itam_assistant
-Version: 0.1.9
-Summary: 优化版本--技能分发的结果展示
+Version: 0.1.10
+Summary: 优化版本--技能分发的结果展示-新增时间控制
 Home-page: https://github.com/liujunmeiD/itam_assistant
 Author: liujunmeiD
 Author-email: 1105030421@qq.com

{itam_assistant-0.1.9 → itam_assistant-0.1.10}/itam_assistant/do_ai.py

@@ -89,18 +89,18 @@ def do_ai_auto(Testk_data, clientinfo):
                     startAt = int(time.time())
                 # 创建会话
                 seseion_id = AilyLarkClient(clientinfo).create_ailysession(tenant_access_token)
-                time.sleep(2)
+                time.sleep(3)
                 if not seseion_id:
                     raise ValueError("未能成功创建会话")
                 # 创建消息
                 message_id = AilyLarkClient(clientinfo).create_ailysessionaily_message(tenant_access_token, seseion_id,
                                                                                        aa)
-                time.sleep(2)
+                time.sleep(3)
                 if not message_id:
                     raise ValueError("未能成功创建消息")
                 # 创建运行实例
                 runs = AilyLarkClient(clientinfo).create_ailysession_run(tenant_access_token, seseion_id)
-                time.sleep(2)
+                time.sleep(4)
                 num = num + 1
             return startAt, num
     except KeyError as ke:
@@ -970,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.9 → itam_assistant-0.1.10}/itam_assistant.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: itam_assistant
-Version: 0.1.9
-Summary: 优化版本--技能分发的结果展示
+Version: 0.1.10
+Summary: 优化版本--技能分发的结果展示-新增时间控制
 Home-page: https://github.com/liujunmeiD/itam_assistant
 Author: liujunmeiD
 Author-email: 1105030421@qq.com

{itam_assistant-0.1.9 → itam_assistant-0.1.10}/setup.py

@@ -2,10 +2,10 @@ from setuptools import setup, find_packages
 
 setup(
     name="itam_assistant",  # 包名称
-    version="0.1.9",    # 版本号
+    version="0.1.10",    # 版本号
     author="liujunmeiD",
     author_email="1105030421@qq.com",
-    description="优化版本--技能分发的结果展示",
+    description="优化版本--技能分发的结果展示-新增时间控制",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
     url="https://github.com/liujunmeiD/itam_assistant",