pixelarraylib 1.0.5__tar.gz → 1.0.7__tar.gz

{pixelarraylib-1.0.5/pixelarraylib.egg-info → pixelarraylib-1.0.7}/PKG-INFO

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

{pixelarraylib-1.0.5 → pixelarraylib-1.0.7}/pixelarraylib/__init__.py

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

{pixelarraylib-1.0.5 → pixelarraylib-1.0.7}/pixelarraylib/monitor/feishu.py

@@ -14,6 +14,7 @@ class Feishu:
         "llm微服务报警": "https://open.feishu.cn/open-apis/bot/v2/hook/54942aa6-24f1-4851-8fe9-d7c87572d00a",
         "thirdparty微服务报警": "https://open.feishu.cn/open-apis/bot/v2/hook/b1e6237a-1323-4ad9-96f4-d74de5cdc00f",
         "picturebed服务报警": "https://open.feishu.cn/open-apis/bot/v2/hook/d3c2e68c-3ed3-4832-9b66-76db5bd69b42",
+        "picturetransform服务报警": "https://open.feishu.cn/open-apis/bot/v2/hook/e975aa0a-acef-4e3f-bee4-6dc507b87ebd",
     }
 
     def __init__(self, channel_name):

{pixelarraylib-1.0.5 → pixelarraylib-1.0.7}/pixelarraylib/scripts/__init__.py

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

pixelarraylib-1.0.7/pixelarraylib/scripts/nginx_proxy_to_ecs.py

@@ -0,0 +1,163 @@
+import argparse
+import base64
+from pixelarraylib.system.common import execute_command_through_ssh, execute_command
+from pixelarraylib.aliyun.domain import DomainUtils
+
+
+def nginx_proxy_file_template(
+    domain_name: str, port_of_service: str, ssl_cert_path: str, ssl_key_path: str
+) -> str:
+    return f"""
+server {{
+    listen 80;
+    server_name {domain_name}.pixelarrayai.com;
+
+    # 将所有HTTP请求重定向到HTTPS
+    return 301 https://$host$request_uri;
+}}
+
+server {{
+    listen 443 ssl;
+    server_name {domain_name}.pixelarrayai.com;
+
+    ssl_certificate {ssl_cert_path};
+    ssl_certificate_key {ssl_key_path};
+
+    location / {{
+        proxy_pass http://localhost:{port_of_service};
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }}
+}}
+    """
+
+
+def add_a_record_to_dns(
+    domain_name: str, ecs_ip: str, access_key_id: str, access_key_secret: str
+) -> None:
+    domain_utils = DomainUtils(
+        access_key_id, access_key_secret, domain_name="pixelarrayai.com"
+    )
+    
+    # 先检查是否存在相同的主机记录
+    existing_record = domain_utils.find_record_by_rr_and_type(rr=domain_name, type="A")
+    if existing_record:
+        print(f"发现已存在的主机记录 {domain_name}，正在删除...")
+        success = domain_utils.delete_record_by_rr_and_type(rr=domain_name, type="A")
+        if success:
+            print(f"已删除旧的主机记录 {domain_name}")
+        else:
+            print(f"删除旧记录失败，但继续添加新记录")
+    
+    # 添加新的解析记录
+    success, record_id = domain_utils.add_domain_record(
+        rr=domain_name,
+        type="A",
+        value=ecs_ip,
+    )
+    
+    if success:
+        print(f"域名解析记录添加成功，记录ID: {record_id}")
+    else:
+        print("域名解析记录添加失败")
+
+
+def deploy(
+    domain_name: str,
+    port_of_service: str,
+    ssl_cert_path: str,
+    ssl_key_path: str,
+    access_key_id: str,
+    access_key_secret: str,
+    mode: str,
+    ecs_ip: str,
+) -> None:
+    if mode == "remote":
+        execute_command_through_ssh(
+            ecs_ip,
+            f"sudo rm -f /etc/nginx/sites-available/{domain_name} && sudo rm -f /etc/nginx/sites-enabled/{domain_name}",
+        )
+        print("删除原有配置成功")
+        execute_command_through_ssh(
+            ecs_ip,
+            f"sudo touch /etc/nginx/sites-available/{domain_name}",
+        )
+        print("文件创建成功")
+        nginx_proxy_file_content = nginx_proxy_file_template(
+            domain_name, port_of_service, ssl_cert_path, ssl_key_path
+        )
+        # 使用 base64 编码来避免特殊字符问题
+        encoded_content = base64.b64encode(nginx_proxy_file_content.encode('utf-8')).decode('utf-8')
+        execute_command_through_ssh(
+            ecs_ip,
+            f"echo '{encoded_content}' | base64 -d | sudo tee /etc/nginx/sites-available/{domain_name} > /dev/null",
+        )
+        print("内容写入成功")
+        execute_command_through_ssh(
+            ecs_ip,
+            f"sudo ln -s /etc/nginx/sites-available/{domain_name} /etc/nginx/sites-enabled/{domain_name}",
+        )
+        print("nginx配置添加成功，准备重启")
+        execute_command_through_ssh(
+            ecs_ip, f"sudo nginx -t && sudo systemctl restart nginx"
+        )
+        print("重启成功，请检查配置是否生效")
+    else:
+        execute_command(
+            f"sudo rm -f /etc/nginx/sites-available/{domain_name} && sudo rm -f /etc/nginx/sites-enabled/{domain_name}"
+        )
+        print("删除原有配置成功")
+        execute_command(
+            f"sudo touch /etc/nginx/sites-available/{domain_name}"
+        )
+        print("文件创建成功")
+        nginx_proxy_file_content = nginx_proxy_file_template(
+            domain_name, port_of_service, ssl_cert_path, ssl_key_path
+        )
+        execute_command(
+            f"sudo echo {nginx_proxy_file_content} | base64 -d | sudo tee /etc/nginx/sites-available/{domain_name} > /dev/null"
+        )
+        print("内容写入成功")
+        execute_command(
+            f"sudo ln -s /etc/nginx/sites-available/{domain_name} /etc/nginx/sites-enabled/{domain_name}"
+        )
+        print("nginx配置添加成功，准备重启")
+        execute_command(
+            "sudo nginx -t && sudo systemctl restart nginx"
+        )
+        print("重启成功，请检查配置是否生效")
+    add_a_record_to_dns(domain_name, ecs_ip, access_key_id, access_key_secret)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Nginx反向代理配置到ECS",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=__doc__,
+    )
+    parser.add_argument("--domain_name", "-d", help="需要代理的域名")
+    parser.add_argument("--port_of_service", "-p", help="端口或服务")
+    parser.add_argument("--access_key_id", "-a", help="阿里云AccessKeyID")
+    parser.add_argument("--access_key_secret", "-s", help="阿里云AccessKeySecret")
+    parser.add_argument("--mode", "-m", help="本地执行还是远程执行，local或remote，默认是remote")
+    parser.add_argument("--ecs_ip", "-e", help="服务器的IP地址")
+
+    args = parser.parse_args()
+
+    deploy(
+        args.domain_name,
+        args.port_of_service,
+        "/var/pixelarray/ssl_auth/pixelarrayai.com.pem",
+        "/var/pixelarray/ssl_auth/pixelarrayai.com.key",
+        args.access_key_id,
+        args.access_key_secret,
+        args.mode,
+        args.ecs_ip,
+    )
+
+
+if __name__ == "__main__":
+    main()

