itam-assistant 0.1.18__tar.gz → 0.1.19__tar.gz

{itam_assistant-0.1.18 → itam_assistant-0.1.19}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: itam_assistant
-Version: 0.1.18
-Summary: 新增功能：打印出记录
+Version: 0.1.19
+Summary: 新增-软件搜索
 Home-page: https://github.com/liujunmeiD/itam_assistant
 Author: liujunmeiD
 Author-email: 1105030421@qq.com

{itam_assistant-0.1.18 → itam_assistant-0.1.19}/itam_assistant/do_ai.py

@@ -462,11 +462,11 @@ def do_waterlevelline_autotest(collections, clientinfo, score_threshold):
         info['input']['用户输入/userInput'] = i['ext']['资产名称']
         info['output']['用户输入/output'] = i['ext']['资产名称']
         info['exp'] = []
-        for j in [i['ext']['资产型号'], i['ext'].get('资产型号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')]:
+        for j in [i['ext'].get('匹配型号'), i['ext'].get('匹配型号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']['资产型号']是否为空，为空就不用读取，不为空就读取
-        if i['ext']['资产型号']:
+        if i['ext']['资产名称']:
             asset_name = i['ext']['资产名称']
             try:
                 if isinstance(asset_name, str):
@@ -486,7 +486,7 @@ def do_waterlevelline_autotest(collections, clientinfo, score_threshold):
             if "软件申请" in i['ext']['分发技能']:
                 keywprd = software_asset_sku_structure(asset_name)
                 res = json.loads(get_query_vector(keywprd, clientinfo))
-            if "设备/配件申请" in i['ext']['分发技能']:
+            if "设备&配件领用" in i['ext']['分发技能']:
                 #keywprd = equipmentrequest_structure(asset_name, i['ext']['asset_type'])
                 keywprd = {
     "From": 0,
@@ -851,6 +851,62 @@ def do_waterlevelline_autotest_SoftwareApplyRecommendList(collections, clientinf
         bbb = a
     return info_list
 
+def do_waterlevelline_autotest_SoftwareApplyRecommendList_SearchKey(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'].get('资产名称') or i['ext'].get('资产名称')
+        info['output']['实际输出/output'] = i['ext']['资产名称']
+        info['exp'] = []
+        for j in [i['ext']['匹配型号1'], i['ext'].get('匹配型号1'),
+                  i['ext'].get('匹配型号2'), i['ext'].get('匹配型号2'),
+                  i['ext'].get('匹配型号3'), i['ext'].get('匹配型号3'),
+                  i['ext'].get('匹配型号4'), i['ext'].get('匹配型号4'),
+                  i['ext'].get('匹配型号5'), i['ext'].get('匹配型号5'),
+                  i['ext'].get('匹配型号6')]:
+            if j:
+                info['exp'].append({'label': j, 'score': score_threshold})
+            if info['exp'] == '':
+                break
+        info['artificial'] = info['exp']
+        info['label']=[]
+        if i['ext']['资产名称']:
+            if "软件" in i['ext']['分发技能']:
+                asset_name = i['ext']['资产名称']
+                try:
+                    # 尝试将其解析为 JSON 对象
+                    if isinstance(asset_name, str):
+                        asset_name = json.loads(asset_name)
+                except json.JSONDecodeError:
+                    # 若解析失败，说明不是 JSON 格式，保持原样
+                    pass
+                key = asset_name.get('asset_name') if isinstance(asset_name, dict) else asset_name
+                res = SoftwareApplyGetBestMatchItem_SearchKey(key,clientinfo)
+        else:
+            res = ""
+        infoout = do_waterlevellineres_software_SearchKey(res, info)
+        info_list.append(copy.deepcopy(infoout))
+        a = a+1
+        print("这是"+str(a))
+        bbb = a
+    return info_list
 
 def do_waterlevellineres_software(res, info):
     """
@@ -884,6 +940,39 @@ def do_waterlevellineres_software(res, info):
         info['rt'] = False
     return info
 
+
+def do_waterlevellineres_software_SearchKey(res, info):
+    """
+    获取结果，并组装水位线info
+    """
+    if res == '':
+        info['label'] = [{'label': '', 'score': 0}]
+        info['rt'] = False
+        return info
+    info['output']['实际输出/output'] = 'requestId:' + res.get('requestId')
+    if res["data"].get("SoftwareApplyRecommendList") == None:
+        info['label'] = [{'label': '', 'score': 0},{'label': '', 'score': 0.3}]
+        info['rt'] = False
+        if info['exp'][0]['label']=='':
+            info['rt'] = True
+        return info
+    reslist = res["data"]["SoftwareApplyRecommendList"]
+    aaa ={}
+    # 判断res["body"]["Results"]不为空，空则：label0 label1 为空，label默认2级
+    if reslist:
+        # 取["Results"]下前2个结果，若只有1个结果，label1为空
+        if len(reslist) > 0:
+           for j in range(len(reslist)):
+               aaa = {'label': reslist[j]['Data']['Name']['ValueZh'],
+                      'score': reslist[j]['Score']/20}
+               info['label'].append(copy.deepcopy(aaa))
+
+        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):
     """
     业务断言

{itam_assistant-0.1.18 → itam_assistant-0.1.19}/itam_assistant/openapi.py

@@ -680,7 +680,7 @@ def GetBestMatchItemonline_old(SearchKey, HardwareMatchType, clientinfo):
     payload = json.dumps({
         "SearchKey": SearchKey,
         "TopN": 1000,
-        "AiUseType": 3,
+        "AiUseType": 5,
         "QueryAssetModelScopeRequest":
             {"FlowTemplateIDs":
                  ["6883468409742298119", "7514160571177913371", "6885245774565739523", "6883468929408437256",
@@ -791,6 +791,24 @@ def SoftwareApplyGetBestMatchItem(key, clientinfo):
     return json.loads(response.text)
 
 
+
+def SoftwareApplyGetBestMatchItem_SearchKey(key, clientinfo):
+    url = "https://it.bytedance.com/itam-byte/api/itservice/common/GetBestMatchItem"
+    payload = json.dumps({"SearchKey":"","TopN":5,"AiUseType":100,"SoftwareApplyRequest":{"Size":30,"Search":key},"psm":"athena"})
+    headers = {
+        'authorization': clientinfo.get(
+            'authorization') or 'Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6InYyIiwidHlwIjoiSldUIn0.eyJleHAiOjE3NTEwMDU1MjQsImp0aSI6IktJVVI5ZkdoZ2Q1cyt4NWIiLCJpYXQiOjE3NDk3MDk1MjQsImlzcyI6InRhbm5hIiwic3ViIjoiMzgzMDMxOUBieXRlZGFuY2UucGVvcGxlIiwidGVuYW50X2lkIjoiYnl0ZWRhbmNlLnBlb3BsZSIsInRlbmFudF9uYW1lIjoiIiwicHJvamVjdF9rZXkiOiJjcm1TZmdIVmU1dXhIMHJyIiwidW5pdCI6ImV1X25jIiwiYXV0aF9ieSI6Mn0.wtuTgUI6posLTQ-WJU539NuIYbMCgYqBrCOvdigR09h8zl_VO7tUJ4GSmfjDH8jZjtGSF-nEoDLPbX2z4BZkwtvoh--oa8KP-IIOOk2KQS2lVHz1mE7HWaEdCpml1_DS0PJB42F3B-L0EjRqQki_g3Jjn1kZjMgwFqpFW-TwcpY',
+        'cookie': clientinfo.get(
+            'cookie') or '_tea_utm_cache_1229=undefined; MONITOR_WEB_ID=ce5a3279-6ed5-4ede-9b00-29aa7c1a1311; amuserid=3830319@bytedance.people; msToken=TYcrN_92buBPnrV9MSb8i_0Uvz5lFxoWtnz8PA8MhLaAtrddfSUuR69V8vEJvRwEMDOyOAFL-PY87wN-oA4tKDroSbEvsjPNFn202nmCEcO9rKH9KINPWA==',
+        'Content-Type': 'application/json',
+        'x-use-ppe': '1',
+        'x-tt-env': clientinfo.get("x_tt_env")
+    }
+
+    response = requests.request("POST", url, headers=headers, data=payload)
+    time.sleep(5)
+
+    return json.loads(response.text)
 if __name__ == '__main__':
     info = {
         'input': {'用户输入/userInput': 'Autodesk 3Ds MAX'},

{itam_assistant-0.1.18 → itam_assistant-0.1.19}/itam_assistant.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: itam_assistant
-Version: 0.1.18
-Summary: 新增功能：打印出记录
+Version: 0.1.19
+Summary: 新增-软件搜索
 Home-page: https://github.com/liujunmeiD/itam_assistant
 Author: liujunmeiD
 Author-email: 1105030421@qq.com

{itam_assistant-0.1.18 → itam_assistant-0.1.19}/setup.py

@@ -2,10 +2,10 @@ from setuptools import setup, find_packages
 
 setup(
     name="itam_assistant",  # 包名称
-    version="0.1.18",    # 版本号
+    version="0.1.19",    # 版本号
     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",