sycommon-python-lib 0.1.1__tar.gz → 0.1.2__tar.gz

{sycommon_python_lib-0.1.1 → sycommon_python_lib-0.1.2}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.1
+Version: 0.1.2
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+Requires-Dist: aio-pika>=9.5.7
 Requires-Dist: aiohttp>=3.12.13
 Requires-Dist: decorator>=5.2.1
 Requires-Dist: fastapi>=0.115.14

{sycommon_python_lib-0.1.1 → sycommon_python_lib-0.1.2}/pyproject.toml

@@ -1,10 +1,11 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.1"
+version = "0.1.2"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
+    "aio-pika>=9.5.7",
     "aiohttp>=3.12.13",
     "decorator>=5.2.1",
     "fastapi>=0.115.14",

{sycommon_python_lib-0.1.1 → sycommon_python_lib-0.1.2}/src/sycommon/config/EmbeddingConfig.py

@@ -1,4 +1,3 @@
-
 from pydantic import BaseModel
 
 

sycommon_python_lib-0.1.2/src/sycommon/config/MQConfig.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+
+class MQConfig(BaseModel):
+    host: str
+    port: int
+    username: str
+    password: str
+    publisherConfirms: bool
+    publisherConfirmType: str
+    virtualHost: str
+
+
+class MQConsumer(BaseModel):
+    enabled: bool

sycommon_python_lib-0.1.2/src/sycommon/database/base_db_service.py

@@ -0,0 +1,30 @@
+from contextlib import contextmanager
+from sqlalchemy.orm import sessionmaker
+from sycommon.config.Config import SingletonMeta
+from sycommon.database.database_service import DatabaseService
+from sycommon.logging.kafka_log import SYLogger
+
+
+class BaseDBService(metaclass=SingletonMeta):
+    """数据库操作基础服务类，封装会话管理功能"""
+
+    def __init__(self):
+        self.engine = DatabaseService.engine()
+        self.Session = sessionmaker(bind=self.engine)
+
+    @contextmanager
+    def session(self):
+        """
+        数据库会话上下文管理器
+        自动处理会话的创建、提交、回滚和关闭
+        """
+        session = self.Session()
+        try:
+            yield session
+            session.commit()
+        except Exception as e:
+            session.rollback()
+            SYLogger.error(f"Database operation failed: {str(e)}")
+            raise
+        finally:
+            session.close()

{sycommon_python_lib-0.1.1 → sycommon_python_lib-0.1.2}/src/sycommon/logging/kafka_log.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import traceback
 import asyncio
@@ -8,10 +9,10 @@ import re
 import socket
 import time
 import threading
-import loguru
 from queue import Queue, Full, Empty
 from kafka import KafkaProducer
 from loguru import logger
+import loguru
 from sycommon.config.Config import Config, SingletonMeta
 from sycommon.middleware.context import current_trace_id
 from sycommon.tools.snowflake import Snowflake
@@ -39,7 +40,7 @@ class KafkaLogger(metaclass=SingletonMeta):
     _queue_warning_interval = 60  # 秒
     _last_queue_warning = 0
     _shutdown_timeout = 15  # 关闭超时时间，秒
-    _config = None  # 新增配置变量存储
+    _config = None  # 配置变量存储
 
     @staticmethod
     def setup_logger(config: dict):
@@ -84,38 +85,6 @@ class KafkaLogger(metaclass=SingletonMeta):
         # 设置全局异常处理器
         sys.excepthook = KafkaLogger._handle_exception
 
-        def pars_log(record):
-            match = KafkaLogger._log_pattern.match(record.strip())
-            if match:
-                time_str = match.group(1)
-                level = match.group(2)
-                module = match.group(3)
-                function = match.group(4)
-                line = int(match.group(5))
-                message_str = match.group(6)
-
-                try:
-                    message = json.loads(message_str)
-                except json.JSONDecodeError:
-                    message = message_str
-
-                return {
-                    "time": time_str,
-                    "level": level,
-                    "module": module,
-                    "function": function,
-                    "line": line,
-                    "message": message
-                }
-            else:
-                # 使用当前时间避免重复创建相同的时间字符串
-                current_time = datetime.now()
-                return {
-                    "message": record,
-                    "level": "ERROR",
-                    "time": current_time.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
-                }
-
         def custom_log_handler(record):
             # 检查record是否是Message对象
             if isinstance(record, loguru._handler.Message):
