pixelarraylib 1.0.2__tar.gz → 1.0.4__tar.gz

{pixelarraylib-1.0.2/pixelarraylib.egg-info → pixelarraylib-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixelarraylib
-Version: 1.0.2
+Version: 1.0.4
 Summary: PixelArray Python开发工具库 - 包含阿里云服务、数据库工具、装饰器、监控等功能
 Author-email: Lu qi <qi.lu@pixelarrayai.com>
 License-Expression: MIT
@@ -33,6 +33,7 @@ Requires-Dist: alibabacloud_alidns20150109
 Requires-Dist: alibabacloud_eci20180808
 Requires-Dist: alibabacloud_bssopenapi20171214
 Requires-Dist: alibabacloud_cr20181201
+Requires-Dist: alibabacloud_vpc20160428
 Requires-Dist: oss2
 Requires-Dist: pymysql
 Requires-Dist: aiomysql
@@ -81,27 +82,6 @@ from pixelarraylib.decorators import useful_decorators
 pixelarraylib create_test_case_files
 ```
 
-#### 代码提交统计
-```bash
-# 统计最近30天的代码提交
-pixelarraylib summary_code_count
-
-# 统计指定日期范围的提交
-pixelarraylib summary_code_count --since="2025-05-09"
-
-# 统计特定作者的提交
-pixelarraylib summary_code_count --author="张三"
-
-# 输出到CSV文件
-pixelarraylib summary_code_count --output=stats.csv
-
-# 只统计特定文件类型
-pixelarraylib summary_code_count --file-types="py,js,vue"
-
-# 查看帮助信息
-pixelarraylib summary_code_count --help
-```
-
 ## 功能特性
 
 - **阿里云服务集成**: 包含CMS、Green、DM、FC、SMS、STS等服务

{pixelarraylib-1.0.2 → pixelarraylib-1.0.4}/README.md

@@ -32,27 +32,6 @@ from pixelarraylib.decorators import useful_decorators
 pixelarraylib create_test_case_files
 ```
 
-#### 代码提交统计
-```bash
-# 统计最近30天的代码提交
-pixelarraylib summary_code_count
-
-# 统计指定日期范围的提交
-pixelarraylib summary_code_count --since="2025-05-09"
-
-# 统计特定作者的提交
-pixelarraylib summary_code_count --author="张三"
-
-# 输出到CSV文件
-pixelarraylib summary_code_count --output=stats.csv
-
-# 只统计特定文件类型
-pixelarraylib summary_code_count --file-types="py,js,vue"
-
-# 查看帮助信息
-pixelarraylib summary_code_count --help
-```
-
 ## 功能特性
 
 - **阿里云服务集成**: 包含CMS、Green、DM、FC、SMS、STS等服务

{pixelarraylib-1.0.2 → pixelarraylib-1.0.4}/pixelarraylib/__init__.py

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

{pixelarraylib-1.0.2 → pixelarraylib-1.0.4}/pixelarraylib/__main__.py

@@ -3,10 +3,10 @@
 ArrayLib 命令行工具入口点
 支持的命令：
 - pixelarraylib create_test_case_files
-- pixelarraylib summary_code_count [options]
 - pixelarraylib collect_code_to_txt [options]
 - pixelarraylib nginx_proxy_to_ecs [options]
 - pixelarraylib remove_empty_lines <input_file> [output_file]
+- pixelarraylib build_website
 """
 
 import sys
@@ -22,10 +22,10 @@ def main():
             epilog="""
 示例用法:
   pixelarraylib create_test_case_files --help                    # 创建测试用例文件
-  pixelarraylib summary_code_count --help                        # 查看统计工具帮助
   pixelarraylib collect_code_to_txt --help                       # 查看收集工具帮助
   pixelarraylib nginx_proxy_to_ecs --help                        # 查看Nginx反向代理到ECS工具帮助
   pixelarraylib remove_empty_lines --help                        # 查看去除空行工具帮助
+  pixelarraylib build_website --help                              # 查看一键构建网站工具帮助
             """,
         )
         parser.print_help()
@@ -36,27 +36,15 @@ def main():
     if command == "create_test_case_files":
         # 导入并执行创建测试用例文件功能
         try:
-            from pixelarraylib.scripts.create_test_case_files import main as create_test_main
+            from pixelarraylib.scripts.create_test_case_files import (
+                main as create_test_main,
+            )
 
             create_test_main()
         except ImportError as e:
             print(f"错误：无法导入 create_test_case_files 模块: {e}")
             sys.exit(1)
 
-    elif command == "summary_code_count":
-        # 导入并执行代码统计功能
-        try:
-            from pixelarraylib.scripts.summary_code_count import main as summary_main
-
-            # 修改sys.argv，移除第一个参数（arraylib），让summary_code_count正确处理参数
-            original_argv = sys.argv
-            sys.argv = [original_argv[0]] + original_argv[2:]
-            summary_main()
-            sys.argv = original_argv
-        except ImportError as e:
-            print(f"错误：无法导入 summary_code_count 模块: {e}")
-            sys.exit(1)
-
     elif command == "collect_code_to_txt":
         # 导入并执行代码收集功能
         try:
@@ -74,7 +62,9 @@ def main():
     elif command == "nginx_proxy_to_ecs":
         # 导入并执行Nginx反向代理到ECS功能
         try:
-            from pixelarraylib.scripts.nginx_proxy_to_ecs import main as nginx_proxy_to_ecs
+            from pixelarraylib.scripts.nginx_proxy_to_ecs import (
+                main as nginx_proxy_to_ecs,
+            )
 
             # 修改sys.argv，移除第一个参数（arraylib），让nginx_proxy_to_ecs正确处理参数
             original_argv = sys.argv
@@ -88,7 +78,9 @@ def main():
     elif command == "remove_empty_lines":
         # 导入并执行去除空行功能
         try:
-            from pixelarraylib.scripts.remove_empty_lines import main as remove_empty_lines_main
+            from pixelarraylib.scripts.remove_empty_lines import (
+                main as remove_empty_lines_main,
+            )
 
             # 修改sys.argv，移除第一个参数（arraylib），让remove_empty_lines正确处理参数
             original_argv = sys.argv
@@ -99,6 +91,18 @@ def main():
             print(f"错误：无法导入 remove_empty_lines 模块: {e}")
             sys.exit(1)
 
+    elif command == "build_website":
+        # 导入并执行一键构建网站功能
+        try:
+            from pixelarraylib.scripts.build_website import main as build_website_main
+            original_argv = sys.argv
+            sys.argv = [original_argv[0]] + original_argv[2:]
+            build_website_main()
+            sys.argv = original_argv
+        except ImportError as e:
+            print(f"错误：无法导入 build_website 模块: {e}")
+            sys.exit(1)
+
     elif command in ["-h", "--help"]:
         parser = argparse.ArgumentParser(
             description="ArrayLib 命令行工具",
@@ -106,17 +110,17 @@ def main():
             epilog="""
 示例用法:
   pixelarraylib create_test_case_files --help                    # 创建测试用例文件
-  pixelarraylib summary_code_count --help                        # 查看统计工具帮助
   pixelarraylib collect_code_to_txt --help                       # 查看收集工具帮助
   pixelarraylib nginx_proxy_to_ecs --help                        # 查看Nginx反向代理到ECS工具帮助
   pixelarraylib remove_empty_lines --help                        # 查看去除空行工具帮助
+  pixelarraylib build_website --help                              # 查看一键构建网站工具帮助
             """,
         )
         parser.print_help()
     else:
         print(f"错误：未知命令 '{command}'")
         print(
-            "可用命令：create_test_case_files, summary_code_count, collect_code_to_txt, nginx_proxy_to_ecs, remove_empty_lines"
+            "可用命令：create_test_case_files, collect_code_to_txt, nginx_proxy_to_ecs, remove_empty_lines, build_website"
         )
         print("使用 'pixelarraylib --help' 查看帮助")
         sys.exit(1)

{pixelarraylib-1.0.2 → pixelarraylib-1.0.4}/pixelarraylib/aliyun/acr.py

@@ -1,5 +1,6 @@
 import os
 import sys
+import re
 
 from typing import List
 
@@ -113,8 +114,31 @@ class ACRUtils:
             feishu_alert.send(f"列出命名空间失败: {e}")
             return {}, False
 
+    def exists_namespace(self, instance_id: str, namespace_name: str):
+        """
+        description:
+            判断命名空间是否存在
+        parameters:
+            instance_id (str): 实例ID
+            namespace_name (str): 命名空间名称
+        return:
+            bool: 是否存在
+        """
+        response, success = self.list_namespaces(instance_id)
+        if not success:
+            return False, False
+        namespace_names = [
+            namespace["NamespaceName"] for namespace in response["Namespaces"]
+        ]
+        return namespace_name in namespace_names, True
+
     def create_repository(
-        self, instance_id: str, namespace_name: str, repository_name: str, repository_type: str, summary: str
+        self,
+        instance_id: str,
+        namespace_name: str,
+        repository_name: str,
+        repository_type: str,
+        summary: str,
     ):
         """
         description:
@@ -129,13 +153,16 @@ class ACRUtils:
             dict: 创建结果
             success(bool): 是否成功
         """
+        if not re.fullmatch(r"[a-z\-]+", repository_name):
+            print("仓库名称只能包含小写英文字母和横杠")
+            return {}, False
         try:
             request = cr_20181201_models.CreateRepositoryRequest(
                 instance_id=instance_id,
                 repo_namespace_name=namespace_name,
                 repo_name=repository_name,
                 repo_type=repository_type,
-                summary=summary
+                summary=summary,
             )
             response = self.client.create_repository(request)
             return response.body.to_map(), True
@@ -164,6 +191,27 @@ class ACRUtils:
             feishu_alert.send(f"列出仓库失败: {e}")
             return {}, False
 
+    def exists_repository(
+        self, instance_id: str, namespace_name: str, repository_name: str
+    ):
+        """
+        description:
+            判断仓库是否存在
+        parameters:
+            instance_id (str): 实例ID
+            namespace_name (str): 命名空间名称
+            repository_name (str): 仓库名称
+        return:
+            bool: 是否存在
+        """
+        response, success = self.list_repositories(instance_id, namespace_name)
+        if not success:
+            return False, False
+        repository_names = [
+            repository["RepoName"] for repository in response["Repositories"]
+        ]
+        return repository_name in repository_names, True
+
     def delete_repository(
         self, instance_id: str, namespace_name: str, repository_id: str
     ):

{pixelarraylib-1.0.2 → pixelarraylib-1.0.4}/pixelarraylib/aliyun/eci.py

@@ -5,15 +5,19 @@ from typing import Optional, Dict, Any, List
 from alibabacloud_eci20180808.client import Client as EciClient
 from alibabacloud_eci20180808.models import (
     CreateContainerGroupRequest,
+    DescribeAvailableResourceRequestDestinationResource,
     DescribeContainerGroupsRequest,
     CreateContainerGroupRequestContainer,
     CreateContainerGroupRequestImageRegistryCredential,
     CreateContainerGroupRequestTag,
-    CreateContainerGroupRequest,
+    DescribeRegionsRequest,
+    DescribeAvailableResourceRequest,
+    DeleteContainerGroupRequest,
 )
 from alibabacloud_tea_openapi import models as open_api_models
 from alibabacloud_tea_util import models as util_models
 from pixelarraylib.monitor.feishu import Feishu
+from pixelarraylib.aliyun.eip import EIPUtils
 
 feishu_alert = Feishu("devtoolkit服务报警")
 
@@ -32,6 +36,11 @@ class ECIUtils:
         self.access_key_id = access_key_id
         self.access_key_secret = access_key_secret
         self.client = self._create_client()
+        self.eip_utils = EIPUtils(
+            region_id=region_id,
+            access_key_id=access_key_id,
+            access_key_secret=access_key_secret,
+        )
 
     def _create_client(self) -> EciClient:
         """
@@ -48,27 +57,55 @@ class ECIUtils:
         )
         return EciClient(config)
 
