sycommon-python-lib 0.1.6__tar.gz → 0.1.8__tar.gz

{sycommon_python_lib-0.1.6 → sycommon_python_lib-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.6
+Version: 0.1.8
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -8,7 +8,6 @@ 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: kafka>=1.3.5
 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.6 → sycommon_python_lib-0.1.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.6"
+version = "0.1.8"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -9,7 +9,6 @@ dependencies = [
     "aiohttp>=3.12.15",
     "decorator>=5.2.1",
     "fastapi>=0.116.1",
-    "kafka>=1.3.5",
     "kafka-python>=2.2.15",
     "loguru>=0.7.3",
     "mysql-connector-python>=9.4.0",

{sycommon_python_lib-0.1.6 → sycommon_python_lib-0.1.8}/src/sycommon/middleware/traceid.py

@@ -95,7 +95,7 @@ def setup_trace_id_handler(app):
                 if "application/json" in content_type and not content_disposition.startswith("attachment"):
                     try:
                         data = json.loads(response_body)
-                        data["trace_id"] = trace_id
+                        data["traceId"] = trace_id
                         new_body = json.dumps(
                             data, ensure_ascii=False).encode()
                         response = Response(

{sycommon_python_lib-0.1.6 → sycommon_python_lib-0.1.8}/src/sycommon/synacos/feign.py

@@ -47,8 +47,6 @@ from sycommon.synacos.nacos_service import NacosService
 
 
 def feign_client(service_name: str, path_prefix: str = "", default_timeout: float | None = None):
-    # Feign风格客户端装饰器
-    """声明式HTTP客户端装饰器"""
     def decorator(cls):
         class FeignWrapper:
             def __init__(self):
@@ -66,10 +64,17 @@ def feign_client(service_name: str, path_prefix: str = "", default_timeout: floa
                     request_meta = getattr(func, "_feign_meta", {})
                     method = request_meta.get("method", "GET")
                     path = request_meta.get("path", "")
-                    headers = request_meta.get("headers", {})
+                    headers = request_meta.get(
+                        "headers", {}).copy()  # 复制 headers 避免修改原对象
 
                     timeout = kwargs.pop('timeout', self.default_timeout)
 
+                    # 处理JSON请求的Content-Type
+                    is_json_request = method.upper() in [
+                        "POST", "PUT", "PATCH"] and not request_meta.get("files")
+                    if is_json_request and "Content-Type" not in headers:
+                        headers["Content-Type"] = "application/json"
+
                     # 获取版本信息
                     version = headers.get('s-y-version')
 
@@ -94,6 +99,7 @@ def feign_client(service_name: str, path_prefix: str = "", default_timeout: floa
 
                     SYLogger.info(
                         f"nacos:调用服务: {self.service_name} -> {url}")
+                    SYLogger.info(f"nacos:请求头: {headers}")
 
                     # 构建请求
                     params = request_meta.get("params", {})
@@ -127,7 +133,7 @@ def feign_client(service_name: str, path_prefix: str = "", default_timeout: floa
                             ) as response:
                                 return await self._handle_response(response)
                         else:
-                            # 普通请求
+                            # 普通请求（JSON）
                             async with self.session.request(
                                 method=method,
                                 url=url,
@@ -163,12 +169,12 @@ def feign_client(service_name: str, path_prefix: str = "", default_timeout: floa
 
 
 def feign_request(method: str, path: str, headers: dict = None):
-    # Feign请求方法装饰器
     def decorator(func):
+        # 初始化请求元数据，确保headers是可修改的字典
         func._feign_meta = {
             "method": method.upper(),
             "path": path,
-            "headers": headers or {}
+            "headers": headers.copy() if headers else {}
         }
         return func
     return decorator
@@ -193,23 +199,23 @@ def feign_upload(field_name: str = "file"):
 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):
     """
-    feign 函数，支持 form-data 表单上传文件和其他字段，支持自定义超时时间
-
-    参数:
-        files: 字典，用于上传文件，格式: {'field_name': (filename, file_content)}
-        form_data: 字典，用于上传表单字段
-        timeout: 超时时间（秒），None 表示不设置超时
+    feign 函数，显式设置JSON请求的Content-Type头
     """
     session = aiohttp.ClientSession()
     try:
-        # 获取健康的服务实例
-        if not headers:
-            headers = {}
+        # 初始化headers，确保是可修改的字典
+        headers = headers.copy() if headers else {}
+
+        # 处理JSON请求的Content-Type
+        is_json_request = method.upper() in ["POST", "PUT", "PATCH"] and not (
+            files or form_data or file_path)
+        if is_json_request and "Content-Type" not in headers:
+            headers["Content-Type"] = "application/json"
 
         nacos_service = NacosService(None)
         version = headers.get('s-y-version')
 
-        # 使用 discover_services 方法获取服务实例列表
+        # 获取服务实例
         instances = nacos_service.get_service_instances(
             service_name, version=version)
         if not instances:
@@ -220,76 +226,63 @@ async def feign(service_name, api_path, method='GET', params=None, headers=None,
         instance = instances[int(time.time()) % len(instances)]
 
         SYLogger.info(f"nacos:开始调用服务: {service_name}")
-        SYLogger.info(
-            f"nacos:服务实例信息: IP={instance['ip']}, Port={instance['port']}")
-
-        if instance:
-            ip = instance.get('ip')
-            port = instance.get('port')
-
-            SYLogger.info(f"nacos:服务实例信息: IP={ip}, Port={port}")
-
-            # 处理 path 参数
-            if path_params:
-                for key, value in path_params.items():
-                    api_path = api_path.replace(f"{{{key}}}", str(value))
-
-            url = f"http://{ip}:{port}{api_path}"
-            SYLogger.info(f"nacos:请求地址: {url}")
-
-            try:
-                # 处理文件上传
-                if files or form_data or file_path:
-                    # 创建表单数据
-                    data = aiohttp.FormData()
-                    if form_data:
-                        for key, value in form_data.items():
-                            data.add_field(key, value)
-                    if files:
-                        for field_name, (filename, content) in files.items():
-                            data.add_field(field_name, content,
-                                           filename=filename)
-                    if file_path:
-                        filename = os.path.basename(file_path)
-                        with open(file_path, 'rb') as f:
-                            data.add_field('file', f, filename=filename)
-                    # 移除 Content-Type 头，让 aiohttp 自动设置 boundary
-                    headers.pop('Content-Type', None)
-                    # 发送表单数据
-                    async with session.request(
-                        method=method.upper(),
-                        url=url,
-                        headers=headers,
-                        params=params,
-                        data=data,
-                        timeout=timeout
-                    ) as response:
-                        return await _handle_feign_response(response)
-                else:
-                    # 普通请求
-                    if body and 'Content-Type' not in headers:
-                        headers['Content-Type'] = 'application/json'
-                    async with session.request(
-                        method=method.upper(),
-                        url=url,
-                        headers=headers,
-                        params=params,
-                        json=body,
-                        timeout=timeout
-                    ) as response:
-                        return await _handle_feign_response(response)
-            except aiohttp.ClientError as e:
-                SYLogger.error(
-                    f"nacos:请求服务接口时出错ClientError: {e}")
-                print(f"请求服务接口时出错: {e}")
-                return None
+        SYLogger.info(f"nacos:请求头: {headers}")
+
+        ip = instance.get('ip')
+        port = instance.get('port')
+
+        # 处理path参数
+        if path_params:
+            for key, value in path_params.items():
+                api_path = api_path.replace(f"{{{key}}}", str(value))
+
+        url = f"http://{ip}:{port}{api_path}"
+        SYLogger.info(f"nacos:请求地址: {url}")
+
+        try:
+            # 处理文件上传
+            if files or form_data or file_path:
+                data = aiohttp.FormData()
+                if form_data:
+                    for key, value in form_data.items():
+                        data.add_field(key, value)
+                if files:
+                    for field_name, (filename, content) in files.items():
+                        data.add_field(field_name, content, filename=filename)
+                if file_path:
+                    filename = os.path.basename(file_path)
+                    with open(file_path, 'rb') as f:
+                        data.add_field('file', f, filename=filename)
+                # 移除Content-Type，让aiohttp自动处理
+                headers.pop('Content-Type', None)
+                async with session.request(
+                    method=method.upper(),
+                    url=url,
+                    headers=headers,
+                    params=params,
+                    data=data,
+                    timeout=timeout
+                ) as response:
+                    return await _handle_feign_response(response)
+            else:
+                # 普通JSON请求
+                async with session.request(
+                    method=method.upper(),
+                    url=url,
+                    headers=headers,
+                    params=params,
+                    json=body,
+                    timeout=timeout
+                ) as response:
+                    return await _handle_feign_response(response)
+        except aiohttp.ClientError as e:
+            SYLogger.error(f"nacos:请求服务接口时出错ClientError: {e}")
+            return None
     except Exception as e:
         import traceback
         SYLogger.error(f"nacos:请求服务接口时出错: {traceback.format_exc()}")
-        print(f"nacos:请求服务接口时出错: {traceback.format_exc()}")
         return None
     finally:
-        SYLogger.info(f"nacos:结束调用服务: {service_name}， {api_path}")
         await session.close()
 
 
@@ -300,12 +293,9 @@ async def _handle_feign_response(response):
         if 'application/json' in content_type:
             return await response.json()
         else:
-            # 如果是文件流，将其封装成 io.BytesIO 对象返回
             content = await response.read()
             return io.BytesIO(content)
     else:
-        print(
-            f"nacos:请求失败，状态码: {response.status}，响应内容: {await response.text()}")
-        SYLogger.error(
-            f"nacos:请求服务接口时出错: {response.status}, 响应内容: {await response.text()}")
+        error_msg = await response.text()
+        SYLogger.error(f"nacos:请求失败，状态码: {response.status}，响应内容: {error_msg}")
         return None

{sycommon_python_lib-0.1.6 → sycommon_python_lib-0.1.8}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.6
+Version: 0.1.8
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -8,7 +8,6 @@ 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: kafka>=1.3.5
 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.6 → sycommon_python_lib-0.1.8}/src/sycommon_python_lib.egg-info/requires.txt

@@ -2,7 +2,6 @@ aio-pika>=9.5.7
 aiohttp>=3.12.15
 decorator>=5.2.1
 fastapi>=0.116.1
-kafka>=1.3.5
 kafka-python>=2.2.15
 loguru>=0.7.3
 mysql-connector-python>=9.4.0