{pixelarraylib-1.0.5 → pixelarraylib-1.0.7}/pixelarraylib/system/common.py

@@ -3,16 +3,54 @@ import json
 import re
 import subprocess
 import traceback
-from typing import Union, List, Generator
+from typing import Callable, Union, List, Generator, Any
 from cryptography.fernet import Fernet
 import base64
 from pixelarraylib.monitor.feishu import Feishu
 import os
 import paramiko
+from concurrent.futures import ProcessPoolExecutor
 
 feishu_alert = Feishu("devtoolkit服务报警")
 
 
+def execute_function_in_other_process(function: Callable, *args, **kwargs) -> Any:
+    """
+    description:
+        在其他进程中执行函数
+    parameters:
+        function(Callable): 需要执行的函数
+        args(tuple): 函数的参数
+        kwargs(dict): 函数的关键字参数
+    return:
+        result(Any): 函数执行结果
+    """
+    with ProcessPoolExecutor() as executor:
+        return executor.submit(function, *args, **kwargs).result()
+
+
+async def execute_function_in_other_process_async(
+    function: Callable, *args, **kwargs
+) -> Any:
+    """
+    description:
+        在其他进程中异步执行函数
+    parameters:
+        function(Callable): 需要执行的函数
+        args(tuple): 函数的参数
+        kwargs(dict): 函数的关键字参数
+    return:
+        result(Any): 函数执行结果
+    """
+    loop = asyncio.get_event_loop()
+    with ProcessPoolExecutor() as executor:
+        # 在线程池中运行阻塞的executor.submit操作
+        result = await loop.run_in_executor(
+            None, lambda: executor.submit(function, *args, **kwargs).result()
+        )
+        return result
+
+
 async def execute_batch_async_tasks(tasks, semaphore_count=None):
     if semaphore_count is None:
         return await asyncio.gather(*tasks)