@@ -156,7 +125,7 @@ class KafkaLogger(metaclass=SingletonMeta):
 
                 # 检查是否有错误信息并设置detail字段
                 error_detail = ""
-                if level == "ERROR" and record.get("exception"):
+                if level == "ERROR" and record["exception"] is not None:
                     error_detail = "".join(traceback.format_exception(
                         record["exception"].type,
                         record["exception"].value,
@@ -506,12 +475,19 @@ class SYLogger:
         }
 
         # 选择日志级别
+        _log = ''
         if level == "ERROR":
-            logger.error(json.dumps(request_log, ensure_ascii=False))
+            _log = json.dumps(request_log, ensure_ascii=False)
+            logger.error(_log)
         elif level == "WARNING":
-            logger.warning(json.dumps(request_log, ensure_ascii=False))
+            _log = json.dumps(request_log, ensure_ascii=False)
+            logger.warning(_log)
         else:
-            logger.info(json.dumps(request_log, ensure_ascii=False))
+            _log = json.dumps(request_log, ensure_ascii=False)
+            logger.info(_log)
+
+        if os.getenv('DEV-LOG', 'false').lower() == 'true':
+            print(_log)
 
     @staticmethod
     def info(msg: any):

{sycommon_python_lib-0.1.1 → sycommon_python_lib-0.1.2}/src/sycommon/middleware/middleware.py

@@ -2,6 +2,7 @@ from sycommon.health.ping import setup_ping_handler
 from sycommon.middleware.cors import setup_cors_handler
 from sycommon.middleware.exception import setup_exception_handler
 from sycommon.middleware.monitor_memory import setup_monitor_memory_middleware
+from sycommon.middleware.mq import setup_mq_middleware
 from sycommon.middleware.timeout import setup_request_timeout_middleware
 from sycommon.middleware.traceid import setup_trace_id_handler
 from sycommon.health.health_check import setup_health_handler
@@ -29,4 +30,7 @@ def setup_middleware(app, config: dict):
     # ping
     app = setup_ping_handler(app)
 
+    # 添加mq中间件
+    # app = setup_mq_middleware(app)
+
     return app

sycommon_python_lib-0.1.2/src/sycommon/middleware/mq.py

@@ -0,0 +1,9 @@
+
+from sycommon.services import Services
+
+
+def setup_mq_middleware(app):
+    @app.on_event("shutdown")
+    async def shutdown_event():
+        await Services.shutdown()
+    return app

sycommon_python_lib-0.1.2/src/sycommon/models/mqlistener_config.py

@@ -0,0 +1,38 @@
+from pydantic import BaseModel, Field
+from typing import Callable, Coroutine, Optional
+from aio_pika.abc import AbstractIncomingMessage
+
+from sycommon.models.mqmsg_model import MQMsgModel
+
+
+class RabbitMQListenerConfig(BaseModel):
+    """RabbitMQ监听器配置模型"""
+    # 监听器唯一名称
+    # name: str = Field(..., description="监听器唯一标识名称")
+
+    # 队列配置
+    queue_name: str = Field(..., description="队列名称")
+    # 使用.分割queue_name取出第一部分
+    # routing_key: str = Field(..., description="路由键")
+
+    # 消息处理器
+    handler: Callable[[MQMsgModel, AbstractIncomingMessage], Coroutine] | None = Field(
+        None, description="消息处理函数"
+    )
+
+    # 可选配置参数
+    host: Optional[str] = Field(None, description="RabbitMQ主机地址")
+    port: Optional[int] = Field(None, description="RabbitMQ端口")
+    username: Optional[str] = Field(None, description="用户名")
+    password: Optional[str] = Field(None, description="密码")
+    virtualhost: Optional[str] = Field(None, description="虚拟主机")
+    exchange_name: Optional[str] = Field(None, description="交换机名称")
+    exchange_type: str = Field("topic", description="交换机类型")
+    durable: bool = Field(True, description="是否持久化")
+    auto_delete: bool = Field(False, description="是否自动删除队列")
+    auto_parse_json: bool = Field(True, description="是否自动解析JSON消息")
+
+    class Config:
+        """模型配置"""
+        # 允许存储函数类型
+        arbitrary_types_allowed = True

sycommon_python_lib-0.1.2/src/sycommon/models/mqmsg_model.py

@@ -0,0 +1,11 @@
+from pydantic import BaseModel
+
+
+class MQMsgModel(BaseModel):
+    topicCode: str
+    msg: str | None = None
+    correlationDataId: str | None = None
+    dataKey: str | None = None
+    manualFlag: bool | None = None
+    groupId: str | None = None
+    traceId: str | None = None

sycommon_python_lib-0.1.2/src/sycommon/models/mqsend_config.py

@@ -0,0 +1,8 @@
+from typing import Optional
+from sycommon.models.mqlistener_config import RabbitMQListenerConfig
+
+
+class RabbitMQSendConfig(RabbitMQListenerConfig):
+    """MQ消息发送配置模型，继承自监听器配置"""
+    # 是否自动连接
+    auto_connect: bool = True

sycommon_python_lib-0.1.2/src/sycommon/models/sso_user.py

@@ -0,0 +1,60 @@
+from pydantic import BaseModel
+from typing import List, Optional
+from datetime import datetime
+
+
+class SsoUser(BaseModel):
+    """SSO用户模型，对应Java的SsoUser类"""
+    tenant_id: Optional[str] = None
+    customer_id: Optional[str] = None
+    customer_name: Optional[str] = None
+    user_type: Optional[str] = None  # 用户类型
+    auth_type: Optional[str] = None  # 认证类型
+    system_type: Optional[str] = None  # 系统类型
+    role_type: Optional[str] = None  # 角色类型
+    user_id: Optional[str] = None  # 用户代码
+    user_name: Optional[str] = None  # 用户名称
+    real_name: Optional[str] = None  # 用户真实名称
+    user_status: Optional[str] = None  # 用户状态
+    last_logon_time: Optional[datetime] = None  # 上次登录时间
+    num_logon_try: Optional[int] = None  # 登录重试次数
+    working_right_codes: Optional[List[str]] = None  # 用户资源代码
+    group_ids: Optional[List[str]] = None  # 用户组Ids
+    password: Optional[str] = None  # 密码
+    old_password: Optional[str] = None  # 盛易通旧密码
+    request_path: Optional[str] = None  # 请求ID
+    pwd_expiry_date: Optional[datetime] = None  # 过期时间
+    model_flag: Optional[str] = None  # 当前模式
+    sign_key: Optional[str] = None  # 签名key
+    security_token: Optional[str] = None  # 安全秘钥
+    mur: Optional[str] = None  # 指纹
+    init_status: str = "N"  # 默认是N初始化(没有权限),Y表示权限初始化
+    mobile_brand: Optional[str] = None  # 手机品牌
+    mobile_type: Optional[str] = None  # 手机型号
+    mobile_system_version: Optional[str] = None  # 系统版本
+    platform: Optional[str] = None  # 手机平台
+    ip: Optional[str] = None  # ip地址
+    browser_type: Optional[str] = None  # 浏览器类型
+    os_type: Optional[str] = None  # 系统类型
+    access_token: Optional[str] = None  # 用于给在线用户使用
+
+    # 申请渠道 PC-“PC”、APP-“APP”、SYSTEM-“系统生成”、YYD-“租户端”
+    req_type: Optional[str] = None
+    pri_req_source: Optional[str] = None  # 原始请求来源
+    req_source: Optional[str] = None  # 请求来源
+    identitys: Optional[List[str]] = None  # 客户身份
+
+    # 修可登录终端，为空默认全部，1=PC，2=小程序，9=其他
+    login_terminal: Optional[str] = None
+
+    # 用户来源  3=无担保撮合（小微贷）
+    user_source: Optional[str] = None
+
+    # 登录方式 手机验证码登录：phoneCode
+    login_type: Optional[str] = None
+
+    # 是否个人账户 Y是/N否
+    is_person_user: Optional[str] = None
+
+    # 请求上下文traceId，用于MQ重发等场景
+    trace_id: Optional[str] = None