itam-assistant 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

it_assistant/test.py

@@ -0,0 +1 @@
+["鼠标","显示器双C数据线","Type-C扩展坞","西部数据-WDBEPK0020BBK","鼠标和键盘","鼠标","鼠标","鼠标","笔记本充电器","笔记本充电器","鼠标","And crown-PTH-660/K0-F","mouse and keyboard","hdmi dongle","笔记本支架","蓝牙键盘","mac蓝牙鼠标","鼠标耳机键盘","显示器双C数据线","鼠标","鼠标","鼠标键盘","Adapter","外置硬盘","keyboard","笔记本充电器","鼠标和键盘","Type-C扩展坞","65W笔记本电源","安卓手机数据线","笔记本电源","keyboard","鼠标和键盘","SanDisk-SDSSDE81-4T00-Z25"]

itam_assistant/do_ai.py

@@ -89,19 +89,20 @@ 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
+                time.sleep(4)
             return startAt, num
     except KeyError as ke:
         print(f"KeyError 发生: 数据中缺少必要的键，错误详情: {ke}")
@@ -970,3 +971,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.dist-info → itam_assistant-0.1.11.dist-info}/METADATA

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

itam_assistant-0.1.11.dist-info/RECORD

@@ -0,0 +1,28 @@
+it_assistant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+it_assistant/ailyapp_client.py,sha256=w-ihtcmRgOQCgWK0jB8eHGCikjo1tbre3xCiEKhLrUA,6357
+it_assistant/config.py,sha256=L_5grm2ZWwg_S1JTOU6XLhQ5GPeYJaBFBLwzP2JA5Ys,5498
+it_assistant/do_ai.py,sha256=Rs7SdXx_7DA9MQeEC9TQ-lHYZLFykETXf63-ppgrKek,41505
+it_assistant/intent_detail.py,sha256=hmEj1KpcuKNvsoBZmn5PnbsBIIx6XGmQBJWdW_ICFmg,16831
+it_assistant/lark_client.py,sha256=ZVDsdt7ucQvJN1-khC3TR-0IMeYaQXfdWF5DxRrkBH4,6665
+it_assistant/logger.py,sha256=W3-tbQ4J-QKSrQSpaNBruzoyMuWYrUkrIY0uBZ1o-lw,1583
+it_assistant/openapi.py,sha256=-YMx-Feu1dHkQ86EB1-QmQZJHS4dND3sNSnIpBF94w4,37730
+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=0ICPD3hXJty4cQX-LxBjl6os-2oXJyO0Iej0QuyMkJw,46769
+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
+itam_assistant/openapi.py,sha256=-YMx-Feu1dHkQ86EB1-QmQZJHS4dND3sNSnIpBF94w4,37730
+itam_assistant/test.py,sha256=qGSihMYmtZkz_vifwEOz579f_wPBJAx5_rz1sABUyo4,581
+main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+main/ailyapp_client.py,sha256=6CVlBkuiIvIzqG0lM38tdGFBNLhVi2_0jQIbHg7fpzw,6515
+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.11.dist-info/METADATA,sha256=Jo4YBzkjITrauPn5eAA5CKwqtXBIUbIP2gvSU4vpPWE,775
+itam_assistant-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+itam_assistant-0.1.11.dist-info/top_level.txt,sha256=KpZA4H04XBVAB3NLq0AAEOrAGEurwMnWw41AhJVqVFI,15
+itam_assistant-0.1.11.dist-info/RECORD,,

main/ailyapp_client.py

