pixelarraylib 1.0.6__tar.gz → 1.0.8__tar.gz

{pixelarraylib-1.0.6/pixelarraylib.egg-info → pixelarraylib-1.0.8}/PKG-INFO

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

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/__init__.py

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

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/acr.py

@@ -50,7 +50,7 @@ class ACRUtils:
             response = self.client.list_instance(request)
             return response.body.to_map(), True
         except Exception as e:
-            feishu_alert.send(f"列出实例失败: {e}")
+            print(f"列出实例失败: {e}")
             return {}, False
 
     def create_namespace(self, instance_id: str, namespace_name: str):
@@ -72,7 +72,7 @@ class ACRUtils:
             response = self.client.create_namespace(request)
             return response.body.to_map(), True
         except Exception as e:
-            feishu_alert.send(f"创建命名空间失败: {e}")
+            print(f"创建命名空间失败: {e}")
             return {}, False
 
     def delete_namespace(self, instance_id: str, namespace_name: str):
@@ -93,7 +93,7 @@ class ACRUtils:
             response = self.client.delete_namespace(request)
             return response.body.to_map(), True
         except Exception as e:
-            feishu_alert.send(f"删除命名空间失败: {e}")
+            print(f"删除命名空间失败: {e}")
             return {}, False
 
     def list_namespaces(self, instance_id: str):
@@ -111,7 +111,7 @@ class ACRUtils:
             response = self.client.list_namespace(request)
             return response.body.to_map(), True
         except Exception as e:
-            feishu_alert.send(f"列出命名空间失败: {e}")
+            print(f"列出命名空间失败: {e}")
             return {}, False
 
     def exists_namespace(self, instance_id: str, namespace_name: str):
@@ -167,7 +167,7 @@ class ACRUtils:
             response = self.client.create_repository(request)
             return response.body.to_map(), True
         except Exception as e:
-            feishu_alert.send(f"创建仓库失败: {e}")
+            print(f"创建仓库失败: {e}")
             return {}, False
 
     def list_repositories(self, instance_id: str, namespace_name: str):
@@ -188,7 +188,7 @@ class ACRUtils:
             response = self.client.list_repository(request)
             return response.body.to_map(), True
         except Exception as e:
