sycommon-python-lib 0.2.1a14__tar.gz → 0.2.1a16__tar.gz

{sycommon_python_lib-0.2.1a14 → sycommon_python_lib-0.2.1a16}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.1a14
+Version: 0.2.1a16
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aio-pika>=9.6.1
+Requires-Dist: aio-pika>=9.6.2
 Requires-Dist: aiohttp>=3.13.3
 Requires-Dist: aiomysql>=0.3.2
 Requires-Dist: anyio>=4.12.1
@@ -30,7 +30,7 @@ Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: redis>=7.3.0
 Requires-Dist: sentry-sdk[fastapi]>=2.55.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.48
-Requires-Dist: starlette>=0.52.1
+Requires-Dist: starlette[full]>=1.0.0
 Requires-Dist: tiktoken>=0.12.0
 Requires-Dist: uvicorn>=0.42.0
 

{sycommon_python_lib-0.2.1a14 → sycommon_python_lib-0.2.1a16}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.1a14"
+version = "0.2.1a16"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "aio-pika>=9.6.1",
+    "aio-pika>=9.6.2",
     "aiohttp>=3.13.3",
     "aiomysql>=0.3.2",
     "anyio>=4.12.1",
@@ -31,7 +31,7 @@ dependencies = [
     "redis>=7.3.0",
     "sentry-sdk[fastapi]>=2.55.0",
     "sqlalchemy[asyncio]>=2.0.48",
-    "starlette>=0.52.1",
+    "starlette[full]>=1.0.0",
     "tiktoken>=0.12.0",
     "uvicorn>=0.42.0",
 ]

{sycommon_python_lib-0.2.1a14 → sycommon_python_lib-0.2.1a16}/src/sycommon/synacos/feign.py