@@ -0,0 +1,132 @@
+import json
+
+import lark_oapi as lark
+from lark_oapi.api.auth.v3 import *
+from lark_oapi.api.aily.v1 import *
+
+
+# SDK 使用说明: https://open.feishu.cn/document/uAjLw4CM/ukTMukTMukTM/server-side-sdk/python--sdk/preparations-before-development
+# 以下示例代码默认根据文档示例值填充，如果存在代码问题，请在 API 调试台填上相关必要参数后再复制代码使用
+# 复制该 Demo 后, 需要将 "YOUR_APP_ID", "YOUR_APP_SECRET" 替换为自己应用的 APP_ID, APP_SECRET.
+
+class AilyLarkClient:
+    def __init__(self):
+        """
+        初始化 Client 实例,tenant_access_token 会在 Client 初始化时自动获取
+        """
+        self.aily_app_id = "spring_f17d05d924__c"
+        self.app_id = "cli_a6e3aea1a13c900c"
+        self.app_secret = "J0fAPt3BL6bv4KUJV0dJMdTUdr0pv3xx"
+        # 创建 Lark-tenant tenant客户端
+        self.tlark_client = lark.Client.builder().app_id(self.app_id).app_secret(self.app_secret).build()
+
+        # 创建 Lark-tenant user 客户端
+        self.ulark_client = lark.Client.builder().enable_set_token(True).log_level(lark.LogLevel.DEBUG).build()
+
+    def get_tenant_access_token(self):
+        # 构造请求对象
+        request: InternalTenantAccessTokenRequest = InternalTenantAccessTokenRequest.builder() \
+            .request_body(InternalTenantAccessTokenRequestBody.builder()
+                          .app_id(self.app_id)
+                          .app_secret(self.app_secret)
+                          .build()) \
+            .build()
+
+        # 发起请求
+        response: InternalTenantAccessTokenResponse = self.tlark_client.auth.v3.tenant_access_token.internal(request)
+
+        # 处理失败返回
+        if not response.success():
+            lark.logger.error(
+                f"client.auth.v3.tenant_access_token.internal failed, code: {response.code}, msg: {response.msg}, log_id: {response.get_log_id()}, resp: \n{json.dumps(json.loads(response.raw.content), indent=4, ensure_ascii=False)}")
+            return
+        # 处理业务结果
+        lark.logger.info(lark.JSON.marshal(response.raw, indent=4))
+        tenant_access_token = json.loads(response.raw.content).get("tenant_access_token")
+        if tenant_access_token:
+            return tenant_access_token
+        else:
+            lark.logger.error(
+                f"client.auth.v3.tenant_access_token.internal failed, code: {response.code}, msg: {response.msg}, log_id: {response.get_log_id()}, resp: \n{json.dumps(json.loads(response.raw.content), indent=4, ensure_ascii=False)}")
+            return
+
+    def create_ailysession(self, access_token):
+        # 创建会话
+        # 构造请求对象
+        request: CreateAilySessionRequest = CreateAilySessionRequest.builder() \
+            .request_body(CreateAilySessionRequestBody.builder()
+                          .channel_context("{}")
+                          .metadata("{}")
+                          .build()) \
+            .build()
+
+        # 发起请求
+        option = lark.RequestOption.builder().user_access_token(access_token).build()
+        response: CreateAilySessionResponse = self.ulark_client.aily.v1.aily_session.create(request, option)
+
+        # 处理失败返回
+        if not response.success():
+            lark.logger.error(
+                f"client.aily.v1.aily_session.create failed, code: {response.code}, msg: {response.msg}, log_id: {response.get_log_id()}, resp: \n{json.dumps(json.loads(response.raw.content), indent=4, ensure_ascii=False)}")
+            return
+
+        # 处理业务结果
+        lark.logger.info(lark.JSON.marshal(response.data, indent=4))
+        return response.data.session.id
+
+    def create_ailysessionaily_message(self, access_token, session_id, content):
+        # 发送智能伙伴消息
+        # 构造请求对象
+        request: CreateAilySessionAilyMessageRequest = CreateAilySessionAilyMessageRequest.builder() \
+            .aily_session_id(session_id) \
+            .request_body(CreateAilySessionAilyMessageRequestBody.builder()
+                          .content(content)
+                          .content_type("MDX")
+                          .idempotent_id("idempotent_id_1")
+                          .build()) \
+            .build()
+        # 发起请求
+        option = lark.RequestOption.builder().user_access_token(access_token).build()
+        response: CreateAilySessionAilyMessageResponse = self.ulark_client.aily.v1.aily_session_aily_message.create(
+            request,
+            option)
+        # 处理失败返回
+        if not response.success():
+            lark.logger.error(
+                f"client.aily.v1.aily_session_aily_message.create failed, code: {response.code}, msg: {response.msg}, log_id: {response.get_log_id()}, resp: \n{json.dumps(json.loads(response.raw.content), indent=4, ensure_ascii=False)}")
+            return
+        # 处理业务结果
+        lark.logger.info(lark.JSON.marshal(response.data, indent=4))
+        return response.data.message.id
+
+    def create_ailysession_run(self, access_token, aily_session_id):
+        # 创建运行
+        # 构造请求对象
+        request: CreateAilySessionRunRequest = CreateAilySessionRunRequest.builder() \
+            .aily_session_id(aily_session_id) \
+            .request_body(CreateAilySessionRunRequestBody.builder()
+                          .app_id(self.aily_app_id)
+                          .build()) \
+            .build()
+        # 发起请求
+        option = lark.RequestOption.builder().user_access_token(
+            access_token).build()
+        response: CreateAilySessionRunResponse = self.ulark_client.aily.v1.aily_session_run.create(request, option)
+        # 处理失败返回
+        if not response.success():
+            lark.logger.error(
+                f"client.aily.v1.aily_session_run.create failed, code: {response.code}, msg: {response.msg}, log_id: {response.get_log_id()}, resp: \n{json.dumps(json.loads(response.raw.content), indent=4, ensure_ascii=False)}")
+            return
+
+        # 处理业务结果
+        lark.logger.info(lark.JSON.marshal(response.data, indent=4))
+
+
+
+if __name__ == '__main__':
+    tenant_access_token = AilyLarkClient().get_tenant_access_token()
+    seseion_id = AilyLarkClient().create_ailysession(tenant_access_token)
+    print(seseion_id)
+    message_id = AilyLarkClient().create_ailysessionaily_message(tenant_access_token, seseion_id, "你好")
+    runs = AilyLarkClient().create_ailysession_run(tenant_access_token, seseion_id)
+