-            feishu_alert.send(f"列出仓库失败: {e}")
+            print(f"列出仓库失败: {e}")
             return {}, False
 
     def exists_repository(
@@ -235,7 +235,7 @@ class ACRUtils:
             response = self.client.delete_repository(request)
             return response.body.to_map(), True
         except Exception as e:
-            feishu_alert.send(f"删除仓库失败: {e}")
+            print(f"删除仓库失败: {e}")
             return {}, False
 
     def get_repository(
@@ -261,5 +261,5 @@ class ACRUtils:
             response = self.client.get_repository(request)
             return response.body.to_map(), True
         except Exception as e:
-            feishu_alert.send(f"获取仓库详情失败: {e}")
+            print(f"获取仓库详情失败: {e}")
             return {}, False

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/aliyun_email.py

@@ -122,9 +122,9 @@ class AliyunEmailSender:
             if response.status_code == 200:
                 return True
             else:
-                feishu_alert.send(f"发送验证邮件失败: {response}")
+                print(f"发送验证邮件失败: {response}")
                 return False
 
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/billing.py

@@ -244,7 +244,7 @@ class BillingUtils:
             return formatted_response
 
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             error_response = {
                 "Message": add_comment(f"Format error: {str(e)}", "Message"),
                 "RequestId": add_comment(
@@ -326,7 +326,7 @@ class BillingUtils:
             return formatted_response
 
         except Exception as error:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             error_msg = getattr(error, "message", str(error))
             # 诊断地址
             diagnose_url = ""
@@ -473,5 +473,5 @@ class BillingUtils:
             return output_path
 
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             raise Exception(f"保存账单数据失败: {str(e)}")

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/content_scanner.py

@@ -71,7 +71,7 @@ class ContentScanner:
                 else ({}, False)
             )
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return {}, False
 
     def scan_image(
@@ -110,7 +110,7 @@ class ContentScanner:
                 else ({}, False)
             )
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return {}, False
 
     def scan_video(
@@ -151,7 +151,7 @@ class ContentScanner:
                 else ("", False)
             )
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return "", False
 
     def get_video_result(
@@ -181,7 +181,7 @@ class ContentScanner:
                 else ({}, False)
             )
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return {}, False
 
     def scan_voice(
@@ -219,7 +219,7 @@ class ContentScanner:
                 else ("", False)
             )
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return "", False
 
     def get_voice_result(
@@ -249,5 +249,5 @@ class ContentScanner:
                 else ({}, False)
             )
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return {}, False

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/eci.py

@@ -82,7 +82,7 @@ class ECIUtils:
             )
             return response.body.to_map(), True
         except Exception as error:
-            feishu_alert.send(f"查询可用资源失败: {error}")
+            print(f"查询可用资源失败: {error}")
             return {}
 
     def create_container_group(
@@ -131,7 +131,7 @@ class ECIUtils:
         if allocate_public_ip:
             response, success = self.eip_utils.allocate_eip()
             if not success:
-                feishu_alert.send(f"创建容器组失败: 分配公网IP失败")
+                print(f"创建容器组失败: 分配公网IP失败")
                 return {}, False
             eip_instance_id = response["AllocationId"]
         else:
@@ -163,7 +163,7 @@ class ECIUtils:
             )
             return response.body.to_map(), True
         except Exception as error:
-            feishu_alert.send(f"创建容器组失败: {error}")
+            print(f"创建容器组失败: {error}")
             return {}, False
 
     def describe_container_group(self, container_group_id: str):
@@ -186,7 +186,7 @@ class ECIUtils:
             )
             return response.body.to_map()
         except Exception as error:
-            feishu_alert.send(f"查询容器组失败: {error}")
+            print(f"查询容器组失败: {error}")
             return {}
 
     def list_container_groups(self):
@@ -208,7 +208,7 @@ class ECIUtils:
             )
             return response.body.to_map()
         except Exception as error:
-            feishu_alert.send(f"查询容器组列表失败: {error}")
+            print(f"查询容器组列表失败: {error}")
             return {}
 
     def delete_container_group(self, container_group_id: str):
@@ -232,5 +232,5 @@ class ECIUtils:
             )
             return response.body.to_map(), True
         except Exception as error:
-            feishu_alert.send(f"删除容器组失败: {error}")
+            print(f"删除容器组失败: {error}")
             return {}, False

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/eip.py

@@ -48,7 +48,7 @@ class EIPUtils:
             )
             return response.body.to_map(), True
         except Exception as error:
-            feishu_alert.send(f"分配EIP失败: {error}")
+            print(f"分配EIP失败: {error}")
             return {}, False
 
     def release_eip(self, allocation_id: str):
@@ -71,7 +71,7 @@ class EIPUtils:
             )
             return response.body.to_map(), True
         except Exception as error:
-            feishu_alert.send(f"释放EIP失败: {error}")
+            print(f"释放EIP失败: {error}")
             return {}, False
 
     def list_eips(self):
@@ -92,5 +92,5 @@ class EIPUtils:
             )
             return response.body.to_map(), True
         except Exception as error:
-            feishu_alert.send(f"查询EIP列表失败: {error}")
+            print(f"查询EIP列表失败: {error}")
             return {}, False

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/fc.py

@@ -69,7 +69,7 @@ class FCUtils:
                 else:
                     return None, False
         # 如果所有重试都失败，返回最后一次的异常信息
