fiuai-sdk-python 0.6.7__py3-none-any.whl → 0.6.9__py3-none-any.whl

fiuai_sdk_python/__init__.py

@@ -3,11 +3,12 @@ from .util import init_fiuai
 from .profile import UserProfileInfo
 from .type import UserProfile
 from .context import (
-    RequestContext, 
+    RequestContext,
     get_current_headers,
     validate_current_context,
     get_current_missing_fields,
-    is_current_context_valid
+    is_current_context_valid,
+    get_trace_id,
 )
 
 __version__ = "0.6.5"
@@ -22,5 +23,6 @@ __all__ = [
     'get_current_headers',
     'validate_current_context',
     'get_current_missing_fields',
-    'is_current_context_valid'
-    ]
+    'is_current_context_valid',
+    'get_trace_id',
+]

fiuai_sdk_python/auth/__init__.py

@@ -1,19 +1,20 @@
 from .header import parse_auth_headers, extract_auth_from_request
 from .type import AuthData, AuthHeader
 from .helper import (
-    get_auth_data,
+    get_auth_data as get_auth_data_from_request,
     get_current_user_id,
     get_current_tenant_id,
     get_current_company,
     get_company_unique_no,
     get_impersonation,
-    is_impersonating
+    is_impersonating,
 )
 from .context_mgr import (
     ContextManager,
     init_context,
     WorldData,
     get_auth_data_from_context,
+    get_auth_data,
     set_auth_data,
     update_auth_data,
     get_world_data,
@@ -24,7 +25,9 @@ __all__ = [
     "extract_auth_from_request",
     "AuthData",
     "AuthHeader",
+    "get_auth_data_from_request",
     "get_auth_data",
+    "get_auth_data_from_context",
     "get_current_user_id",
     "get_current_tenant_id",
     "get_current_company",
@@ -34,7 +37,6 @@ __all__ = [
     "ContextManager",
     "init_context",
     "WorldData",
-    "get_auth_data_from_context",
     "set_auth_data",
     "update_auth_data",
     "get_world_data",

fiuai_sdk_python/auth/context_mgr.py

@@ -171,6 +171,15 @@ def get_auth_data_from_context() -> Optional[AuthData]:
         return None
 
 
+def get_auth_data() -> Optional[AuthData]:
+    """
+    从当前上下文获取认证数据（无参）。
+    与 get_auth_data_from_context() 行为一致，供业务方统一使用无参 get_auth_data()。
+    上下文无效或不存在时返回 None。
+    """
+    return get_auth_data_from_context()
+
+
 def set_auth_data(auth_data: AuthData) -> bool:
     """设置当前上下文中的认证数据。需在 init_context 的 with 块内使用。"""
     global _current_context_manager

fiuai_sdk_python/context.py

@@ -222,6 +222,22 @@ def is_current_context_valid(required_fields: list = None) -> bool:
     return is_valid
 
 
+def get_trace_id(default: str = "") -> str:
+    """
+    从当前上下文获取 trace_id。
+
+    Args:
+        default: 无上下文或无 x-fiuai-trace-id 时的返回值，默认为 ""。
+
+    Returns:
+        str: x-fiuai-trace-id 的值，否则返回 default。
+    """
+    headers = get_current_headers()
+    if not headers:
+        return default
+    return headers.get("x-fiuai-trace-id") or default
+
+
 def extract_auth_headers_from_context(
     username: str,
     auth_tenant_id: str,

fiuai_sdk_python/utils/logger.py

@@ -8,49 +8,78 @@
 import logging
 import os
 import sys
+from typing import Any, Callable, Dict, Optional
 
 
+def _make_context_filter(
+    context_injector: Optional[Callable[[], Optional[Dict[str, Any]]]],
+) -> logging.Filter:
+    """根据 context_injector 构建过滤器：非 None 时注入返回值到 record，否则仅设置默认 trace_id。"""
+
+    class _InjectorFilter(logging.Filter):
+        def __init__(self, injector: Optional[Callable[[], Optional[Dict[str, Any]]]]) -> None:
+            super().__init__()
+            self._injector = injector
+
+        def filter(self, record: logging.LogRecord) -> bool:
+            if self._injector is not None:
+                try:
+                    ctx = self._injector()
+                    if ctx:
+                        for k, v in ctx.items():
+                            setattr(record, k, v)
+                except Exception:
+                    pass
+            if not getattr(record, "trace_id", None):
+                record.trace_id = "-"
+            return True
+
+    return _InjectorFilter(context_injector)
 
 
 def init_logger(
     log_path: str = "logs/",
     log_level: str = "INFO",
     json_log: bool = False,
-    caller: bool = True
+    caller: bool = True,
+    context_injector: Optional[Callable[[], Optional[Dict[str, Any]]]] = None,
 ):
     """初始化日志配置
-    
+
     Args:
         log_path: 日志文件路径
         log_level: 日志级别
         json_log: 是否使用JSON格式日志
         caller: 是否显示调用者信息
+        context_injector: 可选，无参可调用对象，返回 dict（如 {"trace_id": "xxx"}），
+            非 None 时会将返回的键值注入到每条日志记录中。
     """
     # 创建日志目录
     if log_path and not os.path.exists(log_path):
         os.makedirs(log_path)
-    
+
     # 设置日志级别
     level = getattr(logging, log_level.upper(), logging.INFO)
-    
+
     # 获取根日志记录器
     root_logger = logging.getLogger()
-    
+
     # 设置根日志记录器的级别
     root_logger.setLevel(level)
-    
+
     # 清除现有的处理器（避免重复添加）
     root_logger.handlers.clear()
-    
+
+    context_filter = _make_context_filter(context_injector)
+    log_format = '%(asctime)s - %(name)s - %(levelname)s - [trace_id:%(trace_id)s] - %(message)s'
+
     # 配置控制台处理器
     console_handler = logging.StreamHandler(sys.stdout)
     console_handler.setLevel(level)
-    # 添加 event_id 和 task_id 到日志格式中
-    log_format = '%(asctime)s - %(name)s - %(levelname)s - [trace_id:%(trace_id)s] - %(message)s'
     console_handler.setFormatter(logging.Formatter(log_format))
-    # 添加上下文过滤器
+    console_handler.addFilter(context_filter)
     root_logger.addHandler(console_handler)
-    
+
     # 如果指定了日志文件路径，添加文件处理器
     if log_path:
         file_handler = logging.FileHandler(
@@ -58,13 +87,11 @@ def init_logger(
             encoding='utf-8'
         )
         file_handler.setLevel(level)
-        # 添加 event_id 和 task_id 到日志格式中
         file_handler.setFormatter(logging.Formatter(log_format))
-        # 添加上下文过滤器
+        file_handler.addFilter(context_filter)
         root_logger.addHandler(file_handler)
-    
+
     # 过滤第三方库的日志，只显示 ERROR 及以上级别
-    # 这样可以减少不必要的 INFO、DEBUG 和 WARNING 日志输出
     third_party_loggers = [
         'nebula3.logger',
         'nebula3',
@@ -77,21 +104,13 @@ def init_logger(
         third_party_logger.setLevel(logging.ERROR)
 
 
-# 全局过滤器实例
-
-
 def get_logger(name: str) -> logging.Logger:
     """获取日志记录器
-    
-    自动添加 ContextFilter，从上下文中获取 event_id 和 task_id 并记录到日志中
-    
+
     Args:
         name: 日志记录器名称
-        
+
     Returns:
         logging.Logger: 日志记录器实例
     """
-    logger = logging.getLogger(name)
-    
-    
-    return logger
+    return logging.getLogger(name)

{fiuai_sdk_python-0.6.7.dist-info → fiuai_sdk_python-0.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiuai_sdk_python
-Version: 0.6.7
+Version: 0.6.9
 Summary: FiuAI Python SDK - 企业级AI服务集成开发工具包
 Project-URL: Homepage, https://github.com/fiuai/fiuai-sdk-python
 Project-URL: Documentation, https://github.com/fiuai/fiuai-sdk-python#readme

{fiuai_sdk_python-0.6.7.dist-info → fiuai_sdk_python-0.6.9.dist-info}/RECORD

@@ -1,10 +1,10 @@
-fiuai_sdk_python/__init__.py,sha256=WWAL1xTmdB8EKGatITf6wBKtCmbvBCDGhppOYt_8ZuU,581
+fiuai_sdk_python/__init__.py,sha256=oJKn3ZflK4ysURBCP4rWJBq7ArEnod6bMaBaWrgHd9A,616
 fiuai_sdk_python/bank.py,sha256=GRAmkI33rRZw9UE67SpkYsqPN-kdLm-iuJuuBLxSvrE,5438
 fiuai_sdk_python/client.py,sha256=AGc8iqXaHOYUsAPDekV8dYZL6OFgERufR7FvAZscW8g,19087
 fiuai_sdk_python/company.py,sha256=ZELOAxCTIA-F9cUWakvq7hv6SflM19Rq3XMDkV0mtbg,4771
 fiuai_sdk_python/config.py,sha256=vCD-aW2Y9OpJitfTDB3Acjw_PCurYT69vQjZ_wY950I,825
 fiuai_sdk_python/const.py,sha256=fPoUeOJ4WPymEQqarA7cJE3bmdz5fCPq2PtYvzZJ4Tk,346
-fiuai_sdk_python/context.py,sha256=uVUFvk9cjyZDzOaGjPK5j3f_426HDN_xBiQQ8GJCQ-s,9607
+fiuai_sdk_python/context.py,sha256=poW6yWHyuFh-W9GnUJXRzHVRv8NtNpxyqi-L1JJPfnY,10018
 fiuai_sdk_python/datatype.py,sha256=WQjsoJgpkkw0GtAQLzTrsem4joT8e3cnhcfy3dKN0bA,8919
 fiuai_sdk_python/doctype.py,sha256=5o6WsZDeKuCWfTiQa0H_BNh4jb96EpZt9WaDh8TgKZo,5013
 fiuai_sdk_python/error.py,sha256=YYsqP39vY8N7wWD4ervsx7ngcdXIMR59Wc4A4h4Rb-k,235
@@ -15,8 +15,8 @@ fiuai_sdk_python/resp.py,sha256=4twCxmwqe2e1vlhfFnu-5_FR8PwQiveB9njY3exaQ88,1018
 fiuai_sdk_python/setup.py,sha256=ER0IPAouHhrVSzG0Iu87Ky0R5c4kCgOF77kRAOO-1MI,8025
 fiuai_sdk_python/type.py,sha256=vinZKflNvmQNhqO5mDARAE6O133k0LiR1s1ZvexN_q4,28940
 fiuai_sdk_python/util.py,sha256=x3TkNsC8_nzA-8x6ndIGrIpE9sRKpn3vlxnj2Hqpxwo,2326
-fiuai_sdk_python/auth/__init__.py,sha256=fcb8EwuKP341XJaYLlM8heMHLIctA6H_hbkakbUfrkg,920
-fiuai_sdk_python/auth/context_mgr.py,sha256=s5h80Xky1YIWiMKasH3IJ62niolWBLLaJ8CIsExvkY0,8871
+fiuai_sdk_python/auth/__init__.py,sha256=AK1OQQJvX7tdzjOybt2UOcGABdXJzddWc49PHZeqxLY,1004
+fiuai_sdk_python/auth/context_mgr.py,sha256=Wl7Q0YCw0VKiPrYkPZXoBHJM6d0t8kkPOCFxxJv1O_A,9179
 fiuai_sdk_python/auth/header.py,sha256=JoMT6OJQUU7laGP6235kolfG-Qy_AP6ZQQQ9Ca8U88c,3606
 fiuai_sdk_python/auth/helper.py,sha256=GeuRwOZivtIsAo4_XBt0PDDbOLntF2uxSrO9mPvVMBs,5014
 fiuai_sdk_python/auth/type.py,sha256=lPUgbSOW-mQfOZpxPGhwDmpbKr5UfjznEuSKGwDosxY,2233
@@ -34,9 +34,9 @@ fiuai_sdk_python/pkg/vector/__init__.py,sha256=fvbetFxbHiFeojnTfKT3roA1hOcoNHF_e
 fiuai_sdk_python/pkg/vector/vector.py,sha256=gC8CQTZm56zXbhM3g_hFa7SGtAo9D1atNs3HwuEbJHQ,28994
 fiuai_sdk_python/utils/__init__.py,sha256=UwwsvqBsaRCHbWdx-wvM48szT3j50h95k9MZdbfawRQ,72
 fiuai_sdk_python/utils/ids.py,sha256=ZDtEqt_Woth8ytPB2tdnnTIv7noWr8XYhSsUvkZ7Hc0,6448
-fiuai_sdk_python/utils/logger.py,sha256=OcH8l7nQdLOtsZW5s4lBkd6kxPK7oIWF6KdGazQIzzc,2675
+fiuai_sdk_python/utils/logger.py,sha256=RuKn9TFmV1IfsRTV3ZdtXLZkM44GkHs32ehbJdrdu-8,3657
 fiuai_sdk_python/utils/text.py,sha256=bnob_W0nj_Vj8Hp93B0cYmFOY8IhUWF0C8UedOYCNvs,1667
-fiuai_sdk_python-0.6.7.dist-info/METADATA,sha256=F-yN6GFq3Aa4BibEspDm0iDd5r5zZ8QupcP4JurTekA,1523
-fiuai_sdk_python-0.6.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-fiuai_sdk_python-0.6.7.dist-info/licenses/LICENSE,sha256=PFMF0dFErrBFqU-rryEby0yW8GBagYqrdbyZQHMUCJg,1062
-fiuai_sdk_python-0.6.7.dist-info/RECORD,,
+fiuai_sdk_python-0.6.9.dist-info/METADATA,sha256=ZKbU-s_9nobP_2kNJVR2e6vZfVJ9wKbCROabQfDdojQ,1523
+fiuai_sdk_python-0.6.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fiuai_sdk_python-0.6.9.dist-info/licenses/LICENSE,sha256=PFMF0dFErrBFqU-rryEby0yW8GBagYqrdbyZQHMUCJg,1062
+fiuai_sdk_python-0.6.9.dist-info/RECORD,,