{pixelarraylib-1.0.5 → pixelarraylib-1.0.7/pixelarraylib.egg-info}/PKG-INFO

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

{pixelarraylib-1.0.5 → pixelarraylib-1.0.7}/pyproject.toml

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

pixelarraylib-1.0.5/pixelarraylib/scripts/nginx_proxy_to_ecs.py

@@ -1,119 +0,0 @@
-import argparse
-import base64
-from pixelarraylib.system.common import execute_command_through_ssh
-from pixelarraylib.aliyun.domain import DomainUtils
-
-
-def nginx_proxy_file_template(
-    domain_name: str, port_of_service: str, ssl_cert_path: str, ssl_key_path: str
-) -> str:
-    return f"""
-server {{
-    listen 80;
-    server_name {domain_name}.pixelarrayai.com;
-
-    # 将所有HTTP请求重定向到HTTPS
-    return 301 https://$host$request_uri;
-}}
-
-server {{
-    listen 443 ssl;
-    server_name {domain_name}.pixelarrayai.com;
-
-    ssl_certificate {ssl_cert_path};
-    ssl_certificate_key {ssl_key_path};
-
-    location / {{
-        proxy_pass http://localhost:{port_of_service};
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }}
-}}
-    """
-
-
-def add_a_record_to_dns(
-    domain_name: str, ecs_ip: str, access_key_id: str, access_key_secret: str
-) -> None:
-    domain_utils = DomainUtils(
-        access_key_id, access_key_secret, domain_name="pixelarrayai.com"
-    )
-    domain_utils.add_domain_record(
-        rr=domain_name,
-        type="A",
-        value=ecs_ip,
-    )
-    print("域名解析记录添加成功")
-
-
-def deploy(
-    ecs_ip: str,
-    domain_name: str,
-    port_of_service: str,
-    ssl_cert_path: str,
-    ssl_key_path: str,
-    access_key_id: str,
-    access_key_secret: str,
-) -> None:
-    execute_command_through_ssh(
-        ecs_ip,
-        f"sudo rm -f /etc/nginx/sites-available/{domain_name} && sudo rm -f /etc/nginx/sites-enabled/{domain_name}",
-    )
-    print("删除原有配置成功")
-    execute_command_through_ssh(
-        ecs_ip,
-        f"sudo touch /etc/nginx/sites-available/{domain_name}",
-    )
-    print("文件创建成功")
-    nginx_proxy_file_content = nginx_proxy_file_template(
-        domain_name, port_of_service, ssl_cert_path, ssl_key_path
-    )
-    # 使用 base64 编码来避免特殊字符问题
-    encoded_content = base64.b64encode(nginx_proxy_file_content.encode('utf-8')).decode('utf-8')
-    execute_command_through_ssh(
-        ecs_ip,
-        f"echo '{encoded_content}' | base64 -d | sudo tee /etc/nginx/sites-available/{domain_name} > /dev/null",
-    )
-    print("内容写入成功")
-    execute_command_through_ssh(
-        ecs_ip,
-        f"sudo ln -s /etc/nginx/sites-available/{domain_name} /etc/nginx/sites-enabled/{domain_name}",
-    )
-    print("nginx配置添加成功，准备重启")
-    execute_command_through_ssh(
-        ecs_ip, f"sudo nginx -t && sudo systemctl restart nginx"
-    )
-    print("重启成功，请检查配置是否生效")
-    add_a_record_to_dns(domain_name, ecs_ip, access_key_id, access_key_secret)
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Nginx反向代理配置到ECS",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog=__doc__,
-    )
-    parser.add_argument("--ecs_ip", "-e", help="服务IP地址")
-    parser.add_argument("--domain_name", "-d", help="需要代理的域名")
-    parser.add_argument("--port_of_service", "-p", help="端口或服务")
-    parser.add_argument("--access_key_id", "-a", help="阿里云AccessKeyID")
-    parser.add_argument("--access_key_secret", "-s", help="阿里云AccessKeySecret")
-
-    args = parser.parse_args()
-
-    deploy(
-        args.ecs_ip,
-        args.domain_name,
-        args.port_of_service,
-        "/var/pixelarray/ssl_auth/pixelarrayai.com.pem",
-        "/var/pixelarray/ssl_auth/pixelarrayai.com.key",
-        args.access_key_id,
-        args.access_key_secret,
-    )
-
-
-if __name__ == "__main__":
-    main()