main/do_ai.py

@@ -0,0 +1,177 @@
+# -*- coding: utf-8 -*-
+
+from itam_assistant1.ailyapp_client import AilyLarkClient
+from itam_assistant1.lark_client import LarkdocsClient
+from itam_assistant1.intent_detail import *
+import datetime
+
+
+# Testsuitelink = "https://bytedance.larkoffice.com/sheets/ZVzfsw4rMhkMF6tjtxmc4BdSnMb"
+
+
+
+def do_ai_auto(Testsuitelink):
+    """
+    自动化执行AI测试用例
+    """
+    startAt = 0
+    try:
+        # 获取租户访问令牌
+        tenant_access_token = AilyLarkClient().get_tenant_access_token()
+        if not tenant_access_token:
+            raise ValueError("未能获取到有效的租户访问令牌")
+        # 通过文档链接获取spreadsheet_token
+        spreadsheet_token = Testsuitelink.split("/")[-1]
+        if not spreadsheet_token:
+            raise ValueError("未能从文档链接中提取到有效的spreadsheet_token")
+        # 读取表格用户输入
+        spreadsheet = LarkdocsClient().get_the_worksheet(spreadsheet_token)
+        if not spreadsheet:
+            raise ValueError("未能获取到有效的工作表数据")
+        for i in spreadsheet.sheets:
+            column_count = i.grid_properties.column_count
+            row_count = i.grid_properties.row_count
+            sheet_id = i.sheet_id
+            title = i.title
+            if title == "测试集":
+                # 构建JSON字符串
+                json_str = {"ranges": [sheet_id + "!A1:A" + str(row_count)]}
+                # 获取纯文本内容
+                test = LarkdocsClient().get_plaintextcontent(json_str, spreadsheet_token, sheet_id)
+                test = json.loads(test)
+                userinput = test['data']['value_ranges'][0]['values']
+                print(f"表头为{userinput[0]}")
+                for i in range(1, row_count):
+                    if userinput[i][0]:
+                        if startAt == 0:
+                            startAt = int(time.time())
+                        # 创建会话
+                        seseion_id = AilyLarkClient().create_ailysession(tenant_access_token)
+                        if not seseion_id:
+                            raise ValueError("未能成功创建会话")
+                        # 创建消息
+                        message_id = AilyLarkClient().create_ailysessionaily_message(tenant_access_token, seseion_id,
+                                                                                     userinput[i][0])
+                        if not message_id:
+                            raise ValueError("未能成功创建消息")
+                        # 创建运行实例
+                        runs = AilyLarkClient().create_ailysession_run(tenant_access_token, seseion_id)
+                        #可不需等待运行实例创建完成
+                        #if not runs:
+                        #    raise ValueError("未能成功创建运行实例")
+                        time.sleep(1)
+                    else:
+                        return startAt, i
+                        break
+                return startAt, row_count
+                break
+    except KeyError as ke:
+        print(f"KeyError 发生: 数据中缺少必要的键，错误详情: {ke}")
+        return None, None
+    except json.JSONDecodeError as jde:
+        print(f"JSON 解析错误: {jde}")
+        return None, None
+    except ValueError as ve:
+        print(f"值错误: {ve}")
+        return None, None
+    except Exception as e:
+        print(f"发生未知错误: {e}")
+        return None, None
+
+
+def get_conversationlogs1(startAt):
+    """
+    对话ID 技能分发 用户输入
+    res_data = {
+            'intentID': 7485259579248705537,
+            'skillLabels': ["GUI 设备/配件申请"],
+            'userInput': "我要申请一个鼠标",
+
+         }
+         """
+    data = webapiClient().get_intent_detail_list(startAt)
+
+
+def get_conversationlogs(startAt, pageSize=10):
+    """
+    对话ID 技能分发 用户输入
+    res_data = {
+            'intentID': 7485259579248705537,
+            'skillLabels': ["GUI 设备/配件申请"],
+            'userInput': "我要申请一个鼠标",
+
+         }
+    """
+    try:
+        # 之前提到形参 'pageSize' 未填，这里假设默认值为 10，你可按需修改
+        data = webapiClient().get_intent_detail_list(startAt, pageSize=10)
+        return data
+    except KeyError as ke:
+        print(f"KeyError 发生: 数据中缺少必要的键，错误详情: {ke}")
+        return None
+    except IndexError as ie:
+        print(f"IndexError 发生: 索引超出范围，错误详情: {ie}")
+        return None
+    except Exception as e:
+        print(f"发生未知错误: {e}")
+        return None
+
+
+def write_reslut(data, Testsuitelink, title):
+    """
+    写入表格
+    """
+    try:
+        # 解析 spreadsheet_token
+        spreadsheet_token = Testsuitelink.split("/")[-1]
+
+        # 生成新工作表名称
+        new_sheet_title = f"{title}{datetime.datetime.now().strftime('%Y_%m_%d_%H_%M_%S')}"
+        sheetinfo = {"index": 0, "title": new_sheet_title}
+
+        # 创建新工作表
+        spreadsheet0 = LarkdocsClient().createsheets(spreadsheet_token, sheetinfo)
+        sheet_id = spreadsheet0['sheet_id']
+
+        # 准备表头数据
+        headers = list(data[0].keys())
+        header_data = [
+            {
+                "range": f"{sheet_id}!{chr(ord('A') + col)}1:{chr(ord('A') + col)}1",
+                "values": [[[{"text": {"text": header}, "type": "text"}]]]
+            }
+            for col, header in enumerate(headers)
+        ]
+
+        # 写入表头
+        LarkdocsClient().writesheets(spreadsheet_token, sheet_id, {"value_ranges": header_data})
+
+        # 写入数据
+        for row, row_data in enumerate(data, start=1):
+            row_values = [
+                {
+                    "range": f"{sheet_id}!{chr(ord('A') + col)}{row + 1}:{chr(ord('A') + col)}{row + 1}",
+                    "values": [[[{"text": {"text": str(row_data[header])}, "type": "text"}]]]
+                }
+                for col, header in enumerate(headers)
+            ]
+            LarkdocsClient().writesheets(spreadsheet_token, sheet_id, {"value_ranges": row_values})
+
+        return True
+    except KeyError as ke:
+        print(f"KeyError 发生: 数据中缺少必要的键，错误详情: {ke}")
+        return False
+    except IndexError as ie:
+        print(f"IndexError 发生: 索引超出范围，错误详情: {ie}")
+        return False
+    except Exception as e:
+        print(f"发生未知错误: {e}")
+        return False
+
+
+if __name__ == '__main__':
+    Testsuitelink = "https://bytedance.larkoffice.com/sheets/ZVzfsw4rMhkMF6tjtxmc4BdSnMb"
+    startAt, num = do_ai_auto(Testsuitelink)
+    data = webapiClient().get_intent_detail_list(startAt, num)
+    data_qqq = webapiClient().get_intent_detail_llm(data)
+    aaaa = write_reslut(data_qqq, Testsuitelink, "测试")