qrpa 1.0.32__tar.gz → 1.0.34__tar.gz

{qrpa-1.0.32 → qrpa-1.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.32
+Version: 1.0.34
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.0.32 → qrpa-1.0.34}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qrpa"
-version = "1.0.32"
+version = "1.0.34"
 description = "qsir's rpa library"
 authors = [{ name = "QSir", email = "1171725650@qq.com" }]
 readme = "README.md"

{qrpa-1.0.32 → qrpa-1.0.34}/qrpa/feishu_bot_app.py

@@ -32,17 +32,17 @@ class FeishuBot:
                 .build()
         return self._client
     
-    def _get_chat_id(self, chat_alias: str) -> Optional[str]:
+    def _get_chat_id(self, bot_name: str) -> Optional[str]:
         """
         根据群组别名获取群组ID
         
         Args:
-            chat_alias: 群组别名
+            bot_name: 群组别名
             
         Returns:
             群组ID，如果别名不存在则返回None
         """
-        return self.config.dict_feishu_group.get(chat_alias)
+        return self.config.dict_feishu_group.get(bot_name)
     
     def _handle_response_error(self, response, operation_name: str):
         """
@@ -61,20 +61,20 @@ class FeishuBot:
             return True
         return False
     
-    def send_text(self, content: str, chat_alias: str = 'test') -> bool:
+    def send_text(self, content: str, bot_name: str = 'test') -> bool:
         """
         发送文本消息
         
         Args:
             content: 文本内容
-            chat_alias: 群组别名，默认为'test'
+            bot_name: 群组别名，默认为'test'
             
         Returns:
             发送是否成功
         """
-        chat_id = self._get_chat_id(chat_alias)
+        chat_id = self._get_chat_id(bot_name)
         if not chat_id:
-            lark.logger.error(f"未找到群组别名 '{chat_alias}' 对应的群组ID")
+            lark.logger.error(f"未找到群组别名 '{bot_name}' 对应的群组ID")
             return False
         
         message_content = {"text": content}
@@ -101,13 +101,13 @@ class FeishuBot:
         lark.logger.info(lark.JSON.marshal(response.data, indent=4))
         return True
     
-    def send_image(self, file_path: str, chat_alias: str = 'test') -> bool:
+    def send_image(self, file_path: str, bot_name: str = 'test') -> bool:
         """
         发送图片消息
         
         Args:
             file_path: 图片文件路径
-            chat_alias: 群组别名，默认为'test'
+            bot_name: 群组别名，默认为'test'
             
         Returns:
             发送是否成功
@@ -117,9 +117,9 @@ class FeishuBot:
         if not image_key:
             return False
         
-        chat_id = self._get_chat_id(chat_alias)
+        chat_id = self._get_chat_id(bot_name)
         if not chat_id:
-            lark.logger.error(f"未找到群组别名 '{chat_alias}' 对应的群组ID")
+            lark.logger.error(f"未找到群组别名 '{bot_name}' 对应的群组ID")
             return False
         
         message_content = {"image_key": image_key}
@@ -146,13 +146,13 @@ class FeishuBot:
         lark.logger.info(lark.JSON.marshal(response.data, indent=4))
         return True
     