+    def describe_available_resource(self, cpu: float, memory: float) -> Dict[str, Any]:
+        """
+        description:
+            查询可用资源
+        parameters:
+            cpu(float): CPU
+            memory(float): 内存
+        return:
+            dict: 查询结果
+        """
+        try:
+            describe_zones_request = DescribeAvailableResourceRequest(
+                region_id=self.region_id,
+                destination_resource=DescribeAvailableResourceRequestDestinationResource(
+                    category="InstanceType",
+                    cores=cpu,
+                    memory=memory,
+                ),
+            )
+            runtime = util_models.RuntimeOptions()
+            response = self.client.describe_available_resource_with_options(
+                describe_zones_request, runtime
+            )
+            return response.body.to_map(), True
+        except Exception as error:
+            feishu_alert.send(f"查询可用资源失败: {error}")
+            return {}
+
     def create_container_group(
         self,
         container_group_name: str,
-        acr_region_id: str,
         acr_credentials: Dict,
         images: List[Dict[str, Any]],
-        instance_type: str = "ecs.c1.small",
-        zone_id: str = "a",
+        cpu: float,
+        memory: float,
         restart_policy: str = "Always",
+        allocate_public_ip: bool = True,
     ):
         """
         description:
             创建容器组
         parameters:
             container_group_name(str): 容器组名称
-            acr_region_id(str): ACR地域ID
             acr_credentials(Dict): ACR凭证
             images(List[Dict[str, Any]]): 镜像列表
-            instance_type(str): 实例类型
-            zone_id(str): 可用区ID
+            cpu(float): CPU
+            memory(float): 内存
             restart_policy(str): 重启策略
+            allocate_public_ip(bool): 是否分配公网IP
         return:
             dict: 创建结果
             success(bool): 是否成功
@@ -77,39 +114,46 @@ class ECIUtils:
         for image in images:
             container_0 = CreateContainerGroupRequestContainer(
                 name=image["repository_name"],
-                image=f"pixelarrayai-registry-vpc.{acr_region_id}.cr.aliyuncs.com/{image['namespace_name']}/{image['repository_name']}:latest",
+                image=f"pixelarrayai-registry.{self.region_id}.cr.aliyuncs.com/{image['namespace_name']}/{image['repository_name']}:latest",
             )
             containers.append(container_0)
 
         image_registry_credentials = [
             CreateContainerGroupRequestImageRegistryCredential(
                 password=acr_credentials["password"],
-                server=f"pixelarrayai-registry-vpc.{acr_region_id}.cr.aliyuncs.com",
-                user_name=acr_credentials["user_name"],
+                server=f"pixelarrayai-registry.{self.region_id}.cr.aliyuncs.com",
+                user_name=acr_credentials["username"],
             )
         ]
 
         tag_0 = CreateContainerGroupRequestTag(key="team", value="pixelarrayai")
+
+        if allocate_public_ip:
+            response, success = self.eip_utils.allocate_eip()
+            if not success:
+                feishu_alert.send(f"创建容器组失败: 分配公网IP失败")
+                return {}, False
+            eip_instance_id = response["AllocationId"]
+        else:
+            eip_instance_id = None
+
         create_container_group_request = CreateContainerGroupRequest(
             region_id=self.region_id,
-            zone_id=f"{self.region_id}-{zone_id}",
             container_group_name=container_group_name,
             restart_policy=restart_policy,
-            cpu=1,
-            memory=2,
-            resource_group_id="rg-acfm3aqovjsymaa",
+            cpu=cpu,
+            memory=memory,
             dns_policy="Default",
-            instance_type=instance_type,
             active_deadline_seconds=600,
             spot_strategy="SpotAsPriceGo",
-            host_name="ecitest",
             tag=[tag_0],
             image_registry_credential=image_registry_credentials,
             termination_grace_period_seconds=60,
-            container=[container_0],
+            container=containers,
             auto_match_image_cache=False,
             share_process_namespace=True,
             schedule_strategy="VSwitchOrdered",
+            eip_instance_id=eip_instance_id,
         )
         runtime = util_models.RuntimeOptions()
         try:
@@ -133,7 +177,8 @@ class ECIUtils:
         """
         try:
             describe_container_groups_request = DescribeContainerGroupsRequest(
-                container_group_id=container_group_id
+                container_group_ids=[container_group_id],
+                region_id=self.region_id,
             )
             runtime = util_models.RuntimeOptions()
             response = self.client.describe_container_groups_with_options(
@@ -154,12 +199,38 @@ class ECIUtils:
             dict: 查询结果
         """
         try:
-            list_container_groups_request = ListContainerGroupsRequest()
+            describe_container_groups_request = DescribeContainerGroupsRequest(
+                region_id=self.region_id
+            )
             runtime = util_models.RuntimeOptions()
-            response = self.client.list_container_groups_with_options(
-                list_container_groups_request, runtime
+            response = self.client.describe_container_groups_with_options(
+                describe_container_groups_request, runtime
             )
             return response.body.to_map()
         except Exception as error:
             feishu_alert.send(f"查询容器组列表失败: {error}")
             return {}
+
+    def delete_container_group(self, container_group_id: str):
+        """
+        description:
+            删除容器组
+        parameters:
+            container_group_id(str): 容器组ID
+        return:
+            dict: 删除结果
+            success(bool): 是否成功
+        """
+        try:
+            delete_container_group_request = DeleteContainerGroupRequest(
+                container_group_id=container_group_id,
+                region_id=self.region_id,
+            )
+            runtime = util_models.RuntimeOptions()
+            response = self.client.delete_container_group_with_options(
+                delete_container_group_request, runtime
+            )
+            return response.body.to_map(), True
+        except Exception as error:
+            feishu_alert.send(f"删除容器组失败: {error}")
+            return {}, False

pixelarraylib-1.0.4/pixelarraylib/aliyun/eip.py

@@ -0,0 +1,96 @@
+import os
+import sys
+
+from typing import List
+
+from alibabacloud_vpc20160428.client import Client as Vpc20160428Client
+from alibabacloud_tea_openapi import models as open_api_models
+from alibabacloud_vpc20160428 import models as vpc_20160428_models
+from alibabacloud_tea_util import models as util_models
+from alibabacloud_tea_util.client import Client as UtilClient
+from pixelarraylib.monitor.feishu import Feishu
+
+feishu_alert = Feishu("devtoolkit服务报警")
+
+
+class EIPUtils:
+    def __init__(self, region_id: str, access_key_id: str, access_key_secret: str):
+        self.region_id = region_id
+        self.access_key_id = access_key_id
+        self.access_key_secret = access_key_secret
+        self.client = self._create_client()
+
+    def _create_client(self) -> Vpc20160428Client:
+        config = open_api_models.Config(
+            access_key_id=self.access_key_id,
+            access_key_secret=self.access_key_secret,
+            region_id=self.region_id,
+            endpoint=f"vpc.{self.region_id}.aliyuncs.com",
+        )
+        return Vpc20160428Client(config)
+
+    def allocate_eip(self):
+        """
+        description:
+            分配EIP
+        return:
+            dict: 分配结果
+            success(bool): 是否成功
+        """
+        allocate_eip_address_request = vpc_20160428_models.AllocateEipAddressRequest(
+            region_id=self.region_id
+        )
+        runtime = util_models.RuntimeOptions()
+        try:
+            # 复制代码运行请自行打印 API 的返回值
+            response = self.client.allocate_eip_address_with_options(
+                allocate_eip_address_request, runtime
+            )
+            return response.body.to_map(), True
+        except Exception as error:
+            feishu_alert.send(f"分配EIP失败: {error}")
+            return {}, False
+
+    def release_eip(self, allocation_id: str):
+        """
+        description:
+            释放EIP
+        parameters:
+            allocation_id(str): 分配ID
+        return:
+            dict: 释放结果
+            success(bool): 是否成功
+        """
+        release_eip_address_request = vpc_20160428_models.ReleaseEipAddressRequest(
+            region_id=self.region_id, allocation_id=allocation_id
+        )
+        runtime = util_models.RuntimeOptions()
+        try:
+            response = self.client.release_eip_address_with_options(
+                release_eip_address_request, runtime
+            )
+            return response.body.to_map(), True
+        except Exception as error:
+            feishu_alert.send(f"释放EIP失败: {error}")
+            return {}, False
+
+    def list_eips(self):
+        """
+        description:
+            查询EIP列表
+        return:
+            dict: 查询结果
+            success(bool): 是否成功
+        """
+        list_eip_addresses_request = vpc_20160428_models.DescribeEipAddressesRequest(
+            region_id=self.region_id
+        )
+        runtime = util_models.RuntimeOptions()
+        try:
+            response = self.client.describe_eip_addresses_with_options(
+                list_eip_addresses_request, runtime
+            )
+            return response.body.to_map(), True
+        except Exception as error:
+            feishu_alert.send(f"查询EIP列表失败: {error}")
+            return {}, False