pixelarraylib 1.2.0__tar.gz → 1.2.2__tar.gz

{pixelarraylib-1.2.0/pixelarraylib.egg-info → pixelarraylib-1.2.2}/PKG-INFO

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

{pixelarraylib-1.2.0 → pixelarraylib-1.2.2}/pixelarraylib/__init__.py

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

{pixelarraylib-1.2.0 → pixelarraylib-1.2.2}/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.0 → pixelarraylib-1.2.2}/pixelarraylib/aliyun/polardb.py

@@ -43,6 +43,62 @@ class PolarDBUtils:
         config.endpoint = f"polardb.aliyuncs.com"
         return polardb20170801Client(config)
 
+    def list_regions(
+        self,
+    ) -> tuple[dict, bool]:
+        describe_regions_request = polardb_20170801_models.DescribeRegionsRequest()
+        runtime = util_models.RuntimeOptions()
+        try:
+            resp = self.client.describe_regions_with_options(
+                describe_regions_request, runtime
+            )
+            return resp.body.to_map(), True
+        except Exception as error:
+            print("error", error)
+            return {}, False
+
+    async def list_regions_async(self) -> tuple[dict, bool]:
+        describe_regions_request = polardb_20170801_models.DescribeRegionsRequest()
+        runtime = util_models.RuntimeOptions()
+        try:
+            resp = await self.client.describe_regions_with_options_async(
+                describe_regions_request, runtime
+            )
+            return resp.body.to_map(), True
+        except Exception as error:
+            print("error", error)
+            return {}, False
+
+    def list_region_ids(self) -> tuple[list, bool]:
+        """
+        description:
+            列出PolarDB区域ID
+        return:
+            region_ids: 区域ID列表
+            success: 操作是否成功
+        """
+        resp, success = self.list_regions()
+        if not success:
+            return [], False
+        return [
+            region["RegionId"] for region in resp.get("Regions", {}).get("Region", [])
+        ], True
+
+    async def list_region_ids_async(self) -> tuple[list, bool]:
+        """
+        description:
+            异步列出PolarDB区域ID
+        return:
+            region_ids: 区域ID列表
+            success: 操作是否成功
+        """
+        resp, success = await self.list_regions_async()
+        if not success:
+            return [], False
+        return [
+            region["RegionId"] for region in resp.get("Regions", {}).get("Region", [])
+        ], True
+
     def list_clusters(
         self,
     ) -> tuple[dict, bool]:

{pixelarraylib-1.2.0 → pixelarraylib-1.2.2}/pixelarraylib/scripts/__init__.py

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

{pixelarraylib-1.2.0 → pixelarraylib-1.2.2/pixelarraylib.egg-info}/PKG-INFO

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

{pixelarraylib-1.2.0 → pixelarraylib-1.2.2}/pyproject.toml

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