-    def send_excel(self, file_path: str, chat_alias: str = 'test') -> bool:
+    def send_excel(self, file_path: str, bot_name: str = 'test') -> bool:
         """
         发送Excel文件
         
         Args:
             file_path: Excel文件路径
-            chat_alias: 群组别名，默认为'test'
+            bot_name: 群组别名，默认为'test'
             
         Returns:
             发送是否成功
@@ -162,9 +162,9 @@ class FeishuBot:
         if not file_key:
             return False
         
-        chat_id = self._get_chat_id(chat_alias)
+        chat_id = self._get_chat_id(bot_name)
         if not chat_id:
-            lark.logger.error(f"未找到群组别名 '{chat_alias}' 对应的群组ID")
+            lark.logger.error(f"未找到群组别名 '{bot_name}' 对应的群组ID")
             return False
         
         message_content = {"file_key": file_key}

{qrpa-1.0.32 → qrpa-1.0.34}/qrpa/fun_excel.py

@@ -90,6 +90,21 @@ def set_cell_prefix_red(cell, n, color_name):
     except Exception as e:
         print(f"设置字体颜色失败: {e}")
 
+def wrap_column(sheet, columns=None, WrapText=True):
+    if columns is None:
+        return
+    used_range_col = sheet.range('A1').expand('right')
+    for j, cell in enumerate(used_range_col):
+        col = j + 1
+        col_name = index_to_column_name(col)
+        col_val = sheet.range(f'{col_name}1').value
+        if col_val is None:
+            continue
+        for c in columns:
+            if c in col_val:
+                log(f'设置[{c}] 换行 {WrapText}')
+                sheet.range(f'{col_name}:{col_name}').api.WrapText = WrapText
+
 def sort_by_column(data, col_index, header_rows=2, reverse=True):
     if not data or header_rows >= len(data):
         return data
@@ -2626,13 +2641,13 @@ def _execute_operations_batch(excel_path, operations):
         for sheet_name, operation_type, *args in operations:
             # 根据操作类型决定是否需要获取或创建工作表
             sheet = None
-            
+
             # 删除操作不需要获取sheet对象
             if operation_type == 'delete':
                 log(f'删除sheet: {sheet_name}')
                 delete_sheet_if_exists(wb, sheet_name)
                 continue
-            
+
             # 其他操作需要获取或创建工作表
             if isinstance(sheet_name, str):
                 sheet_names = [s.name.strip().lower() for s in wb.sheets]

{qrpa-1.0.32 → qrpa-1.0.34}/qrpa/shein_excel.py

@@ -10,10 +10,214 @@ import numpy as np
 
 class SheinExcel:
 
-    def __init__(self, config):
+    def __init__(self, config, bridge=None):
         self.config = config
+        self.bridge = bridge
         pass
 
+    # 退货列表
+    def write_return_list(self, erp, start_date, end_date):
+        header = ['退货单号', '退货出库时间', '签收状态', '店铺信息', '店长', '退货类型', '退货原因', 'SKC图片', 'SKC信息', '商家SKU', '属性集', 'SKU退货数量', '平台SKU', 'ERP默认供货商', 'ERP成本', '包裹名', '包裹号', '退货计划单号', '订单号', '发货单', '退回方式', '快递名称', '运单号', '退货地址', '商家联系人', '商家手机号', '入库问题图片地址']
+        excel_data = [header]
+
+        dict_store = read_dict_from_file(self.config.shein_store_alias)
+
+        cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_{start_date}_{end_date}.json'
+        dict = read_dict_from_file(cache_file)
+        for store_username, shein_back_list in dict.items():
+            for item in shein_back_list:
+
+                store_name = dict_store.get(store_username)
+
+                returnOrderId = item['id']
+                cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_box_detail_{returnOrderId}.json'
+                return_detail = read_dict_from_file(cache_file)
+                if len(return_detail) == 0:
+                    continue
+
+                returnOrderNo = item['returnOrderNo']
+                returnOrderTypeName = item['returnOrderTypeName']
+                returnOrderStatusName = item['returnOrderStatusName']
+                returnReasonTypeName = item['returnReasonTypeName']
+                returnReason = item['returnReason']
+                waitReturnQuantity = item['waitReturnQuantity']
+                skcReturnQuantity = item['returnQuantity']
+                returnAmount = item['returnAmount']
+                currencyCode = item['currencyCode']
+                returnPlanNo = item['returnPlanNo']
+                sellerOrderNo = item['sellerOrderNo']
+                sellerDeliveryNo = item['sellerDeliveryNo']
+                completeTime = item['completeTime']
+                returnWayTypeName = item['returnWayTypeName']
+                returnExpressCompanyName = item['returnExpressCompanyName']
+                expressNoList = item['expressNoList']
+                returnAddress = item['returnAddress']
+                sellerContract = item['sellerContract']
+                sellerContractPhone = item['sellerContractPhone']
+                isSign = ['已报废', '已签收', '待签收'][item['isSign']]
+                if item['returnScrapType'] == 1:
+                    urls = item.get('qc_report_url', '-')
+                else:
+                    urls = '\n'.join(item['rejectPicUrlList'])
+
+                for package_list in return_detail[0]['boxList']:
+                    package_name = package_list['packageName']
+                    package_no = package_list['returnBoxNo']
+                    for skc_item in package_list['goods']:
+                        skc_img = skc_item['imgPath']
+                        skc = skc_item['skc']
+                        supplierCode = skc_item['supplierCode']
+                        for sku_item in skc_item['details']:
+                            platformSku = sku_item['platformSku']
+                            supplierSku = sku_item['supplierSku']
+                            suffixZh = sku_item['suffixZh']
+                            returnQuantity = sku_item['returnQuantity']
+
+                            store_info = f'{store_username}\n{store_name}\n处理类型: {returnOrderTypeName}\n退货状态: {returnOrderStatusName}'
+                            skc_info = f'SKC: {skc}\n供方货号: {supplierCode}\n预计退货数量/执行退货数量: {waitReturnQuantity}/{skcReturnQuantity}\n预计退货货值: {returnAmount} {currencyCode}'
+
+                            row_item = []
+                            row_item.append(returnOrderNo)
+                            row_item.append(completeTime)
+                            row_item.append(isSign)
+                            row_item.append(store_info)
+                            row_item.append(self.config.shein_store_manager.get(str(store_username).lower()))
+                            row_item.append(returnReasonTypeName)
+                            row_item.append(returnReason)
+                            row_item.append(skc_img)
+                            row_item.append(skc_info)
+                            row_item.append(supplierSku)
+                            row_item.append(suffixZh)
+                            row_item.append(returnQuantity)
+                            row_item.append(platformSku)
+                            row_item.append(self.bridge.get_sku_supplier(supplierSku, erp))
+                            row_item.append(self.bridge.get_sku_cost(supplierSku, erp))
+                            row_item.append(package_name)
+                            row_item.append(package_no)
+                            row_item.append(returnPlanNo)
+                            row_item.append(sellerOrderNo)
+                            row_item.append(sellerDeliveryNo)
+                            row_item.append(returnWayTypeName)
+                            row_item.append(returnExpressCompanyName)
+                            row_item.append(expressNoList)
+                            row_item.append(returnAddress)
+                            row_item.append(sellerContract)
+                            row_item.append(sellerContractPhone)
+                            row_item.append(urls)
+
+                            excel_data.append(row_item)
+
+        cache_file_excel = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_excel_{start_date}_{end_date}.json'
+        write_dict_to_file(cache_file_excel, excel_data)
+
+        cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_{TimeUtils.today_date()}.json'
+        dict = read_dict_from_file(cache_file)
+        for store_username, shein_back_list in dict.items():
+            for item in shein_back_list:
+
+                store_name = dict_store.get(store_username)
+
+                returnOrderId = item['id']
+                cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_box_detail_{returnOrderId}.json'
+                return_detail = read_dict_from_file(cache_file)
+                if len(return_detail) == 0:
+                    continue
+
+                returnOrderNo = item['returnOrderNo']
+                returnOrderTypeName = item['returnOrderTypeName']
+                returnOrderStatusName = item['returnOrderStatusName']
+                returnReasonTypeName = item['returnReasonTypeName']
+                returnReason = item['returnReason']
+                waitReturnQuantity = item['waitReturnQuantity']
+                skcReturnQuantity = item['returnQuantity']
+                returnAmount = item['returnAmount']
+                currencyCode = item['currencyCode']
+                returnPlanNo = item['returnPlanNo']
+                sellerOrderNo = item['sellerOrderNo']
+                sellerDeliveryNo = item['sellerDeliveryNo']
+                completeTime = item['completeTime']
+                returnWayTypeName = item['returnWayTypeName']
+                returnExpressCompanyName = item['returnExpressCompanyName']
+                expressNoList = item['expressNoList']
+                returnAddress = item['returnAddress']
+                sellerContract = item['sellerContract']
+                sellerContractPhone = item['sellerContractPhone']
+                isSign = ['已报废', '已签收', '待签收'][item['isSign']]
+                if item['returnScrapType'] == 1:
+                    urls = item.get('qc_report_url', '-')
+                else:
+                    urls = '\n'.join(item['rejectPicUrlList'])
+
+                for package_list in return_detail[0]['boxList']:
+                    package_name = package_list['packageName']
+                    package_no = package_list['returnBoxNo']
+                    for skc_item in package_list['goods']:
+                        skc_img = skc_item['imgPath']
+                        skc = skc_item['skc']
+                        supplierCode = skc_item['supplierCode']
+                        for sku_item in skc_item['details']:
+                            platformSku = sku_item['platformSku']
+                            supplierSku = sku_item['supplierSku']
+                            suffixZh = sku_item['suffixZh']
+                            returnQuantity = sku_item['returnQuantity']
+
+                            store_info = f'{store_username}\n{store_name}\n处理类型: {returnOrderTypeName}\n退货状态: {returnOrderStatusName}'
+                            skc_info = f'SKC: {skc}\n供方货号: {supplierCode}\n预计退货数量/执行退货数量: {waitReturnQuantity}/{skcReturnQuantity}\n预计退货货值: {returnAmount} {currencyCode}'
+
+                            row_item = []
+                            row_item.append(returnOrderNo)
+                            row_item.append(completeTime)
+                            row_item.append(isSign)
+                            row_item.append(store_info)
+                            row_item.append(self.config.shein_store_manager.get(str(store_username).lower()))
+                            row_item.append(returnReasonTypeName)
+                            row_item.append(returnReason)
+                            row_item.append(skc_img)
+                            row_item.append(skc_info)
+                            row_item.append(supplierSku)
+                            row_item.append(suffixZh)
+                            row_item.append(returnQuantity)
+                            row_item.append(platformSku)
+                            row_item.append(self.bridge.get_sku_supplier(supplierSku, erp))
+                            row_item.append(self.bridge.get_sku_cost(supplierSku, erp))
+                            row_item.append(package_name)
+                            row_item.append(package_no)
+                            row_item.append(returnPlanNo)
+                            row_item.append(sellerOrderNo)
+                            row_item.append(sellerDeliveryNo)
+                            row_item.append(returnWayTypeName)
+                            row_item.append(returnExpressCompanyName)
+                            row_item.append(expressNoList)
+                            row_item.append(returnAddress)
+                            row_item.append(sellerContract)
+                            row_item.append(sellerContractPhone)
+                            row_item.append(urls)
+
+                            excel_data.append(row_item)
+
+        sheet_name = '昨日退货列表'
+
+        cache_file_excel = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_excel_{TimeUtils.today_date()}.json'
+        write_dict_to_file(cache_file_excel, excel_data)
+
+        batch_excel_operations(self.config.excel_return_list, [
+            (sheet_name, 'write', excel_data, ['W', 'Z']),
+            (sheet_name, 'format', self.format_return_list)
+        ])
+
+    def format_return_list(self, sheet):
+        merge_by_column_v2(sheet, '退货单号', ['签收状态', '店铺信息', '店长', '退货类型', '退货原因', 'SKC图片', 'SKC信息', '包裹名', '包裹号', '退货计划单号', '订单号', '发货单', '退货出库时间', '退回方式', '快递名称', '运单号', '退货地址', '商家联系人', '商家手机号', '入库问题图片地址'])
+        beautify_title(sheet)
+        add_borders(sheet)
+        format_to_datetime(sheet, ['时间'])
+        format_to_money(sheet, ['单价', '金额', '成本'])
+        column_to_right(sheet, ['单价', '金额', '成本'])
+        wrap_column(sheet, ['退货原因', '退货地址', '入库问题图片地址'])
+        autofit_column(sheet, ['店铺别名', 'SKC信息'])
+        column_to_left(sheet, ['店铺信息', '商家SKU', '供方货号', '属性集', 'SKC信息', '退货地址'])
+        specify_column_width(sheet, ['退货原因', 'SKC信息', '商家SKU', '退货地址'], 200 / 6)
+        InsertImageV2(sheet, ['SKC图片'])
+
     def dealReturn(self, sheet):
         # 遍历可用行
         used_range_row = sheet.range('A1').expand('down')
@@ -1076,10 +1280,10 @@ class SheinExcel:
         excel_path = self.config.excel_shein_finance_month_report_summary
 
         sheet_name = '总表-算法1'
-        dict_store_manager_shein = read_dict_from_file(self.config.shein_store_alias)
+        dict_store = read_dict_from_file(self.config.shein_store_alias)
         total_data = []
         header = ['店铺账号', '店铺别名']
-        for mall_id, excel_data in dict_store_manager_shein.items():
+        for mall_id, excel_data in dict_store.items():
             total_data += [[mall_id, excel_data]]
 
         log(total_data)
@@ -1099,7 +1303,7 @@ class SheinExcel:
         filtered_value = add_suffixed_column(filtered_value, '毛利', '')
 
         # 匹配店铺店长
-        dict_store_manager_shein = read_dict_from_file(self.config.shein_store_alias)
+        dict_store_manager_shein = self.config.shein_store_manager
         for row in filtered_value:
             mall_name = row[0]
             if mall_name == '店铺账号':
@@ -1118,10 +1322,10 @@ class SheinExcel:
         wb.save()
         close_excel(app, wb)
 
-        dict_store_manager_shein = read_dict_from_file(self.config.shein_store_alias)
+        dict_store = read_dict_from_file(self.config.shein_store_alias)
         total_data = []
         header = ['店铺账号', '店铺别名']
-        for mall_id, excel_data in dict_store_manager_shein.items():
+        for mall_id, excel_data in dict_store.items():
             total_data += [[mall_id, excel_data]]
 
         filtered_value = [header] + total_data
@@ -1139,6 +1343,7 @@ class SheinExcel:
         filtered_value = add_suffixed_column(filtered_value, '毛利', '')
 
         # 匹配店铺店长
+        dict_store_manager_shein = self.config.shein_store_manager
         for row in filtered_value:
             mall_name = row[0]
             if mall_name == '店铺账号':
@@ -1623,7 +1828,7 @@ class SheinExcel:
         for col in columns:
             column_range = sheet.range(f'{col}{start_row}:{col}{end_row}')
             for cell in column_range:
-                if cell.value is not None and isinstance(cell.value, (int, float)) and cell.value < 0:
+                if cell.value is not None and cell.value < 0:
                     cell.font.color = (255, 0, 0)
 
     def _format_daily_header(self, sheet, las_row):

{qrpa-1.0.32 → qrpa-1.0.34}/qrpa/shein_lib.py

@@ -119,6 +119,95 @@ class SheinLib:
 
         log('鉴权处理结束')
 
+    # 获取质检报告pdf地址
+    def get_qc_report_url(self, deliverCode, purchaseCode):
+        log(f'获取质检报告:{deliverCode} {purchaseCode}')
+        url = f"https://sso.geiwohuo.com/pfmp/returnPlan/queryQcReport"
+        payload = {
+            "deliverCode" : deliverCode,
+            "purchaseCode": purchaseCode
+        }
+        response_text = fetch(self.web_page, url, payload)
+        error_code = response_text.get('code')
+        if str(error_code) != '0':
+            raise send_exception(json.dumps(response_text, ensure_ascii=False))
+        qc_report_url = (response_text.get('info', {}).get('data') or [{'qcReportUrl': '质检报告生成中,请稍后查看'}])[0].get('qcReportUrl')
+        log(qc_report_url)
+        return qc_report_url
+
+    def get_return_order_box_detail(self, returnOrderId):
+        log(f'获取退货包裹详情: {returnOrderId}')
+        url = f"https://sso.geiwohuo.com/pfmp/returnOrder/getReturnOrderBoxDetail"
+        payload = {
+            "returnOrderId": returnOrderId,
+            "page"         : 1,
+            "perPage"      : 50
+        }
+        response_text = fetch(self.web_page, url, payload)
+        error_code = response_text.get('code')
+        if str(error_code) != '0':
+            raise send_exception(json.dumps(response_text, ensure_ascii=False))
+        list_item = response_text['info']['data']
+
+        cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_box_detail_{returnOrderId}.json'
+        write_dict_to_file(cache_file, list_item)
+
+    def get_return_order_list(self, start_date, end_date, only_yesterday=1):
+
+        log(f'获取退货列表: {self.store_username} {self.store_name} {start_date} {end_date}')
+
+        page_num = 1
+        page_size = 200  # 列表最多返回200条数据 大了没有用
+
+        url = f"https://sso.geiwohuo.com/pfmp/returnOrder/page"
+        payload = {
+            "addTimeStart": f"{start_date} 00:00:00",
+            "addTimeEnd"  : f"{end_date} 23:59:59",
+            "page"        : page_num,
+            "perPage"     : page_size
+        }
+        response_text = fetch(self.web_page, url, payload)
+        error_code = response_text.get('code')
+        if str(error_code) != '0':
+            raise send_exception(json.dumps(response_text, ensure_ascii=False))
+        list_item = response_text['info']['data']
+        total = response_text['info']['meta']['count']
+        totalPage = math.ceil(total / page_size)
+
+        for page in range(2, totalPage + 1):
+            log(f'获取退供列表 第{page}/{totalPage}页 共{total}条记录')
+            payload['page'] = page
+            response_text = fetch(self.web_page, url, payload)
+            spu_list_new = response_text['info']['data']
+            list_item += spu_list_new
+            time.sleep(0.1)
+
+        all_list_item = []
+        today_list_item = []
+        # 过滤 退货出库时间 是昨天的
+        for item in list_item:
+            has_valid_package = item.get('hasPackage') == 1
+            is_valid_yesterday = TimeUtils.is_yesterday(item['completeTime'], None) if item.get('completeTime') else False
+            if has_valid_package:
+                if int(item['returnScrapType']) == 1:
+                    purchaseCode = item['sellerOrderNo']
+                    delivery_code = item['sellerDeliveryNo']
+                    item['qc_report_url'] = self.get_qc_report_url(delivery_code, purchaseCode)
+                returnOrderId = item['id']
+                self.get_return_order_box_detail(returnOrderId)
+
+                all_list_item.append(item)
+                if is_valid_yesterday:
+                    today_list_item.append(item)
+
+        cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_{TimeUtils.today_date()}.json'
+        write_dict_to_file_ex(cache_file, {self.store_username: today_list_item}, [self.store_username])
+
+        cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_{start_date}_{end_date}.json'
+        write_dict_to_file_ex(cache_file, {self.store_username: all_list_item}, [self.store_username])
+
+        return list_item
+
     # 获取希音退供明细 和 台账明细一个接口
     def get_back_list(self, source='mb'):
         page_num = 1
@@ -1693,7 +1782,8 @@ class SheinLib:
             sale_model = spu_info['saleModel']['name']
 
             # 过滤已经售罄
-            if status_cn in ['已售罄']:
+            if shelf_status == 'SOLD_OUT':
+                log(f'过滤已售罄: {skc} {category_name} {product_name}')
                 continue
 
             for sku_info in spu_info['skuList']:

{qrpa-1.0.32 → qrpa-1.0.34}/qrpa/wxwork.py

@@ -1,318 +1,318 @@
-# -*- coding: utf-8 -*-
-"""
--------------------------------------------------
-@version    : v1.0
-@author     : qsir
-@contact    : qsir@vxnote.com
-@software   : PyCharm
-@filename   : wxwork.py
-@create time: 2025/08/03 
-@modify time: 2025/08/03 
-@describe   : 
--------------------------------------------------
-"""
-import json
-import os
-import hashlib
-import base64
-import requests
-from requests_toolbelt import MultipartEncoder
-from datetime import datetime
-
-# 通过企微群机器人发送消息
-class WxWorkBot:
-    def __init__(self, key):
-        self.key = key
-
-    def upload_media(self, filepath):
-        """
-        上传临时素材，给企微群里发文件消息时需要先将文件上传至企微临时素材中
-        :param filepath:
-        :return: 临时素材的media_id
-        """
-        try:
-            headers = {
-                'Content-Type': 'multipart/form-data',
-            }
-            with open(filepath, 'rb') as f:
-                files = {
-                    'media': (os.path.basename(filepath), f.read())
-                }
-                response = requests.post(
-                    f'https://qyapi.weixin.qq.com/cgi-bin/webhook/upload_media?key={self.key}&type=file',
-                    headers=headers, files=files)
-                response_text = json.loads(response.text)
-                if str(response_text.get('errcode')) != '0':
-                    raise Exception(response_text)
-                if response.status_code == 200:
-                    result = json.loads(response.text)
-                    return result['media_id']
-                else:
-                    print("HTTP Error:", response.status_code)
-                    return None
-        except Exception as err:
-            raise Exception("upload_media error", err)
-
-    def send_file(self, file_path):
-        if not os.path.exists(file_path):
-            print('文件不存在: ', file_path)
-            return
-        """
-        发送文件到群里
-        :param file_path:
-        :return:
-        """
-        media_id = self.upload_media(file_path)
-        data = {
-            "msgtype": "file",
-            "file"   : {
-                "media_id": media_id
-            }
-        }
-        return self.send_msg(data)
-
-    def send_text(self, content, mentioned_list=None, mentioned_mobile_list=None):
-        """
-        发送文本消息
-        :param content:
-        :param mentioned_list: 需要@的人userid
-        :param mentioned_mobile_list: 需要@的人手机号
-        :return:
-        """
-        data = {
-            "msgtype": "text",
-            "text"   : {
-                "content": content
-            }
-        }
-        if mentioned_list is not None and mentioned_list:
-            data['text'].update({"mentioned_list": mentioned_list})
-        if mentioned_mobile_list is not None and mentioned_mobile_list:
-            data['text'].update({"mentioned_mobile_list": mentioned_mobile_list})
-
-        self.send_msg(data)
-
-    def send_markdown(self, content):
-        """
-        发送Markdown消息
-        :param content:
-        :return:
-        """
-        data = {
-            "msgtype" : "markdown",
-            "markdown": {
-                "content": content
-            }
-        }
-        self.send_msg(data)
-
-    def send_notify(self, title, sub_title_list, data_list):
-        """
-        发送Markdown消息
-        :param content:
-        :return:
-        """
-
-        current_date = datetime.now().strftime("%Y-%m-%d")
-        header = f"{current_date} {title}\n\n"
-
-        arr_color = ['warning', 'info', 'warning']
-        arr_sub_header = [f"<font color='{arr_color[index]}'>{title}</font>" for index, title in enumerate(sub_title_list)]
-        sub_header = "\t".join(arr_sub_header) + "\n\n"
-
-        # 获取每个元素的行索引和列索引
-        arr_content = [
-            [
-                f'{value}' if col_idx == 0 else f"<font color='{arr_color[col_idx - 1]}'>{value}</font>"
-                for col_idx, value in enumerate(row)
-            ]  # 每行的元素组成一个子列表
-            for row_idx, row in enumerate(data_list)  # 外层循环控制行
-        ]
-        # 将二维数组转换为字符串
-        content = "\n".join(
-            # 对每行的元素列表使用 join()，用 \t 连接
-            "\t".join(row) for row in arr_content
-        )
-
-        data = {
-            "msgtype" : "markdown",
-            "markdown": {
-                "content": header + sub_header + content
-            }
-        }
-        self.send_msg(data)
-
-    def send_img(self, img_path):
-        """
-        发送图片消息
-        图片（base64编码前）最大不能超过2M，支持JPG,PNG格式
-        :param img_path:
-        :return:
-        """
-        data = {
-            "msgtype": "image",
-            "image"  : {
-                "base64": self.img_to_base64(img_path),
-                "md5"   : self.img_to_md5(img_path)
-            }
-        }
-        self.send_msg(data)
-
-    def send_news(self, title, description, url, picurl):
-        """
-        发送图文消息
-        :param title: 标题
-        :param description: 描述
-        :param url: 跳转URL
-        :param picurl: 图文图片地址
-        :return:
-        """
-        data = {
-            "msgtype": "news",
-            "news"   : {
-                "articles": [
-                    {
-                        "title"      : title,
-                        "description": description,
-                        "url"        : url,
-                        "picurl"     : picurl
-                    }
-                ]
-            }
-        }
-        self.send_msg(data)
-
-    def send_msg(self, data):
-        """
-        发送机器人通用消息到企微群
-        :param data: 消息内容json数据
-        :return:
-        """
-        try:
-            header = {
-                "Content-Type": "application/json"
-            }
-            response = requests.post(f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={self.key}", headers=header, data=json.dumps(data))
-            response_text = json.loads(response.text)
-            if str(response_text.get('errcode')) != '0':
-                raise Exception(response_text)
-            if response.status_code == 200:
-                result = json.loads(response.text)
-                return result
-            else:
-                print("HTTP Error:", response.status_code)
-                return None
-        except Exception as err:
-            raise Exception("Send Chat Message error", err)
-
-    def img_to_md5(self, img_path):
-        # 读取图片文件并计算MD5值
-        with open(img_path, 'rb') as image_file:
-            image_data = image_file.read()
-            return hashlib.md5(image_data).hexdigest()
-
-    def img_to_base64(self, img_path):
-        # 读取图片文件并转换为Base64编码
-        with open(img_path, 'rb') as image_file:
-            image_data = image_file.read()
-            return base64.b64encode(image_data).decode('utf-8')
-
-# 通过企微应用发送消息
-class WxWorkAppBot:
-    def __init__(self, corpid, corpsecret, agentid):
-        self.corpid = corpid
-        self.corpsecret = corpsecret
-        self.agentid = agentid
-        self.access_token = self._getToken()
-
-    def _getToken(self):
-        try:
-            if all([self.corpid, self.corpsecret]):
-                url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={corpid}&corpsecret={corpsecret}".format(
-                    corpid=self.corpid, corpsecret=self.corpsecret)
-                response = requests.get(url)
-                if response.status_code == 200:
-                    result = json.loads(response.text)
-                    return result['access_token']
-                else:
-                    print("HTTP Error:", response.status_code)
-                    return None
-        except Exception as err:
-            raise Exception("get WeChat access Token error", err)
-
-    def _send_msg(self, data):
-        self._check_token()
-        try:
-            send_url = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={access_token}".format(
-                access_token=self.access_token)
-            response = requests.post(send_url, json.dumps(data))
-            if response.status_code == 200:
-                result = json.loads(response.text)
-                return result
-            else:
-                print("HTTP Error:", response.status_code)
-                return None
-        except Exception as err:
-            raise Exception("send WeChat Message error", err)
-
-    def _check_token(self):
-        if self.access_token is None:
-            self._getToken()
-
-    def send_msg(self, data):
-        return self._send_msg(data)
-
-    def upload_media(self, filetype, filepath, filename):
-        """
-        上传临时素材到企微并获取media_id
-        :param filetype: 图片（image）、语音（voice）、视频（video），普通文件（file）
-        :param filepath:
-        :param filename:
-        :return: media_id
-        """
-        try:
-            self._check_token()
-            post_file_url = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?access_token={access_token}&type={filetype}".format(
-                filetype=filetype,
-                access_token=self.access_token)
-
-            m = MultipartEncoder(
-                fields={filename: (filename, open(filepath + filename, 'rb'), 'text/plain')},
-            )
-            response = requests.post(url=post_file_url, data=m, headers={'Content-Type': m.content_type})
-            if response.status_code == 200:
-                result = json.loads(response.text)
-                return result['media_id']
-            else:
-                print("HTTP Error:", response.status_code)
-                return None
-        except Exception as err:
-            raise Exception("upload media error", err)
-
-    def get_media(self, media_id):
-        """
-        获取临时素材
-        :param media_id:
-        :return: 返回二进制形式
-        """
-        try:
-            self._check_token()
-            url = "https://qyapi.weixin.qq.com/cgi-bin/media/get"
-            params = {
-                "access_token": self.access_token,
-                "media_id"    : media_id
-            }
-            response = requests.get(url=url, params=params)
-            if response.status_code == 200:
-                content_type = response.headers.get('Content-Type')
-                if content_type == 'application/json':
-                    response_data = json.loads(response.text)
-                    print("Error:", response_data.get("errmsg"))
-                    return None
-                else:
-                    return response.content
-            else:
-                print("HTTP Error:", response.status_code)
-                return None
-        except Exception as err:
-            raise Exception("get media error", err)
+# -*- coding: utf-8 -*-
+"""
+-------------------------------------------------
+@version    : v1.0
+@author     : qsir
+@contact    : qsir@vxnote.com
+@software   : PyCharm
+@filename   : wxwork.py
+@create time: 2025/08/03 
+@modify time: 2025/08/03 
+@describe   : 
+-------------------------------------------------
+"""
+import json
+import os
+import hashlib
+import base64
+import requests
+from requests_toolbelt import MultipartEncoder
+from datetime import datetime
+
+# 通过企微群机器人发送消息
+class WxWorkBot:
+    def __init__(self, key):
+        self.key = key
+
+    def upload_media(self, filepath):
+        """
+        上传临时素材，给企微群里发文件消息时需要先将文件上传至企微临时素材中
+        :param filepath:
+        :return: 临时素材的media_id
+        """
+        try:
+            headers = {
+                'Content-Type': 'multipart/form-data',
+            }
+            with open(filepath, 'rb') as f:
+                files = {
+                    'media': (os.path.basename(filepath), f.read())
+                }
+                response = requests.post(
+                    f'https://qyapi.weixin.qq.com/cgi-bin/webhook/upload_media?key={self.key}&type=file',
+                    headers=headers, files=files)
+                response_text = json.loads(response.text)
+                if str(response_text.get('errcode')) != '0':
+                    raise Exception(response_text)
+                if response.status_code == 200:
+                    result = json.loads(response.text)
+                    return result['media_id']
+                else:
+                    print("HTTP Error:", response.status_code)
+                    return None
+        except Exception as err:
+            raise Exception("upload_media error", err)
+
+    def send_file(self, file_path):
+        if not os.path.exists(file_path):
+            print('文件不存在: ', file_path)
+            return
+        """
+        发送文件到群里
+        :param file_path:
+        :return:
+        """
+        media_id = self.upload_media(file_path)
+        data = {
+            "msgtype": "file",
+            "file"   : {
+                "media_id": media_id
+            }
+        }
+        return self.send_msg(data)
+
+    def send_text(self, content, mentioned_list=None, mentioned_mobile_list=None):
+        """
+        发送文本消息
+        :param content:
+        :param mentioned_list: 需要@的人userid
+        :param mentioned_mobile_list: 需要@的人手机号
+        :return:
+        """
+        data = {
+            "msgtype": "text",
+            "text"   : {
+                "content": content
+            }
+        }
+        if mentioned_list is not None and mentioned_list:
+            data['text'].update({"mentioned_list": mentioned_list})
+        if mentioned_mobile_list is not None and mentioned_mobile_list:
+            data['text'].update({"mentioned_mobile_list": mentioned_mobile_list})
+
+        self.send_msg(data)
+
+    def send_markdown(self, content):
+        """
+        发送Markdown消息
+        :param content:
+        :return:
+        """
+        data = {
+            "msgtype" : "markdown",
+            "markdown": {
+                "content": content
+            }
+        }
+        self.send_msg(data)
+
+    def send_notify(self, title, sub_title_list, data_list):
+        """
+        发送Markdown消息
+        :param content:
+        :return:
+        """
+
+        current_date = datetime.now().strftime("%Y-%m-%d")
+        header = f"{current_date} {title}\n\n"
+
+        arr_color = ['warning', 'info', 'warning']
+        arr_sub_header = [f"<font color='{arr_color[index]}'>{title}</font>" for index, title in enumerate(sub_title_list)]
+        sub_header = "\t".join(arr_sub_header) + "\n\n"
+
+        # 获取每个元素的行索引和列索引
+        arr_content = [
+            [
+                f'{value}' if col_idx == 0 else f"<font color='{arr_color[col_idx - 1]}'>{value}</font>"
+                for col_idx, value in enumerate(row)
+            ]  # 每行的元素组成一个子列表
+            for row_idx, row in enumerate(data_list)  # 外层循环控制行
+        ]
+        # 将二维数组转换为字符串
+        content = "\n".join(
+            # 对每行的元素列表使用 join()，用 \t 连接
+            "\t".join(row) for row in arr_content
+        )
+
+        data = {
+            "msgtype" : "markdown",
+            "markdown": {
+                "content": header + sub_header + content
+            }
+        }
+        self.send_msg(data)
+
+    def send_img(self, img_path):
+        """
+        发送图片消息
+        图片（base64编码前）最大不能超过2M，支持JPG,PNG格式
+        :param img_path:
+        :return:
+        """
+        data = {
+            "msgtype": "image",
+            "image"  : {
+                "base64": self.img_to_base64(img_path),
+                "md5"   : self.img_to_md5(img_path)
+            }
+        }
+        self.send_msg(data)
+
+    def send_news(self, title, description, url, picurl):
+        """
+        发送图文消息
+        :param title: 标题
+        :param description: 描述
+        :param url: 跳转URL
+        :param picurl: 图文图片地址
+        :return:
+        """
+        data = {
+            "msgtype": "news",
+            "news"   : {
+                "articles": [
+                    {
+                        "title"      : title,
+                        "description": description,
+                        "url"        : url,
+                        "picurl"     : picurl
+                    }
+                ]
+            }
+        }
+        self.send_msg(data)
+
+    def send_msg(self, data):
+        """
+        发送机器人通用消息到企微群
+        :param data: 消息内容json数据
+        :return:
+        """
+        try:
+            header = {
+                "Content-Type": "application/json"
+            }
+            response = requests.post(f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={self.key}", headers=header, data=json.dumps(data))
+            response_text = json.loads(response.text)
+            if str(response_text.get('errcode')) != '0':
+                raise Exception(response_text)
+            if response.status_code == 200:
+                result = json.loads(response.text)
+                return result
+            else:
+                print("HTTP Error:", response.status_code)
+                return None
+        except Exception as err:
+            raise Exception("Send Chat Message error", err)
+
+    def img_to_md5(self, img_path):
+        # 读取图片文件并计算MD5值
+        with open(img_path, 'rb') as image_file:
+            image_data = image_file.read()
+            return hashlib.md5(image_data).hexdigest()
+
+    def img_to_base64(self, img_path):
+        # 读取图片文件并转换为Base64编码
+        with open(img_path, 'rb') as image_file:
+            image_data = image_file.read()
+            return base64.b64encode(image_data).decode('utf-8')
+
+# 通过企微应用发送消息
+class WxWorkAppBot:
+    def __init__(self, corpid, corpsecret, agentid):
+        self.corpid = corpid
+        self.corpsecret = corpsecret
+        self.agentid = agentid
+        self.access_token = self._getToken()
+
+    def _getToken(self):
+        try:
+            if all([self.corpid, self.corpsecret]):
+                url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={corpid}&corpsecret={corpsecret}".format(
+                    corpid=self.corpid, corpsecret=self.corpsecret)
+                response = requests.get(url)
+                if response.status_code == 200:
+                    result = json.loads(response.text)
+                    return result['access_token']
+                else:
+                    print("HTTP Error:", response.status_code)
+                    return None
+        except Exception as err:
+            raise Exception("get WeChat access Token error", err)
+
+    def _send_msg(self, data):
+        self._check_token()
+        try:
+            send_url = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={access_token}".format(
+                access_token=self.access_token)
+            response = requests.post(send_url, json.dumps(data))
+            if response.status_code == 200:
+                result = json.loads(response.text)
+                return result
+            else:
+                print("HTTP Error:", response.status_code)
+                return None
+        except Exception as err:
+            raise Exception("send WeChat Message error", err)
+
+    def _check_token(self):
+        if self.access_token is None:
+            self._getToken()
+
+    def send_msg(self, data):
+        return self._send_msg(data)
+
+    def upload_media(self, filetype, filepath, filename):
+        """
+        上传临时素材到企微并获取media_id
+        :param filetype: 图片（image）、语音（voice）、视频（video），普通文件（file）
+        :param filepath:
+        :param filename:
+        :return: media_id
+        """
+        try:
+            self._check_token()
+            post_file_url = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?access_token={access_token}&type={filetype}".format(
+                filetype=filetype,
+                access_token=self.access_token)
+
+            m = MultipartEncoder(
+                fields={filename: (filename, open(filepath + filename, 'rb'), 'text/plain')},
+            )
+            response = requests.post(url=post_file_url, data=m, headers={'Content-Type': m.content_type})
+            if response.status_code == 200:
+                result = json.loads(response.text)
+                return result['media_id']
+            else:
+                print("HTTP Error:", response.status_code)
+                return None
+        except Exception as err:
+            raise Exception("upload media error", err)
+
+    def get_media(self, media_id):
+        """
+        获取临时素材
+        :param media_id:
+        :return: 返回二进制形式
+        """
+        try:
+            self._check_token()
+            url = "https://qyapi.weixin.qq.com/cgi-bin/media/get"
+            params = {
+                "access_token": self.access_token,
+                "media_id"    : media_id
+            }
+            response = requests.get(url=url, params=params)
+            if response.status_code == 200:
+                content_type = response.headers.get('Content-Type')
+                if content_type == 'application/json':
+                    response_data = json.loads(response.text)
+                    print("Error:", response_data.get("errmsg"))
+                    return None
+                else:
+                    return response.content
+            else:
+                print("HTTP Error:", response.status_code)
+                return None
+        except Exception as err:
+            raise Exception("get media error", err)

{qrpa-1.0.32 → qrpa-1.0.34}/qrpa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.32
+Version: 1.0.34
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>