pixelarraylib 1.2.1__tar.gz → 1.2.3__tar.gz

{pixelarraylib-1.2.1/pixelarraylib.egg-info → pixelarraylib-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixelarraylib
-Version: 1.2.1
+Version: 1.2.3
 Summary: PixelArray Python开发工具库 - 包含阿里云服务、数据库工具、装饰器、监控等功能
 Author-email: Lu qi <qi.lu@pixelarrayai.com>
 License-Expression: MIT

{pixelarraylib-1.2.1 → pixelarraylib-1.2.3}/pixelarraylib/__init__.py

@@ -20,7 +20,7 @@ PixelArray Python开发工具库
     from pixelarraylib.gitlab import pypi_package_manager
 """
 
-__version__ = "1.2.1"
+__version__ = "1.2.3"
 __author__ = "PixelArray"
 __email__ = "qi.lu@pixelarrayai.com"
 

{pixelarraylib-1.2.1 → pixelarraylib-1.2.3}/pixelarraylib/aliyun/oss.py

@@ -7,6 +7,7 @@ import base64
 import aiohttp
 import asyncio
 import xml.etree.ElementTree as ET
+import requests
 from hashlib import sha1
 from datetime import datetime
 from urllib.parse import quote, urlencode
@@ -39,6 +40,8 @@ class OSSUtils:
             bucket_name(str): OSS存储桶名称
             use_vpc(bool): 是否使用VPC内网端点，默认为False
         """
+        self.access_key_id = access_key_id
+        self.access_key_secret = access_key_secret
         self.bucket_name = bucket_name
         if use_vpc:
             self.endpoint = f"https://oss-{region_id}-internal.aliyuncs.com"
@@ -47,6 +50,8 @@ class OSSUtils:
         self.client = self.get_oss_client(
             access_key_id, access_key_secret, self.endpoint, bucket_name
         )
+        # 创建oss2的Auth对象用于签名
+        self.auth = oss2.Auth(access_key_id, access_key_secret)
 
     def get_oss_client(
         self, access_key_id, access_key_secret, endpoint, bucket_name, retry=3
@@ -71,6 +76,94 @@ class OSSUtils:
                 print(e)
         return None
 
+    def _sign_request(self, method, url, headers=None, params=None):
+        """
+        description:
+            使用oss2库生成OSS签名
+        parameters:
+            method(str): HTTP方法
+            url(str): 请求URL
+            headers(dict): 请求头
+            params(dict): 请求参数
+        return:
+            headers(dict): 包含签名的请求头
+        """
+        if headers is None:
+            headers = {}
+        if params is None:
+            params = {}
+
+        # 创建oss2的Request对象
+        req = oss2.http.Request(method, url, params=params, headers=headers)
+
+        # 使用oss2的签名功能
+        self.auth._sign_request(req, "", "")
+
+        # 过滤掉None键和None值
+        result = {}
+        for k, v in req.headers.items():
+            if k is not None and v is not None:
+                result[str(k)] = str(v)
+        return result
+
+    def list_regions(self):
+        """
+        description:
+            列出OSS支持的区域
+        return:
+            regions(list): 区域列表，每个元素为字典，包含 region_id, region_name, internal_endpoint, internet_endpoint
+        """
+        try:
+            # 使用通用的OSS endpoint来获取区域列表
+            url = "https://oss-cn-hangzhou.aliyuncs.com/?regions"
+            
+            # 生成签名
+            headers = self._sign_request("GET", url)
+            
+            # 发送请求
+            response = requests.get(url, headers=headers)
+            response.raise_for_status()
+            
+            # 解析XML响应
+            root = ET.fromstring(response.text)
+            regions = []
+            
+            # 查找所有 RegionInfo 元素
+            for region_info_elem in root.findall(".//RegionInfo"):
+                region_elem = region_info_elem.find("Region")
+                internal_endpoint_elem = region_info_elem.find("InternalEndpoint")
+                internet_endpoint_elem = region_info_elem.find("InternetEndpoint")
+                
+                region_id = region_elem.text if region_elem is not None else ""
+                # 从 region_id 中提取区域名称（去掉 oss- 前缀）
+                region_name = region_id.replace("oss-", "") if region_id else None
+                internal_endpoint = internal_endpoint_elem.text if internal_endpoint_elem is not None else None
+                internet_endpoint = internet_endpoint_elem.text if internet_endpoint_elem is not None else None
+                
+                if region_id:
+                    regions.append({
+                        "region_id": region_id,
+                        "region_name": region_name,
+                        "internal_endpoint": internal_endpoint,
+                        "internet_endpoint": internet_endpoint
+                    })
+            self.regions = regions
+            return regions
+        except Exception as e:
+            print(f"list_regions error: {traceback.format_exc()}, {e}")
+            self.regions = []
+            return []
+
+    def list_region_ids(self):
+        """
+        description:
+            列出OSS支持的区域ID
+        return:
+            region_ids(list): 区域ID列表
+        """
+        regions = self.list_regions()
+        return [region["region_id"] for region in regions]
+
     def list_objects(self, prefix, batch_size=100):
         """
         description:
@@ -310,6 +403,19 @@ class OSSObject:
         self.etag = etag
 
 
+class OSSRegion:
+    """OSS 区域表示类"""
+
+    def __init__(self, region_id, region_name=None, internal_endpoint=None, internet_endpoint=None):
+        self.region_id = region_id
+        self.region_name = region_name
+        self.internal_endpoint = internal_endpoint
+        self.internet_endpoint = internet_endpoint
+
+    def __repr__(self):
+        return f"OSSRegion(region_id='{self.region_id}', region_name='{self.region_name}', internet_endpoint='{self.internet_endpoint}')"
+
+
 class OSSUtilsAsync:
     def __init__(
         self, access_key_id, access_key_secret, region_id, bucket_name, use_vpc=False
@@ -440,6 +546,77 @@ class OSSUtilsAsync:
             print(f"XML 解析错误: {e}")
             return []
 
+    async def list_regions(self):
+        """
+        description:
+            列出OSS支持的区域
+        return:
+            regions(list): 区域列表，每个元素为字典，包含 region_id, region_name, internal_endpoint, internet_endpoint
+        """
+        try:
+            # 使用通用的OSS endpoint来获取区域列表
+            url = "https://oss-cn-hangzhou.aliyuncs.com/?regions"
+            
+            # 生成签名（对于 list_regions API，不需要 bucket_name）
+            # 直接使用空字符串作为 bucket_name，因为 list_regions 不需要 bucket
+            headers = {}
+            params = {}
+            req = oss2.http.Request("GET", url, params=params, headers=headers)
+            # 使用空字符串作为 bucket_name，因为 list_regions 不需要 bucket
+            self.auth._sign_request(req, "", "")
+            signed_headers = {}
+            for k, v in req.headers.items():
+                if k is not None and v is not None:
+                    signed_headers[str(k)] = str(v)
+            
+            # 发送请求
+            session = await self._ensure_session()
+            async with session.get(url, headers=signed_headers) as resp:
+                if resp.status != 200:
+                    resp.raise_for_status()
+                
+                # 解析XML响应
+                text = await resp.text()
+                root = ET.fromstring(text)
+                regions = []
+                
+                # 查找所有 RegionInfo 元素
+                for region_info_elem in root.findall(".//RegionInfo"):
+                    region_elem = region_info_elem.find("Region")
+                    internal_endpoint_elem = region_info_elem.find("InternalEndpoint")
+                    internet_endpoint_elem = region_info_elem.find("InternetEndpoint")
+                    
+                    region_id = region_elem.text if region_elem is not None else ""
+                    # 从 region_id 中提取区域名称（去掉 oss- 前缀）
+                    region_name = region_id.replace("oss-", "") if region_id else None
+                    internal_endpoint = internal_endpoint_elem.text if internal_endpoint_elem is not None else None
+                    internet_endpoint = internet_endpoint_elem.text if internet_endpoint_elem is not None else None
+                    
+                    if region_id:
+                        regions.append({
+                            "region_id": region_id,
+                            "region_name": region_name,
+                            "internal_endpoint": internal_endpoint,
+                            "internet_endpoint": internet_endpoint
+                        })
+                
+                self.regions = regions
+                return regions
+        except Exception as e:
+            print(f"list_regions error: {traceback.format_exc()}, {e}")
+            self.regions = []
+            return []
+
+    async def list_region_ids(self):
+        """
+        description:
+            列出OSS支持的区域ID
+        return:
+            region_ids(list): 区域ID列表
+        """
+        regions = await self.list_regions()
+        return [region["region_id"] for region in regions]
+
     async def list_objects(self, prefix="", max_keys=100):
         """列出对象，返回所有匹配的对象"""
         session = await self._ensure_session()

{pixelarraylib-1.2.1 → pixelarraylib-1.2.3}/pixelarraylib/monitor/feishu.py

@@ -20,6 +20,7 @@ class Feishu:
         "picturetransform服务报警": "https://open.feishu.cn/open-apis/bot/v2/hook/e975aa0a-acef-4e3f-bee4-6dc507b87ebd",
         "cloudstorage服务报警": "https://open.feishu.cn/open-apis/bot/v2/hook/a632d0bc-e400-40ce-a3bb-1b9b9ee634f4",
         "deployengine服务报警": "https://open.feishu.cn/open-apis/bot/v2/hook/9a347a63-58fb-4e10-9a3d-ff4918ddb3a9",
+        "browseruse服务报警": "https://open.feishu.cn/open-apis/bot/v2/hook/a7cf22c5-f50d-4031-b17f-a75f92a3aa91",
     }
 
     def __init__(
@@ -571,3 +572,224 @@ class FeishuDocumentManager:
             return result, True
         except requests.RequestException as e:
             return {"code": -1, "msg": f"请求失败: {str(e)}"}, False
+
+
+class FeishuUserManager:
+    """
+    飞书用户管理器，用于管理飞书用户的发送消息和查询
+    """
+
+    def __init__(
+        self,
+        app_id: Optional[str] = None,
+        app_secret: Optional[str] = None,
+    ):
+        """
+        description:
+            初始化飞书用户管理器
+        parameters:
+            app_id(Optional[str]): 飞书应用ID，如果不提供则从settings中读取
+            app_secret(Optional[str]): 飞书应用密钥，如果不提供则从settings中读取
+        """
+        try:
+            from settings import FEISHU_APP_ID, FEISHU_APP_SECRET
+            self.app_id = app_id or FEISHU_APP_ID
+            self.app_secret = app_secret or FEISHU_APP_SECRET
+        except ImportError:
+            if not app_id or not app_secret:
+                raise ValueError(
+                    "必须提供app_id和app_secret，或者在settings中配置FEISHU_APP_ID和FEISHU_APP_SECRET"
+                )
+            self.app_id = app_id
+            self.app_secret = app_secret
+
+        self.base_url = "https://open.feishu.cn/open-apis"
+        self._tenant_access_token = None
+        self._token_expire_time = 0
+
+    def _get_tenant_access_token(self) -> str:
+        """
+        description:
+            获取飞书应用的租户访问令牌（tenant_access_token，带缓存机制）
+        return:
+            str: 租户访问令牌
+        """
+        import time
+
+        # 如果token未过期，直接返回缓存的token
+        if self._tenant_access_token and time.time() < self._token_expire_time:
+            return self._tenant_access_token
+
+        url = f"{self.base_url}/auth/v3/tenant_access_token/internal"
+        headers = {"Content-Type": "application/json; charset=utf-8"}
+        data = {
+            "app_id": self.app_id,
+            "app_secret": self.app_secret,
+        }
+
+        try:
+            response = requests.post(url, headers=headers, json=data)
+            response.raise_for_status()
+            result = response.json()
+
+            if result.get("code") != 0:
+                raise Exception(
+                    f"获取tenant_access_token失败: {result.get('msg', 'unknown error')}"
+                )
+
+            self._tenant_access_token = result.get("tenant_access_token")
+            # token有效期默认7200秒，提前300秒刷新
+            expire = result.get("expire", 7200)
+            self._token_expire_time = time.time() + expire - 300
+
+            return self._tenant_access_token
+        except requests.RequestException as e:
+            raise Exception(f"请求tenant_access_token时发生错误: {str(e)}")
+
+    def _get_headers(self) -> dict:
+        """
+        description:
+            获取请求头，包含tenant_access_token
+        return:
+            dict: 请求头字典
+        """
+        return {
+            "Authorization": f"Bearer {self._get_tenant_access_token()}",
+            "Content-Type": "application/json; charset=utf-8",
+        }
+
+    def send_message_to_user(
+        self,
+        receive_id: str,
+        text: str,
+        receive_id_type: str = "open_id",
+    ) -> tuple[dict, bool]:
+        """
+        description:
+            发送消息给指定的飞书用户
+        parameters:
+            receive_id(str): 接收者ID（用户ID）
+            text(str): 要发送的文本内容
+            receive_id_type(str): 接收者ID类型，默认为"open_id"，可选值："open_id"、"user_id"、"union_id"、"email"、"chat_id"
+        return:
+            result(dict): API返回的结果
+            success(bool): 是否成功
+        """
+        url = f"{self.base_url}/im/v1/messages"
+        headers = self._get_headers()
+        # receive_id 和 receive_id_type 作为查询参数
+        params = {
+            "receive_id_type": receive_id_type,
+        }
+        # 请求体只包含消息类型和内容
+        data = {
+            "receive_id": receive_id,
+            "msg_type": "text",
+            "content": json.dumps({"text": text}),
+        }
+
+        try:
+            response = requests.post(url, headers=headers, params=params, json=data)
+            response.raise_for_status()
+            result = response.json()
+
+            if result.get("code") != 0:
+                return result, False
+
+            return result, True
+        except requests.RequestException as e:
+            # 尝试获取更详细的错误信息
+            error_detail = {}
+            if hasattr(e, 'response') and e.response is not None:
+                try:
+                    error_detail = e.response.json()
+                except:
+                    error_detail = {"text": e.response.text if hasattr(e.response, 'text') else str(e)}
+            return {"code": -1, "msg": f"请求失败: {str(e)}", "detail": error_detail}, False
+
+    async def send_message_to_user_async(
+        self,
+        receive_id: str,
+        text: str,
+        receive_id_type: str = "open_id",
+    ) -> tuple[dict, bool]:
+        """
+        description:
+            异步发送消息给指定的飞书用户
+        parameters:
+            receive_id(str): 接收者ID（用户ID）
+            text(str): 要发送的文本内容
+            receive_id_type(str): 接收者ID类型，默认为"open_id"
+        return:
+            result(dict): API返回的结果
+            success(bool): 是否成功
+        """
+        return await asyncio.to_thread(
+            self.send_message_to_user, receive_id, text, receive_id_type
+        )
+
+    def list_users(
+        self,
+        department_id: Optional[str] = None,
+        page_size: int = 50,
+        page_token: Optional[str] = None,
+        user_id_type: str = "open_id",
+    ) -> tuple[dict, bool]:
+        """
+        description:
+            列出飞书中的所有用户（支持按部门筛选）
+        parameters:
+            department_id(Optional[str]): 部门ID，如果提供则只返回该部门的用户
+            page_size(int): 每页数量，默认50，最大100
+            page_token(Optional[str]): 分页token，用于获取下一页
+            user_id_type(str): 用户ID类型，默认为"open_id"，可选值："open_id"、"user_id"、"union_id"
+        return:
+            result(dict): API返回的结果，包含用户列表
+            success(bool): 是否成功
+        """
+        url = f"{self.base_url}/contact/v3/users"
+        headers = self._get_headers()
+        params = {
+            "page_size": min(page_size, 100),  # 限制最大值为100
+            "user_id_type": user_id_type,
+        }
+
+        if department_id:
+            params["department_id"] = department_id
+        if page_token:
+            params["page_token"] = page_token
+
+        try:
+            response = requests.get(url, headers=headers, params=params)
+            response.raise_for_status()
+            result = response.json()
+
+            if result.get("code") != 0:
+                return result, False
+
+            return result, True
+        except requests.RequestException as e:
+            return {"code": -1, "msg": f"请求失败: {str(e)}"}, False
+
+    async def list_users_async(
+        self,
+        department_id: Optional[str] = None,
+        page_size: int = 50,
+        page_token: Optional[str] = None,
+        user_id_type: str = "open_id",
+    ) -> tuple[dict, bool]:
+        """
+        description:
+            异步列出飞书中的所有用户
+        parameters:
+            department_id(Optional[str]): 部门ID，如果提供则只返回该部门的用户
+            page_size(int): 每页数量，默认50
+            page_token(Optional[str]): 分页token，用于获取下一页
+            user_id_type(str): 用户ID类型，默认为"open_id"
+        return:
+            result(dict): API返回的结果，包含用户列表
+            success(bool): 是否成功
+        """
+        return await asyncio.to_thread(
+            self.list_users, department_id, page_size, page_token, user_id_type
+        )

{pixelarraylib-1.2.1 → pixelarraylib-1.2.3}/pixelarraylib/scripts/__init__.py

@@ -3,7 +3,7 @@ PixelArrayLib 脚本工具包
 包含各种实用的命令行工具和脚本
 """
 
-__version__ = "1.2.1"
+__version__ = "1.2.3"
 __author__ = "Lu qi"
 
 # 导出主要的脚本函数

{pixelarraylib-1.2.1 → pixelarraylib-1.2.3/pixelarraylib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixelarraylib
-Version: 1.2.1
+Version: 1.2.3
 Summary: PixelArray Python开发工具库 - 包含阿里云服务、数据库工具、装饰器、监控等功能
 Author-email: Lu qi <qi.lu@pixelarrayai.com>
 License-Expression: MIT

{pixelarraylib-1.2.1 → pixelarraylib-1.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pixelarraylib"
-version = "1.2.1"
+version = "1.2.3"
 authors = [
     {name = "Lu qi", email = "qi.lu@pixelarrayai.com"},
 ]