@@ -92,7 +92,39 @@ atexit.register(_sync_close_feign_sessions)
 
 
 async def feign(service_name, api_path, method='GET', params=None, headers=None, file_path=None,
-                path_params=None, body=None, files=None, form_data=None, timeout=None):
+                path_params=None, body=None, files=None, form_data=None, timeout=None, max_retries=3):
+    """
+    feign 函数，显式设置JSON请求的Content-Type头
+    注意：此函数使用全局Session实现连接复用，适用于简单场景
+    推荐使用 @feign_client 装饰器获得更好的类型支持和参数管理
+
+    Args:
+        max_retries: 最大重试次数（针对网络中断等临时错误），默认3次
+    """
+    for attempt in range(max_retries):
+        try:
+            return await _feign_internal(
+                service_name, api_path, method, params, headers, file_path,
+                path_params, body, files, form_data, timeout
+            )
+        except aiohttp.ClientPayloadError as e:
+            if attempt < max_retries - 1:
+                SYLogger.warning(
+                    f"nacos:请求中断，准备重试 {attempt + 2}/{max_retries} server: {service_name} path: {api_path}")
+                await asyncio.sleep(1)  # 等待1秒后重试
+            else:
+                SYLogger.error(
+                    f"nacos:请求失败，已重试{max_retries}次 server: {service_name} path: {api_path} error:{e}")
+                return None
+        except Exception as e:
+            # 非payload错误直接抛出，由内部处理
+            raise
+
+    return None
+
+
+async def _feign_internal(service_name, api_path, method='GET', params=None, headers=None, file_path=None,
+                          path_params=None, body=None, files=None, form_data=None, timeout=None):
     """
     feign 函数，显式设置JSON请求的Content-Type头
     注意：此函数使用全局Session实现连接复用，适用于简单场景
@@ -195,6 +227,9 @@ async def feign(service_name, api_path, method='GET', params=None, headers=None,
                 timeout=timeout
             ) as response:
                 return await _handle_feign_response(response, service_name, api_path)
+    except aiohttp.ClientPayloadError:
+        # 载荷传输错误（如连接中断），抛出让外层重试
+        raise
     except aiohttp.ClientError as e:
         SYLogger.error(
             f"nacos:请求服务接口时出错ClientError server: {service_name} path: {api_path} error:{e}")
@@ -232,10 +267,17 @@ async def _handle_feign_response(response, service_name: str, api_path: str):
                     response_body = await response.text(encoding='gbk')
             else:
                 # 其他类型（PDF、图片、octet-stream等）：按文件流（二进制）读取
-                binary_data = await response.read()
+                # 使用流式读取，避免大文件内存溢出
+                buffer = io.BytesIO()
+                total_size = 0
+                chunk_size = 64 * 1024  # 64KB chunks
+                async for chunk in response.content.iter_chunked(chunk_size):
+                    buffer.write(chunk)
+                    total_size += len(chunk)
+                buffer.seek(0)  # 重置指针到开头
                 SYLogger.info(
-                    f"按文件流处理响应，类型：{content_type}，大小：{len(binary_data)/1024:.2f}KB")
-                return io.BytesIO(binary_data)  # 返回BytesIO，支持read()
+                    f"按文件流处理响应，类型：{content_type}，大小：{total_size/1024:.2f}KB")
+                return buffer  # 返回BytesIO，支持read()
             return response_body
         else:
             # 非200状态：统一读取响应体（兼容文本/二进制错误信息）
@@ -257,6 +299,9 @@ async def _handle_feign_response(response, service_name: str, api_path: str):
                 "data": response_body
             }
 
+    except aiohttp.ClientPayloadError:
+        # 载荷传输错误（如连接中断），抛出让外层重试
+        raise
     except Exception as e:
         import traceback
         error_detail = f"处理响应异常: {str(e)}\n{traceback.format_exc()}"

{sycommon_python_lib-0.2.1a14 → sycommon_python_lib-0.2.1a16}/src/sycommon/synacos/feign_client.py

@@ -101,7 +101,8 @@ def feign_client(
     service_name: str,
     path_prefix: str = "",
     default_timeout: Optional[float] = None,
-    default_headers: Optional[Dict[str, str]] = None
+    default_headers: Optional[Dict[str, str]] = None,
+    max_retries: int = 3
 ):
     default_headers = default_headers or {}
     default_headers = {k.lower(): v for k, v in default_headers.items()}
@@ -117,6 +118,7 @@ def feign_client(
                 self.default_headers = {
                     k.lower(): v for k, v in default_headers.copy().items()}
                 self.nacos_manager: Optional[NacosService] = None
+                self.max_retries = max_retries
 
             def __getattr__(self, name: str):
                 if not hasattr(cls, name):
@@ -166,20 +168,36 @@ def feign_client(
                         method, param_meta, bound_args, is_upload, method_headers
                     )
 
-                    async with session.request(
-                        method=method,
-                        url=url,
-                        headers=headers,
-                        params=query_params,
-                        cookies=cookies,
-                        json=request_data if not (is_upload or isinstance(
-                            request_data, aiohttp.FormData)) else None,
-                        data=request_data if is_upload or isinstance(
-                            request_data, aiohttp.FormData) else None,
-                        timeout=timeout
-                    ) as response:
-                        # 处理响应（支持 Pydantic 模型解析）
-                        return await self._handle_response(response, resp_model)
+                    # 添加重试机制
+                    last_error = None
+                    for attempt in range(self.max_retries):
+                        try:
+                            async with session.request(
+                                method=method,
+                                url=url,
+                                headers=headers,
+                                params=query_params,
+                                cookies=cookies,
+                                json=request_data if not (is_upload or isinstance(
+                                    request_data, aiohttp.FormData)) else None,
+                                data=request_data if is_upload or isinstance(
+                                    request_data, aiohttp.FormData) else None,
+                                timeout=timeout
+                            ) as response:
+                                # 处理响应（支持 Pydantic 模型解析）
+                                return await self._handle_response(response, resp_model)
+                        except aiohttp.ClientPayloadError as e:
+                            last_error = e
+                            if attempt < self.max_retries - 1:
+                                SYLogger.warning(
+                                    f"请求中断，准备重试 {attempt + 2}/{self.max_retries} url: {url}")
+                                await asyncio.sleep(1)  # 等待1秒后重试
+                            else:
+                                SYLogger.error(
+                                    f"请求失败，已重试{self.max_retries}次 url: {url} error:{e}")
+                                raise
+
+                    raise last_error
 
                 return wrapper
 
@@ -368,7 +386,14 @@ def feign_client(
                             return resp_model(** json_data)  # 用响应数据初始化模型
                         return json_data
                     else:
-                        return io.BytesIO(await response.read())
+                        # 流式读取文件，避免大文件内存溢出
+                        buffer = io.BytesIO()
+                        total_size = 0
+                        async for chunk in response.content.iter_chunked(64 * 1024):
+                            buffer.write(chunk)
+                            total_size += len(chunk)
+                        buffer.seek(0)
+                        return buffer
                 else:
                     error_msg = await response.text()
                     SYLogger.error(f"请求失败 [{status}]: {error_msg}")

{sycommon_python_lib-0.2.1a14 → sycommon_python_lib-0.2.1a16}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.1a14
+Version: 0.2.1a16
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aio-pika>=9.6.1
+Requires-Dist: aio-pika>=9.6.2
 Requires-Dist: aiohttp>=3.13.3
 Requires-Dist: aiomysql>=0.3.2
 Requires-Dist: anyio>=4.12.1
@@ -30,7 +30,7 @@ Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: redis>=7.3.0
 Requires-Dist: sentry-sdk[fastapi]>=2.55.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.48
-Requires-Dist: starlette>=0.52.1
+Requires-Dist: starlette[full]>=1.0.0
 Requires-Dist: tiktoken>=0.12.0
 Requires-Dist: uvicorn>=0.42.0
 

{sycommon_python_lib-0.2.1a14 → sycommon_python_lib-0.2.1a16}/src/sycommon_python_lib.egg-info/requires.txt

@@ -1,4 +1,4 @@
-aio-pika>=9.6.1
+aio-pika>=9.6.2
 aiohttp>=3.13.3
 aiomysql>=0.3.2
 anyio>=4.12.1
@@ -24,6 +24,6 @@ pyyaml>=6.0.3
 redis>=7.3.0
 sentry-sdk[fastapi]>=2.55.0
 sqlalchemy[asyncio]>=2.0.48
-starlette>=0.52.1
+starlette[full]>=1.0.0
 tiktoken>=0.12.0
 uvicorn>=0.42.0