sycommon-python-lib 0.1.14__tar.gz → 0.1.15__tar.gz

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/PKG-INFO

@@ -1,23 +1,23 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.14
+Version: 0.1.15
 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.15
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: fastapi>=0.116.1
+Requires-Dist: fastapi>=0.117.1
 Requires-Dist: kafka-python>=2.2.15
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.4.0
 Requires-Dist: nacos-sdk-python>=2.0.9
-Requires-Dist: pydantic>=2.11.7
+Requires-Dist: pydantic>=2.11.9
 Requires-Dist: python-dotenv>=1.1.1
-Requires-Dist: pyyaml>=6.0.2
+Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: sqlalchemy>=2.0.43
 Requires-Dist: uuid>=1.30
-Requires-Dist: uvicorn>=0.35.0
+Requires-Dist: uvicorn>=0.37.0
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.14"
+version = "0.1.15"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -8,17 +8,17 @@ dependencies = [
     "aio-pika>=9.5.7",
     "aiohttp>=3.12.15",
     "decorator>=5.2.1",
-    "fastapi>=0.116.1",
+    "fastapi>=0.117.1",
     "kafka-python>=2.2.15",
     "loguru>=0.7.3",
     "mysql-connector-python>=9.4.0",
     "nacos-sdk-python>=2.0.9",
-    "pydantic>=2.11.7",
+    "pydantic>=2.11.9",
     "python-dotenv>=1.1.1",
-    "pyyaml>=6.0.2",
+    "pyyaml>=6.0.3",
     "sqlalchemy>=2.0.43",
     "uuid>=1.30",
-    "uvicorn>=0.35.0",
+    "uvicorn>=0.37.0",
 ]
 
 [tool.setuptools]

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/src/sycommon/logging/kafka_log.py

@@ -1,4 +1,5 @@
 import os
+import pprint
 import sys
 import traceback
 import asyncio
@@ -70,6 +71,8 @@ class KafkaLogger(metaclass=SingletonMeta):
             buffer_memory=67108864,  # 增大缓冲区内存
             connections_max_idle_ms=540000,  # 连接最大空闲时间
             reconnect_backoff_max_ms=10000,  # 增加重连退避最大时间
+            max_in_flight_requests_per_connection=1,  # 限制单个连接上未确认的请求数量
+            enable_idempotence=True,  # 开启幂等性
         )
 
         # 启动后台发送线程
@@ -487,22 +490,26 @@ class SYLogger:
             logger.info(_log)
 
         if os.getenv('DEV-LOG', 'false').lower() == 'true':
-            print(_log)
+            pprint(_log)
 
     @staticmethod
-    def info(msg: any):
+    def info(msg: any, *args, **kwargs):
         SYLogger._log(msg, "INFO")
 
     @staticmethod
-    def warning(msg: any):
+    def warning(msg: any, *args, **kwargs):
         SYLogger._log(msg, "WARNING")
 
     @staticmethod
-    def error(msg: any):
+    def debug(msg: any, *args, **kwargs):
+        SYLogger._log(msg, "DEBUG")
+
+    @staticmethod
+    def error(msg: any, *args, **kwargs):
         SYLogger._log(msg, "ERROR")
 
     @staticmethod
-    def exception(msg: any):
+    def exception(msg: any, *args, **kwargs):
         """记录异常信息，包括完整堆栈"""
         trace_id = SYLogger.get_trace_id()
 

sycommon_python_lib-0.1.15/src/sycommon/middleware/cors.py

@@ -0,0 +1,16 @@
+from fastapi.middleware.cors import CORSMiddleware
+
+
+def setup_cors_handler(app):
+    # 允许所有源访问（*）
+    # 注意：此时allow_credentials必须为False，否则浏览器会拦截响应
+    app.add_middleware(
+        CORSMiddleware,
+        # allow_origins=["*"],         # 允许所有源
+        # allow_credentials=False,     # 必须为False（与*配合）
+        # allow_methods=["*"],         # 允许所有HTTP方法
+        allow_headers=["*"],         # 允许所有请求头
+        expose_headers=["*"]         # 允许前端访问所有响应头
+    )
+
+    return app

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/src/sycommon/middleware/middleware.py

@@ -26,7 +26,7 @@ class Middleware:
         # app = setup_monitor_memory_middleware(app)
 
         # 设置cors
