itam-assistant 0.1.2__tar.gz → 0.1.4__tar.gz

{itam_assistant-0.1.2 → itam_assistant-0.1.4}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: itam_assistant
-Version: 0.1.2
-Summary: 新增线上设备型号接口--
-Home-page: https://github.com/liujunmeiD/it_assistant
+Version: 0.1.4
+Summary: 优化版本
+Home-page: https://github.com/liujunmeiD/itam_assistant
 Author: liujunmeiD
 Author-email: 1105030421@qq.com
 Classifier: Programming Language :: Python :: 3

{itam_assistant-0.1.2 → itam_assistant-0.1.4}/it_assistant/ailyapp_client.py

@@ -9,6 +9,8 @@ from lark_oapi.api.aily.v1 import *
 # 以下示例代码默认根据文档示例值填充，如果存在代码问题，请在 API 调试台填上相关必要参数后再复制代码使用
 # 复制该 Demo 后, 需要将 "YOUR_APP_ID", "YOUR_APP_SECRET" 替换为自己应用的 APP_ID, APP_SECRET.
 
+pre =['spring_f17d05d924__c']
+
 
 class AilyLarkClient():
     def __init__(self,clientinfo):

{itam_assistant-0.1.2 → itam_assistant-0.1.4}/it_assistant/do_ai.py

@@ -81,15 +81,18 @@ def do_ai_auto(Testk_data, clientinfo):
                     startAt = int(time.time())
                 # 创建会话
                 seseion_id = AilyLarkClient(clientinfo).create_ailysession(tenant_access_token)
+                time.sleep(10)
                 if not seseion_id:
                     raise ValueError("未能成功创建会话")
                 # 创建消息
                 message_id = AilyLarkClient(clientinfo).create_ailysessionaily_message(tenant_access_token, seseion_id,
                                                                                        aa)
+                time.sleep(5)
                 if not message_id:
                     raise ValueError("未能成功创建消息")
                 # 创建运行实例
                 runs = AilyLarkClient(clientinfo).create_ailysession_run(tenant_access_token, seseion_id)
+                time.sleep(5)
                 num = num + 1
             return startAt, num
     except KeyError as ke:
@@ -137,22 +140,15 @@ def do_waterlevellineres_list(res, info):
         info['rt'] = False
         return info
 
-
     # 判断res["body"]["Results"]不为空，空则：label0 label1 为空，label默认2级
     if res["body"]["Results"]:
+        info['output']['用户输入/output']='log_id:'+res['log_id']
         # 取["Results"]下前2个结果，若只有1个结果，label1为空
