sycommon-python-lib 0.1.17__py3-none-any.whl → 0.1.19__py3-none-any.whl

sycommon/health/metrics.py

@@ -0,0 +1,13 @@
+from fastapi import FastAPI, APIRouter
+
+
+def setup_metrics_handler(app: FastAPI):
+    metrics_router = APIRouter()
+
+    @metrics_router.get("/metrics")
+    async def metrics():
+        return {"status": "alive"}
+
+    app.include_router(metrics_router)
+
+    return app

sycommon/middleware/middleware.py

@@ -1,3 +1,4 @@
+from src.sycommon.health.metrics import setup_metrics_handler
 from sycommon.health.ping import setup_ping_handler
 from sycommon.middleware.cors import setup_cors_handler
 from sycommon.middleware.docs import setup_docs_handler
@@ -34,6 +35,9 @@ class Middleware:
         # ping
         app = setup_ping_handler(app)
 
+        # metrics
+        app = setup_metrics_handler(app)
+
         # 添加mq中间件
         # app = setup_mq_middleware(app)
 

sycommon/rabbitmq/rabbitmq_client.py

@@ -324,7 +324,11 @@ class RabbitMQClient:
                     if self._is_consuming:
                         current_time = asyncio.get_event_loop().time()
                         if current_time - self._last_message_processed > self.consumption_stall_threshold:
-                            if self._is_consuming and self.message_handler:
+                            if self._processing_message_ids:
+                                logger.warning(
+                                    f"消费停滞，但有 {len(self._processing_message_ids)} 个消息正在处理，暂不重启")
+                            else:
+                                # 确实无消息处理，再重启
                                 await self.stop_consuming()
                                 await asyncio.sleep(1)
                                 await self.start_consuming()
@@ -332,7 +336,7 @@ class RabbitMQClient:
                     logger.error(f"监控任务出错: {str(e)}")
                     await asyncio.sleep(1)
 
-                await asyncio.sleep(5)  # 每5秒检查一次
+                await asyncio.sleep(30)
 
         self._monitor_task = asyncio.create_task(monitor())
 

sycommon/services.py

@@ -1,9 +1,11 @@
-from typing import Any, Callable, Dict, List, Tuple, Union, Optional, AsyncGenerator
 import asyncio
 import logging
+import yaml
 from contextlib import asynccontextmanager
+from dotenv import load_dotenv
 from fastapi import FastAPI, applications
 from pydantic import BaseModel
+from typing import Any, Callable, Dict, List, Tuple, Union, Optional, AsyncGenerator
 from sycommon.config.Config import SingletonMeta
 from sycommon.models.mqlistener_config import RabbitMQListenerConfig
 from sycommon.models.mqsend_config import RabbitMQSendConfig
@@ -41,7 +43,7 @@ class Services(metaclass=SingletonMeta):
     def plugins(
         cls,
         app: FastAPI,
-        config: dict,
+        config: Optional[dict] = None,
         middleware: Optional[Callable[[FastAPI, dict], None]] = None,
         nacos_service: Optional[Callable[[dict], None]] = None,
         logging_service: Optional[Callable[[dict], None]] = None,
@@ -52,6 +54,7 @@ class Services(metaclass=SingletonMeta):
         rabbitmq_listeners: Optional[List[RabbitMQListenerConfig]] = None,
         rabbitmq_senders: Optional[List[RabbitMQSendConfig]] = None
     ) -> FastAPI:
+        load_dotenv()
         # 保存应用实例和配置
         cls._app = app
         cls._config = config
@@ -59,6 +62,12 @@ class Services(metaclass=SingletonMeta):
         # 设置文档
         applications.get_swagger_ui_html = custom_swagger_ui_html
         applications.get_redoc_html = custom_redoc_html
+        # 设置app.state host, port
+        if not cls._config:
+            config = yaml.safe_load(open('app.yaml', 'r', encoding='utf-8'))
+            cls._config = config
+        app.host = cls._config.get('Host')
+        app.post = cls._config.get('Port')
 
         # 立即配置非异步服务（在应用启动前）
         if middleware:

{sycommon_python_lib-0.1.17.dist-info → sycommon_python_lib-0.1.19.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.17
+Version: 0.1.19
 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.117.1
+Requires-Dist: fastapi>=0.118.0
 Requires-Dist: kafka-python>=2.2.15
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.4.0

{sycommon_python_lib-0.1.17.dist-info → sycommon_python_lib-0.1.19.dist-info}/RECORD

@@ -1,6 +1,6 @@
 command/cli.py,sha256=bP2LCLkRvfETIwWkVD70q5xFxMI4D3BpH09Ws1f-ENc,5849
 sycommon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/services.py,sha256=jQBzJvepaUyDVxLOC39OJokgQfwME0eRj9uN-13ZPjg,8423
+sycommon/services.py,sha256=s9xbXiwehZeO4ZnS_8UKFY-LBkdGwbmsK-BB3pmFZuo,8766
 sycommon/config/Config.py,sha256=9yO5b8WfvEDvkyrGrlwrLFasgh_-MjcEvGF20Gz5Xo4,3041
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
 sycommon/config/EmbeddingConfig.py,sha256=gPKwiDYbeu1GpdIZXMmgqM7JqBIzCXi0yYuGRLZooMI,362
@@ -12,6 +12,7 @@ sycommon/database/base_db_service.py,sha256=J5ELHMNeGfzA6zVcASPSPZ0XNKrRY3_gdGmV
 sycommon/database/database_service.py,sha256=B9tCaMsKGK87XF20YQh-eGupa3dq0JXymKnAAJvS2DQ,3060
 sycommon/health/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/health/health_check.py,sha256=EhfbhspRpQiKJaxdtE-PzpKQO_ucaFKtQxIm16F5Mpk,391
+sycommon/health/metrics.py,sha256=fHqO73JuhoZkNPR-xIlxieXiTCvttq-kG-tvxag1s1s,268
 sycommon/health/ping.py,sha256=FTlnIKk5y1mPfS1ZGOeT5IM_2udF5aqVLubEtuBp18M,250
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/logging/kafka_log.py,sha256=g6X46GlqJMzMMZEhbNa-eTswzkF8ILBHDYQFbjz6j54,20757
@@ -21,7 +22,7 @@ sycommon/middleware/context.py,sha256=_5ghpv4u_yAvjkgM-XDx8OnO-YI1XtntHrXsHJHZkw
 sycommon/middleware/cors.py,sha256=0B5d_ovD56wcH9TfktRs88Q09R9f8Xx5h5ALWYvE8Iw,600
 sycommon/middleware/docs.py,sha256=bVdDBIHXGVBv562MQLSroa1DgHoObxR9gFzv71PIejg,1187
 sycommon/middleware/exception.py,sha256=Bk8IchNND1wg6tUX9hf4xWeEJhvA-E_zE9ysBpRZrqE,3010
-sycommon/middleware/middleware.py,sha256=5jXhCatm3nS6BpRtGBNOHu59feTwikLGC2caF9AyfpY,1329
+sycommon/middleware/middleware.py,sha256=6JCZQY8r5H50_-yN0gRf-MFGSC0NmCqKa6YkrbDvo0k,1451
 sycommon/middleware/monitor_memory.py,sha256=pYRK-wRuDd6enSg9Pf8tQxPdYQS6S0AyjyXeKFRLKEs,628
 sycommon/middleware/mq.py,sha256=4wBqiT5wJGcrfjk2GSr0_U3TStBxoNpHTzcRxVlMEHE,183
 sycommon/middleware/timeout.py,sha256=fImlAPLm4Oa8N9goXtT_0os1GZPCi9F92OgXU81DgDU,656
@@ -33,7 +34,7 @@ sycommon/models/mqlistener_config.py,sha256=PPwhAVJ2AWvVAvNox_1t0fuBKTyRH3Ui9cuu
 sycommon/models/mqmsg_model.py,sha256=cxn0M5b0utQK6crMYmL-1waeGYHvK3AlGaRy23clqTE,277
 sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6D7I,268
 sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2702
-sycommon/rabbitmq/rabbitmq_client.py,sha256=1mnccWeqBHHTPy__8kGEBX77UtAPL3_ffVoAZbbyPf4,26429
+sycommon/rabbitmq/rabbitmq_client.py,sha256=XWAzQ2A6AxTwISin2biqAzbGnN6XA9T25UX0iXdxb9s,26677
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=_NMOO4CZy-I_anMqpzfYinz-8373_rg5FM9eqzdjGyU,3598
 sycommon/rabbitmq/rabbitmq_service.py,sha256=lpYSavAwl-UOmz5gTgS3yj2ulfF-s7boL3lsMibN-JM,28881
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -46,8 +47,8 @@ sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/snowflake.py,sha256=rc-VUjBMMpdAvbnHroVwfVt1xzApJbTCthUy9mglAuw,237
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.17.dist-info/METADATA,sha256=Yz-MTXIYKGwCFWX3SRSsNQpSiPXZ3vAhsSLig9fl890,7005
-sycommon_python_lib-0.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.17.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.17.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.17.dist-info/RECORD,,
+sycommon_python_lib-0.1.19.dist-info/METADATA,sha256=F6EDuoMcntemIbJO_5BNxUs8BMq6jeLJwtJ2t9XfnR4,7005
+sycommon_python_lib-0.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.19.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.19.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.19.dist-info/RECORD,,