-        # app = setup_cors_handler(app)
+        app = setup_cors_handler(app)
 
         # 健康检查
         app = setup_health_handler(app)

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/src/sycommon/rabbitmq/rabbitmq_client.py

@@ -13,12 +13,13 @@ from aio_pika.abc import (
 )
 from aiormq.exceptions import ChannelInvalidStateError, ConnectionClosed
 
+from sycommon.logging.kafka_log import SYLogger
 from sycommon.models.mqmsg_model import MQMsgModel
 
 # 最大重试次数限制
 MAX_RETRY_COUNT = 3
 
-logger = logging.getLogger(__name__)
+logger = SYLogger
 
 
 class RabbitMQClient:
@@ -324,6 +325,9 @@ class RabbitMQClient:
                         timeout=self.rpc_timeout
                     )
 
+                    # 启用发布确认
+                    # await self.channel.confirm_delivery()
+
                     # 设置预取计数，控制消息公平分发
                     await self.channel.set_qos(prefetch_count=self.prefetch_count)
 
@@ -667,7 +671,9 @@ class RabbitMQClient:
             try:
                 await self.exchange.publish(
                     message,
-                    routing_key=routing_key or self.routing_key or '#'
+                    routing_key=routing_key or self.routing_key or '#',
+                    mandatory=True,
+                    timeout=5.0
                 )
                 self._update_activity_timestamp()
                 logger.debug(
@@ -875,7 +881,9 @@ class RabbitMQClient:
             if self.exchange:
                 await self.exchange.publish(
                     new_message,
-                    routing_key=self.routing_key or '#'
+                    routing_key=self.routing_key or '#',
+                    mandatory=True,
+                    timeout=5.0
                 )
                 self._update_activity_timestamp()
                 logger.info(

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/src/sycommon/rabbitmq/rabbitmq_service.py

@@ -13,7 +13,7 @@ from sycommon.models.sso_user import SsoUser
 from sycommon.logging.kafka_log import SYLogger
 from .rabbitmq_client import RabbitMQClient
 
-logger = logging.getLogger(__name__)
+logger = SYLogger
 
 
 class RabbitMQService:

sycommon_python_lib-0.1.15/src/sycommon/sse/event.py

@@ -0,0 +1,97 @@
+import io
+import re
+import json
+from typing import Optional, Any, Union
+
+
+class ServerSentEvent:
+    """
+    Helper class to format data for Server-Sent Events (SSE).
+    """
+
+    _LINE_SEP_EXPR = re.compile(r"\r\n|\r|\n")
+    DEFAULT_SEPARATOR = "\r\n"
+
+    def __init__(
+        self,
+        data: Optional[Any] = None,
+        *,
+        event: Optional[str] = None,
+        id: Optional[str] = None,
+        retry: Optional[int] = None,
+        comment: Optional[str] = None,
+        sep: Optional[str] = None,
+    ) -> None:
+        self.data = data
+        self.event = event
+        self.id = id
+        self.retry = retry
+        self.comment = comment
+        self._sep = sep if sep is not None else self.DEFAULT_SEPARATOR
+
+    def encode(self) -> bytes:
+        buffer = io.StringIO()
+        if self.comment is not None:
+            for chunk in self._LINE_SEP_EXPR.split(str(self.comment)):
+                buffer.write(f": {chunk}{self._sep}")
+
+        if self.id is not None:
+            # Clean newlines in the event id
+            buffer.write(
+                "id: " + self._LINE_SEP_EXPR.sub("", self.id) + self._sep)
+
+        if self.event is not None:
+            # Clean newlines in the event name
+            buffer.write(
+                "event: " + self._LINE_SEP_EXPR.sub("", self.event) + self._sep
+            )
+
+        if self.data is not None:
+            # Break multi-line data into multiple data: lines
+            for chunk in self._LINE_SEP_EXPR.split(str(self.data)):
+                buffer.write(f"data: {chunk}{self._sep}")
+
+        if self.retry is not None:
+            if not isinstance(self.retry, int):
+                raise TypeError("retry argument must be int")
+            buffer.write(f"retry: {self.retry}{self._sep}")
+
+        buffer.write(self._sep)
+        return buffer.getvalue().encode("utf-8")
+
+
+class JSONServerSentEvent(ServerSentEvent):
+    """
+    Helper class to format JSON data for Server-Sent Events (SSE).
+    """
+
+    def __init__(
+        self,
+        data: Optional[Any] = None,
+        *args,
+        **kwargs,
+    ) -> None:
+        super().__init__(
+            json.dumps(
+                data,
+                ensure_ascii=False,
+                allow_nan=False,
+                indent=None,
+                separators=(",", ":"),
+            )
+            if data is not None
+            else None,
+            *args,
+            **kwargs,
+        )
+
+
+def ensure_bytes(data: Union[bytes, dict, ServerSentEvent, Any], sep: str) -> bytes:
+    if isinstance(data, bytes):
+        return data
+    if isinstance(data, ServerSentEvent):
+        return data.encode()
+    if isinstance(data, dict):
+        data["sep"] = sep
+        return ServerSentEvent(**data).encode()
+    return ServerSentEvent(str(data), sep=sep).encode()

sycommon_python_lib-0.1.15/src/sycommon/sse/sse.py

@@ -0,0 +1,278 @@
+import contextvars
+import logging
+from datetime import datetime, timezone
+from typing import (
+    Any,
+    AsyncIterable,
+    Awaitable,
+    Callable,
+    Coroutine,
+    Iterator,
+    Mapping,
+    Optional,
+    Union,
+)
+
+import anyio
+from starlette.background import BackgroundTask
+from starlette.concurrency import iterate_in_threadpool
+from starlette.datastructures import MutableHeaders
+from starlette.responses import Response
+from starlette.types import Receive, Scope, Send, Message
+
+from sycommon.sse.event import ServerSentEvent, ensure_bytes
+
+
+logger = logging.getLogger(__name__)
+
+# Context variable for exit events per event loop
+_exit_event_context: contextvars.ContextVar[Optional[anyio.Event]] = (
+    contextvars.ContextVar("exit_event", default=None)
+)
+
+
+class SendTimeoutError(TimeoutError):
+    pass
+
+
+class AppStatus:
+    """Helper to capture a shutdown signal from Uvicorn so we can gracefully terminate SSE streams."""
+
+    should_exit = False
+    original_handler: Optional[Callable] = None
+
+    @staticmethod
+    def handle_exit(*args, **kwargs):
+        # Mark that the app should exit, and signal all waiters in all contexts.
+        AppStatus.should_exit = True
+
+        # Signal the event in current context if it exists
+        current_event = _exit_event_context.get(None)
+        if current_event is not None:
+            current_event.set()
+
+        if AppStatus.original_handler is not None:
+            AppStatus.original_handler(*args, **kwargs)
+
+    @staticmethod
+    def get_or_create_exit_event() -> anyio.Event:
+        """Get or create an exit event for the current context."""
+        event = _exit_event_context.get(None)
+        if event is None:
+            event = anyio.Event()
+            _exit_event_context.set(event)
+        return event
+
+
+try:
+    from uvicorn.main import Server
+
+    AppStatus.original_handler = Server.handle_exit
+    Server.handle_exit = AppStatus.handle_exit  # type: ignore
+except ImportError:
+    logger.debug(
+        "Uvicorn not installed. Graceful shutdown on server termination disabled."
+    )
+
+Content = Union[str, bytes, dict, ServerSentEvent, Any]
+SyncContentStream = Iterator[Content]
+AsyncContentStream = AsyncIterable[Content]
+ContentStream = Union[AsyncContentStream, SyncContentStream]
+
+
+class EventSourceResponse(Response):
+    """
+    Streaming response that sends data conforming to the SSE (Server-Sent Events) specification.
+    """
+
+    DEFAULT_PING_INTERVAL = 15
+    DEFAULT_SEPARATOR = "\r\n"
+
+    def __init__(
+        self,
+        content: ContentStream,
+        status_code: int = 200,
+        headers: Optional[Mapping[str, str]] = None,
+        media_type: str = "text/event-stream",
+        background: Optional[BackgroundTask] = None,
+        ping: Optional[int] = None,
+        sep: Optional[str] = None,
+        ping_message_factory: Optional[Callable[[], ServerSentEvent]] = None,
+        data_sender_callable: Optional[
+            Callable[[], Coroutine[None, None, None]]
+        ] = None,
+        send_timeout: Optional[float] = None,
+        client_close_handler_callable: Optional[
+            Callable[[Message], Awaitable[None]]
+        ] = None,
+    ) -> None:
+        # Validate separator
+        if sep not in (None, "\r\n", "\r", "\n"):
+            raise ValueError(
+                f"sep must be one of: \\r\\n, \\r, \\n, got: {sep}")
+        self.sep = sep or self.DEFAULT_SEPARATOR
+
+        # If content is sync, wrap it for async iteration
+        if isinstance(content, AsyncIterable):
+            self.body_iterator = content
+        else:
+            self.body_iterator = iterate_in_threadpool(content)
+
+        self.status_code = status_code
+        self.media_type = self.media_type if media_type is None else media_type
+        self.background = background
+        self.data_sender_callable = data_sender_callable
+        self.send_timeout = send_timeout
+
+        # Build SSE-specific headers.
+        _headers = MutableHeaders()
+        if headers is not None:  # pragma: no cover
+            _headers.update(headers)
+
+        # "The no-store response directive indicates that any caches of any kind (private or shared)
+        # should not store this response."
+        # -- https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control
+        # allow cache control header to be set by user to support fan out proxies
+        # https://www.fastly.com/blog/server-sent-events-fastly
+
+        _headers.setdefault("Cache-Control", "no-store")
+        # mandatory for servers-sent events headers
+        _headers["Connection"] = "keep-alive"
+        _headers["X-Accel-Buffering"] = "no"
+        self.init_headers(_headers)
+
+        self.ping_interval = self.DEFAULT_PING_INTERVAL if ping is None else ping
+        self.ping_message_factory = ping_message_factory
+
+        self.client_close_handler_callable = client_close_handler_callable
+
+        self.active = True
+        # https://github.com/sysid/sse-starlette/pull/55#issuecomment-1732374113
+        self._send_lock = anyio.Lock()
+
+    @property
+    def ping_interval(self) -> Union[int, float]:
+        return self._ping_interval
+
+    @ping_interval.setter
+    def ping_interval(self, value: Union[int, float]) -> None:
+        if not isinstance(value, (int, float)):
+            raise TypeError("ping interval must be int")
+        if value < 0:
+            raise ValueError("ping interval must be greater than 0")
+        self._ping_interval = value
+
+    def enable_compression(self, force: bool = False) -> None:
+        raise NotImplementedError(
+            "Compression is not supported for SSE streams.")
+
+    async def _stream_response(self, send: Send) -> None:
+        """Send out SSE data to the client as it becomes available in the iterator."""
+        await send(
+            {
+                "type": "http.response.start",
+                "status": self.status_code,
+                "headers": self.raw_headers,
+            }
+        )
+
+        async for data in self.body_iterator:
+            chunk = ensure_bytes(data, self.sep)
+            logger.debug("chunk: %s", chunk)
+            with anyio.move_on_after(self.send_timeout) as cancel_scope:
+                await send(
+                    {"type": "http.response.body", "body": chunk, "more_body": True}
+                )
+
+            if cancel_scope and cancel_scope.cancel_called:
+                if hasattr(self.body_iterator, "aclose"):
+                    await self.body_iterator.aclose()
+                raise SendTimeoutError()
+
+        async with self._send_lock:
+            self.active = False
+            await send({"type": "http.response.body", "body": b"", "more_body": False})
+
+    async def _listen_for_disconnect(self, receive: Receive) -> None:
+        """Watch for a disconnect message from the client."""
+        while self.active:
+            message = await receive()
+            if message["type"] == "http.disconnect":
+                self.active = False
+                logger.debug("Got event: http.disconnect. Stop streaming.")
+                if self.client_close_handler_callable:
+                    await self.client_close_handler_callable(message)
+                break
+
+    @staticmethod
+    async def _listen_for_exit_signal() -> None:
+        """Watch for shutdown signals (e.g. SIGINT, SIGTERM) so we can break the event loop."""
+        # Check if should_exit was set before anybody started waiting
+        if AppStatus.should_exit:
+            return
+
+        # Get or create context-local exit event
+        exit_event = AppStatus.get_or_create_exit_event()
+
+        # Check if should_exit got set while we set up the event
+        if AppStatus.should_exit:
+            return
+
+        await exit_event.wait()
+
+    async def _ping(self, send: Send) -> None:
+        """Periodically send ping messages to keep the connection alive on proxies.
+        - frequenccy ca every 15 seconds.
+        - Alternatively one can send periodically a comment line (one starting with a ':' character)
+        """
+        while self.active:
+            await anyio.sleep(self._ping_interval)
+            sse_ping = (
+                self.ping_message_factory()
+                if self.ping_message_factory
+                else ServerSentEvent(
+                    comment=f"ping - {datetime.now(timezone.utc)}", sep=self.sep
+                )
+            )
+            ping_bytes = ensure_bytes(sse_ping, self.sep)
+            logger.debug("ping: %s", ping_bytes)
+
+            async with self._send_lock:
+                if self.active:
+                    await send(
+                        {
+                            "type": "http.response.body",
+                            "body": ping_bytes,
+                            "more_body": True,
+                        }
+                    )
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        """Entrypoint for Starlette's ASGI contract. We spin up tasks:
+        - _stream_response to push events
+        - _ping to keep the connection alive
+        - _listen_for_exit_signal to respond to server shutdown
+        - _listen_for_disconnect to respond to client disconnect
+        """
+        async with anyio.create_task_group() as task_group:
+            # https://trio.readthedocs.io/en/latest/reference-core.html#custom-supervisors
+            async def cancel_on_finish(coro: Callable[[], Awaitable[None]]):
+                await coro()
+                task_group.cancel_scope.cancel()
+
+            task_group.start_soon(
+                cancel_on_finish, lambda: self._stream_response(send))
+            task_group.start_soon(cancel_on_finish, lambda: self._ping(send))
+            task_group.start_soon(
+                cancel_on_finish, self._listen_for_exit_signal)
+
+            if self.data_sender_callable:
+                task_group.start_soon(self.data_sender_callable)
+
+            # Wait for the client to disconnect last
+            task_group.start_soon(
+                cancel_on_finish, lambda: self._listen_for_disconnect(receive)
+            )
+
+        if self.background is not None:
+            await self.background()

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,23 +1,23 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.14
+Version: 0.1.15
 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.15
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: fastapi>=0.116.1
+Requires-Dist: fastapi>=0.117.1
 Requires-Dist: kafka-python>=2.2.15
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.4.0
 Requires-Dist: nacos-sdk-python>=2.0.9
-Requires-Dist: pydantic>=2.11.7
+Requires-Dist: pydantic>=2.11.9
 Requires-Dist: python-dotenv>=1.1.1
-Requires-Dist: pyyaml>=6.0.2
+Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: sqlalchemy>=2.0.43
 Requires-Dist: uuid>=1.30
-Requires-Dist: uvicorn>=0.35.0
+Requires-Dist: uvicorn>=0.37.0
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/src/sycommon_python_lib.egg-info/SOURCES.txt

@@ -37,6 +37,9 @@ src/sycommon/models/mqsend_config.py
 src/sycommon/models/sso_user.py
 src/sycommon/rabbitmq/rabbitmq_client.py
 src/sycommon/rabbitmq/rabbitmq_service.py
+src/sycommon/sse/__init__.py
+src/sycommon/sse/event.py
+src/sycommon/sse/sse.py
 src/sycommon/synacos/__init__.py
 src/sycommon/synacos/feign.py
 src/sycommon/synacos/nacos_service.py

{sycommon_python_lib-0.1.14 → sycommon_python_lib-0.1.15}/src/sycommon_python_lib.egg-info/requires.txt

@@ -1,14 +1,14 @@
 aio-pika>=9.5.7
 aiohttp>=3.12.15
 decorator>=5.2.1
-fastapi>=0.116.1
+fastapi>=0.117.1
 kafka-python>=2.2.15
 loguru>=0.7.3
 mysql-connector-python>=9.4.0
 nacos-sdk-python>=2.0.9
-pydantic>=2.11.7
+pydantic>=2.11.9
 python-dotenv>=1.1.1
-pyyaml>=6.0.2
+pyyaml>=6.0.3
 sqlalchemy>=2.0.43
 uuid>=1.30
-uvicorn>=0.35.0
+uvicorn>=0.37.0

sycommon_python_lib-0.1.14/src/sycommon/middleware/cors.py

@@ -1,14 +0,0 @@
-from fastapi.middleware.cors import CORSMiddleware
-
-
-def setup_cors_handler(app):
-    app.add_middleware(
-        CORSMiddleware,
-        allow_origins=["*"],
-        allow_credentials=True,
-        allow_methods=["*"],
-        allow_headers=["*"],
-        expose_headers=["*"],
-    )
-
-    return app