-        feishu_alert.send(
+        print(
             f"aliyun fc invoke_function failed after {retry} retries. Last error: {last_exception}"
         )
         return None, False
@@ -136,7 +136,7 @@ class FCUtils:
                 else:
                     return False
         # 如果所有重试都失败，返回最后一次的异常信息
-        feishu_alert.send(
+        print(
             f"aliyun fc update_function failed after {retry} retries. Last error: {last_exception}"
         )
         return False

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/oss.py

@@ -135,7 +135,7 @@ class OSSUtils:
                 self.client.delete_object(obj.key)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def ls(self, prefix):
@@ -206,7 +206,7 @@ class OSSUtils:
                 return True
             return False
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def download_object(self, prefix, dir_path):
@@ -231,7 +231,7 @@ class OSSUtils:
             self.client.get_object_to_file(prefix, download_path)
             return True
         except Exception as e:
-            feishu_alert.send(f"oss download_object error: {traceback.format_exc()}")
+            print(f"oss download_object error: {traceback.format_exc()}")
             return False
 
     def upload_object(self, prefix, local_path):
@@ -255,7 +255,7 @@ class OSSUtils:
             )
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def copy_object(self, prefix, target_prefix):
@@ -274,7 +274,7 @@ class OSSUtils:
             )
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def generate_presigned_url(self, prefix, expires_in=60 * 60 * 24):

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/sms.py

@@ -52,8 +52,8 @@ class SMSUtils:
                 response and response.status_code == 200 and response.body.code == "OK"
             )
             if not flag:
-                feishu_alert.send(f"短信发送失败: {response}")
+                print(f"短信发送失败: {response}")
             return flag
         except Exception as e:
-            feishu_alert.send("短信发送失败: " + traceback.format_exc())
+            print("短信发送失败: " + traceback.format_exc())
             return False

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/aliyun/sts.py

@@ -76,7 +76,7 @@ class STSUtils:
             )
             return credentials, True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return {}, False
 
     def get_oss_sts_client(self, endpoint, bucket_name):
@@ -99,7 +99,7 @@ class STSUtils:
             )
             return oss2.Bucket(auth, endpoint, bucket_name), True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return None, False
 
     def generate_presigned_url(self, prefix, expires_in=60 * 60 * 24):
@@ -120,5 +120,5 @@ class STSUtils:
                 return ""
             return sts_oss_client.sign_url("GET", prefix, expires_in)
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return ""

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/db_utils/mysql.py

@@ -46,12 +46,12 @@ class MysqlUtils:
                 break  # 连接成功，跳出重试循环
             except OperationalError as e:
                 if attempt < self.max_retries - 1:
-                    feishu_alert.send(
+                    print(
                         f"MySQL连接失败，正在重试 ({attempt + 1}/{self.max_retries}): {str(e)}"
                     )
                     time.sleep(2**attempt)  # 指数退避
                 else:
-                    feishu_alert.send(f"MySQL连接最终失败: {traceback.format_exc()}")
+                    print(f"MySQL连接最终失败: {traceback.format_exc()}")
                     raise
 
     def get_conn(self):
@@ -198,7 +198,7 @@ class MysqlUtils:
                 print(f"插入/更新 {i} / {len(rows)} 行到 {table_name}")
             return True
         except Exception as e:
-            feishu_alert.send(f"mysql-insert_or_update error {traceback.format_exc()}")
+            print(f"mysql-insert_or_update error {traceback.format_exc()}")
             return False
 
     def query(self, sql, convert_to_dict=False):
@@ -225,7 +225,7 @@ class MysqlUtils:
                 return [dict(zip(columns, row)) for row in result]
             return list(result)
         except Exception as e:
-            feishu_alert.send(f"mysql-query error {traceback.format_exc()}")
+            print(f"mysql-query error {traceback.format_exc()}")
             return []
         finally:
             cursor.close()
@@ -247,7 +247,7 @@ class MysqlUtils:
             return True
         except Exception as e:
             self.mysql.rollback()
-            feishu_alert.send(f"mysql-execute error {traceback.format_exc()}")
+            print(f"mysql-execute error {traceback.format_exc()}")
             return False
         finally:
             cursor.close()
@@ -305,12 +305,12 @@ class MysqlUtilsAsync:
                 break  # 连接成功，跳出重试循环
             except Exception as e:
                 if attempt < self.max_retries - 1:
-                    feishu_alert.send(
+                    print(
                         f"异步MySQL连接失败，正在重试 ({attempt + 1}/{self.max_retries}): {str(e)}"
                     )
                     await asyncio.sleep(2**attempt)  # 指数退避
                 else:
-                    feishu_alert.send(
+                    print(
                         f"异步MySQL连接最终失败: {traceback.format_exc()}"
                     )
                     raise
@@ -462,7 +462,7 @@ class MysqlUtilsAsync:
                 print(f"插入/更新 {i} / {len(rows)} 行到 {table_name}")
             return True
         except Exception as e:
-            feishu_alert.send(
+            print(
                 f"mysql-insert_or_update_async error {traceback.format_exc()}"
             )
             return False
@@ -493,7 +493,7 @@ class MysqlUtilsAsync:
                 return [dict(zip(columns, row)) for row in result]
             return list(result)
         except Exception as e:
-            feishu_alert.send(f"mysql-query_async error {traceback.format_exc()}")
+            print(f"mysql-query_async error {traceback.format_exc()}")
             return []
         finally:
             if cursor:
@@ -519,7 +519,7 @@ class MysqlUtilsAsync:
         except Exception as e:
             async_mysql = await self.get_async_conn()
             await async_mysql.rollback()
-            feishu_alert.send(f"mysql-execute_async error {traceback.format_exc()}")
+            print(f"mysql-execute_async error {traceback.format_exc()}")
             return False
         finally:
             if cursor:

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/db_utils/redis.py

@@ -34,7 +34,7 @@ class RedisUtils:
             self.redis_client.set(key, value, ex=expire_seconds)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def get(self, key, default_value=""):
@@ -53,7 +53,7 @@ class RedisUtils:
                 return default_value
             return value.decode()
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return default_value
 
     def delete(self, key):
@@ -69,7 +69,7 @@ class RedisUtils:
             self.redis_client.delete(key)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def delete_many(self, keys: List[str]) -> bool:
@@ -85,7 +85,7 @@ class RedisUtils:
             self.redis_client.delete(*keys)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def set_hash(self, key, field, value, expire_seconds=None):
@@ -106,7 +106,7 @@ class RedisUtils:
                 self.redis_client.expire(key, expire_seconds)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def get_hash(self, key, field):
@@ -125,7 +125,7 @@ class RedisUtils:
                 return ""
             return value.decode()
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return ""
 
     def delete_hash(self, key, field):
@@ -142,7 +142,7 @@ class RedisUtils:
             self.redis_client.hdel(key, field)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     def list_hash_keys(self, key):
@@ -157,7 +157,7 @@ class RedisUtils:
         try:
             return [key.decode() for key in self.redis_client.hkeys(key)]
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return []
 
     def list_keys(self, prefix=""):
@@ -183,7 +183,7 @@ class RedisUtils:
                     break
             return [key.decode() for key in keys]
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return []
 
     def __del__(self):
@@ -214,7 +214,7 @@ class RedisUtilsAsync:
             await self.async_redis_client.set(key, value, ex=expire_seconds)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     async def get(self, key, default_value=""):
@@ -233,7 +233,7 @@ class RedisUtilsAsync:
                 return default_value
             return value.decode()
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return default_value
 
     async def delete(self, key):
@@ -249,7 +249,7 @@ class RedisUtilsAsync:
             await self.async_redis_client.delete(key)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     async def delete_many(self, keys: List[str]) -> bool:
@@ -265,7 +265,7 @@ class RedisUtilsAsync:
             await self.async_redis_client.delete(*keys)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     async def set_hash(self, key, field, value, expire_seconds=None):
@@ -286,7 +286,7 @@ class RedisUtilsAsync:
                 await self.async_redis_client.expire(key, expire_seconds)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     async def get_hash(self, key, field):
@@ -305,7 +305,7 @@ class RedisUtilsAsync:
                 return ""
             return value.decode()
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return ""
 
     async def delete_hash(self, key, field):
@@ -322,7 +322,7 @@ class RedisUtilsAsync:
             await self.async_redis_client.hdel(key, field)
             return True
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return False
 
     async def list_hash_keys(self, key):
@@ -338,7 +338,7 @@ class RedisUtilsAsync:
             keys = await self.async_redis_client.hkeys(key)
             return [key.decode() for key in keys]
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return []
 
     async def list_keys(self, prefix=""):
@@ -364,7 +364,7 @@ class RedisUtilsAsync:
                     break
             return [key.decode() for key in keys]
         except Exception as e:
-            feishu_alert.send(traceback.format_exc())
+            print(traceback.format_exc())
             return []
 
     async def close(self):

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/decorators/decorators.py

@@ -38,7 +38,7 @@ def catch_exception(
                 alert_message = f"文件{os.path.relpath(inspect.getfile(func))}中的函数{get_caller_function_name()}执行失败，{alert_params_str}，错误信息如下:\n {traceback.format_exc()}"
                 if addtional_alert:
                     alert_message += f"\n{addtional_alert}"
-                feishu_alert.send(alert_message)
+                print(alert_message)
                 return exception_return
 
         @wraps(func)
@@ -50,7 +50,7 @@ def catch_exception(
                 alert_message = f"文件{os.path.relpath(inspect.getfile(func))}中的函数{get_caller_function_name()}执行失败，{alert_params_str}，错误信息如下:\n {traceback.format_exc()}"
                 if addtional_alert:
                     alert_message += f"\n{addtional_alert}"
-                feishu_alert.send(alert_message)
+                print(alert_message)
                 return exception_return
 
         if asyncio.iscoroutinefunction(func):

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pixelarraylib/scripts/__init__.py

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

pixelarraylib-1.0.8/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.6 → pixelarraylib-1.0.8}/pixelarraylib/system/common.py

@@ -216,7 +216,7 @@ def split_content_into_sentences(
             sentences = [re.sub(r"[^\w\s]", "", s) for s in sentences]
         return sentences, True
     except Exception as e:
-        feishu_alert.send(f"分割内容时发生错误: {traceback.format_exc()}")
+        print(f"分割内容时发生错误: {traceback.format_exc()}")
         return [], False
 
 
@@ -234,7 +234,7 @@ def remove_all_punctuation(text: str) -> tuple[str, bool]:
         # 使用正则表达式去除所有标点符号
         return re.sub(r"[^\w\s]", "", text), True
     except Exception as e:
-        feishu_alert.send(f"去除标点符号时发生错误: {traceback.format_exc()}")
+        print(f"去除标点符号时发生错误: {traceback.format_exc()}")
         return text, False
 
 
@@ -263,16 +263,15 @@ def execute_command(command: Union[str, List[str]]) -> str:
     try:
         if isinstance(command, str):
             command = command.split()
-        print(command)
         result = subprocess.run(
             command, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
         )
         return result.stdout.decode(), True
     except subprocess.CalledProcessError as e:
-        feishu_alert.send(
+        print(
             f"执行命令失败，命令: {command}，错误信息: {e.stderr.decode() if e.stderr else str(e)}"
         )
-        return None, False
+        return e.stderr.decode() if e.stderr else "", False
 
 
 async def execute_command_async(command: Union[str, List[str]]) -> str:
@@ -287,17 +286,16 @@ async def execute_command_async(command: Union[str, List[str]]) -> str:
     try:
         if isinstance(command, str):
             command = command.split()
-        print(command)
         result = await asyncio.create_subprocess_exec(
             *command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
         )
         stdout, stderr = await result.communicate()
         return stdout.decode(), True
     except subprocess.CalledProcessError as e:
-        feishu_alert.send(
+        print(
             f"异步执行命令失败，命令: {command}，错误信息: {e.stderr.decode() if e.stderr else str(e)}"
         )
-        return None, False
+        return e.stderr.decode() if e.stderr else "", False
 
 
 def get_variable_type(variable: object) -> str:

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8/pixelarraylib.egg-info}/PKG-INFO

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

{pixelarraylib-1.0.6 → pixelarraylib-1.0.8}/pyproject.toml

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

pixelarraylib-1.0.6/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()