-        if len(res["body"]["Results"]) > 1:
-            info['label'] = [
-                {'label': res["body"]["Results"][0]['Item']['name_zh'],
-                 'score': res["body"]["Results"][0]['Score']},
-                {'label': res["body"]["Results"][1]['Item']['name_zh'],
-                 'score': res["body"]["Results"][1]['Score']}]
-
-        else:
-            info['label'] = [
-                {'label': res["body"]["Results"][0]['Item']['name_zh'],
-                 'score': res["body"]["Results"][0]['Score']},
-                {'label': '', 'score': 0}]
+        if len(res["body"]["Results"]) > 0:
+            for j in range(len(res["body"]["Results"])):
+                aaa = {'label': res["body"]["Results"][j]['Item']['name_zh']+"&"+res["body"]["Results"][j]['Item']['brand_zh']+"&"+res["body"]["Results"][j]['Item']['model_zh']+"&"+res["body"]["Results"][j]['Item']['specification_zh'],
+                       'score': res["body"]["Results"][j]['Score']}
+                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][
@@ -168,6 +164,38 @@ def do_waterlevellineres_list(res, info):
 
     return info
 
+def do_waterlevellineres_listv2(res, info):
+    """
+    获取结果，并组装水位线info
+    """
+    if res == '':
+        info['label'] = [{'label': '', 'score': 0}, {'label': '', 'score': 0}]
+        info['rt'] = False
+        return info
+    reslist = res["body"]["Results"]
+    info['output']['用户输入/output'] = 'log_id:' + res.get('log_id') or res.get('requestId')
+    if reslist:
+        #取所有结果并追加到info['label']
+        info['label'] = []
+        if len(reslist) > 0:
+            for j in range(len(reslist)):
+                aaa = {'label': reslist[j]['Item']['name_zh'],
+                       'score': reslist[j]['Score'],
+                       'info':reslist[j]['Item']['name_zh']+"&"+reslist[j]['Item']['brand_zh']+"&"+reslist[j]['Item']['model_zh']+"&"+reslist[j]['Item']['specification_zh'],}
+                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
+
 def do_waterlevellineres_listassetspu(res, info,hardtype):
     """
     获取结果，并组装水位线info
@@ -179,10 +207,11 @@ def do_waterlevellineres_listassetspu(res, info,hardtype):
     if res["data"].get("AiBorrowAndUseResponseList") == None:
         info['label'] = [{'label': '', 'score': 0},{'label': '', 'score': 0.8}]
         info['rt'] = False
-        if info['exp'][0]['label']=='':
+        if info['exp']==[]:
             info['rt'] = True
         return info
     reslist=res["data"]["AiBorrowAndUseResponseList"]
+    info['output']['用户输入/output']='requestId:'+res['requestId']
     aaa ={}
     # 判断res["body"]["Results"]不为空，空则：label0 label1 为空，label默认2级
     if reslist:
@@ -198,12 +227,12 @@ def do_waterlevellineres_listassetspu(res, info,hardtype):
                           'score': reslist[j]['Score']}
                    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'][0]['score'] <= info['label'][0]['score']:
-            info['rt'] = True
-        else:
-            info['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
@@ -401,25 +430,60 @@ def do_waterlevelline_autotest(collections, clientinfo, score_threshold):
     for i in collections:
         info['input']['用户输入/userInput'] = i['ext']['BPO标注-AP-资产名称']
         info['output']['用户输入/output'] = i['ext']['BPO标注-AP-资产名称']
-        info['exp'] = [
-            {'label': i['ext']['BPO标注-AP-资产型号'], 'score': score_threshold},
-            {'label': i['ext'].get('BPO标注-AP-资产型号1', ''), 'score': score_threshold}]
+        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})
+        #判断i['ext']['BPO标注-AP-资产型号']是否为空，为空就不用读取，不为空就读取
+        if i['ext']['BPO标注-AP-资产型号']:
+            asset_name = i['ext']['BPO标注-AP-资产名称']
+            try:
+                if isinstance(asset_name, str):
+                    asset_name = json.loads(asset_name)
+            except json.JSONDecodeError:
+                # 若解析失败，说明不是 JSON 格式，保持原样
+                pass
         info['artificial'] = info['exp']
         if i['ext']['BPO标注-AP-资产名称']:
+            asset_name = i['ext']['BPO标注-AP-资产名称']
+            try:
+                if isinstance(asset_name, str):
+                    asset_name = json.loads(asset_name)
+            except json.JSONDecodeError:
+                # 若解析失败，说明不是 JSON 格式，保持原样
+                pass
             if "软件申请" in i['ext']['BPO标注-AP-分发技能']:
-                keywprd = software_asset_sku_structure(json.loads(i['ext']['BPO标注-AP-资产名称']))
+                keywprd = software_asset_sku_structure(asset_name)
                 res = json.loads(get_query_vector(keywprd, clientinfo))
             if "设备/配件申请" in i['ext']['BPO标注-AP-分发技能']:
-                keywprd = equipmentrequest_structure(json.loads(i['ext']['BPO标注-AP-资产名称']), i['ext']['asset_type'])
-                res0 = json.loads(get_query_vector(keywprd, clientinfo))
-                res = get_by_AssetModelBizTypes(keywprd,res0)
+                #keywprd = equipmentrequest_structure(asset_name, i['ext']['asset_type'])
+                keywprd = {
+    "From": 0,
+    "Size": 10,
+    "MinScore": 0.7,
+    "AssetModelFieldsWithAnd": [
+        {
+            "FieldName": "vec_search",
+            "FieldType": "knn",
+            "QueryValue": [
+                asset_name
+            ]
+        }
+    ],
+    "SPUIDs": None,
+    "AssetModelBizTypes": [
+        "asset_sku"
+    ]
+}
+                res = json.loads(get_query_vector(keywprd, clientinfo))
+                #res = get_by_AssetModelBizTypes(keywprd,res0)
             if "设备/配件退还" in i['ext']['BPO标注-AP-分发技能']:
-                keywprd = equipmentreturn_structure0(json.loads(i['ext']['BPO标注-AP-资产名称']), i['ext']['asset_type'])
+                keywprd = equipmentreturn_structure0(asset_name, i['ext']['asset_type'])
                 res0 = json.loads(get_query_vector(keywprd, clientinfo))
                 res = get_by_AssetModelBizTypes(keywprd, res0)
         else:
             res = ""
-        infoout = do_waterlevellineres_list(res, info)
+        infoout = do_waterlevellineres_listv2(res, info)
         info_list.append(copy.deepcopy(infoout))
         a = a+1
         print("这是"+str(a))
@@ -449,9 +513,15 @@ def do_waterlevelline_autotest_aseetspu(collections, clientinfo, score_threshold
     for i in collections:
         info['input']['用户输入/userInput'] = i['ext']['BPO标注-AP-资产名称']
         info['output']['用户输入/output'] = i['ext']['BPO标注-AP-资产名称']
-        info['exp'] = [
-            {'label': i['ext']['BPO标注-AP-资产型号'], 'score': score_threshold},
-            {'label': i['ext'].get('BPO标注-AP-资产型号1', ''), 'score': score_threshold}]
+        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})
         info['artificial'] = info['exp']
         info['label']=[]
         if i['ext']['BPO标注-AP-资产名称']:
@@ -460,14 +530,15 @@ def do_waterlevelline_autotest_aseetspu(collections, clientinfo, score_threshold
                 try:
                     # 尝试将其解析为 JSON 对象
                     if isinstance(asset_name, str):
-                        asset_name = json.loads(asset_name)
+                        asset_name0 = json.loads(asset_name)
+                        asset_name = asset_name0['asset_name']
                 except json.JSONDecodeError:
                     # 若解析失败，说明不是 JSON 格式，保持原样
                     pass
                 key = asset_name.get('asset_name') if isinstance(asset_name, dict) else asset_name
                 if i['ext']['BPO标注-AP-资产类型'] == "设备":
                     hardtype = 1
-                elif  i['ext']['BPO标注-AP-资产类型'] == "配件" :
+                elif  i['ext']['BPO标注-AP-资产类型'] == "配件" or  i['ext']['BPO标注-AP-资产类型'] == '2.0' :
                     hardtype = 2
                 res = GetBestMatchItemonline(key,hardtype,clientinfo)
         else:

{itam_assistant-0.1.2 → itam_assistant-0.1.4}/it_assistant/intent_detail.py

@@ -51,14 +51,11 @@ class webapiClient():
             "endAt": endAt,
             "matchIntentID": "",
             "matchStatus": [],
-            "pageSize": pageSize + 10
+            "pageSize": pageSize + 1000
         })
         try:
             self.conn.request("POST","/ai/api/v1/conversational_runtime/namespaces/spring_f17d05d924__c/stats/intent_detail_list",payload, self.headers)
             res = self.conn.getresponse()
-            #url = "https://apaas.feishu.cn/ai/api/v1/conversational_runtime/namespaces/spring_f17d05d924__c/stats/intent_detail_list"
-            #response = requests.request("POST", url, headers=self.headers, data=payload)
-
             # 检查响应状态码
             if res.status != 200:
                 raise http.client.HTTPException(f"请求失败，状态码: {res.status}, 原因: {res.reason}")
@@ -74,8 +71,9 @@ class webapiClient():
                 raise ValueError("响应数据缺少必要的字段 'data' 或 'intentDetailList'")
 
             res_list = []
-            for i in data['data']['intentDetailList']:
-                if i['channelType'] in ["LARK_OPEN_API", "LARK_BOT", "ANONYMOUS_CUI_SDK", "AILY_CUI_SDK"]:
+            data_ = data['data']['intentDetailList']
+            for i in data_:
+                if i['channelType'] in ["LARK_OPEN_API"]:
                     res_list.append({
                         '对话日志/intentID': i['intentID'],
                         '用户输入/userInput': i['userInput'],

{itam_assistant-0.1.2 → itam_assistant-0.1.4}/it_assistant/openapi.py

@@ -54,10 +54,10 @@ def get_query_vector(para, clientinfo):
         'Authorization': clientinfo.get(
             "authorization") or "Basic cm40cmFpdTRwenY1cGlsYTo2bWhvOXV3ZXFrOHZpbDllcXRxMHZ1YmVnc2xjeXBucg==",
         'x-use-ppe': '1',
-        'x-tt-env': clientinfo.get("x_tt_env") or "ppe_cn_env_self_test_feat_cr_a",
+        'x-tt-env': clientinfo.get("x_tt_env") or "ppe_openapi_vector_v2",
         'Content-Type': 'application/json'
     }
-
+    time.sleep(2.1)
     response = requests.request("POST", url, headers=headers, data=payload)
     return response.text
 

{itam_assistant-0.1.2 → itam_assistant-0.1.4}/itam_assistant.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: itam-assistant
-Version: 0.1.2
-Summary: 新增线上设备型号接口--
-Home-page: https://github.com/liujunmeiD/it_assistant
+Version: 0.1.4
+Summary: 优化版本
+Home-page: https://github.com/liujunmeiD/itam_assistant
 Author: liujunmeiD
 Author-email: 1105030421@qq.com
 Classifier: Programming Language :: Python :: 3

{itam_assistant-0.1.2 → itam_assistant-0.1.4}/setup.py

@@ -2,13 +2,13 @@ from setuptools import setup, find_packages
 
 setup(
     name="itam_assistant",  # 包名称
-    version="0.1.2",    # 版本号
+    version="0.1.4",    # 版本号
     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/it_assistant",
+    url="https://github.com/liujunmeiD/itam_assistant",
     packages=find_packages(),  # 自动发现所有包
     install_requires=[         # 依赖项
         "requests>=2.25.1",