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

fiuai_sdk_python/auth/__init__.py

@@ -1,7 +1,7 @@
 from .header import parse_auth_headers, extract_auth_from_request
 from .type import AuthData, AuthHeader
 from .helper import (
-    get_auth_data as get_auth_data_from_request,
+    get_auth_data,
     get_current_user_id,
     get_current_tenant_id,
     get_current_company,
@@ -14,19 +14,23 @@ from .context_mgr import (
     init_context,
     WorldData,
     get_auth_data_from_context,
-    get_auth_data,
     set_auth_data,
     update_auth_data,
     get_world_data,
+    set_user_profile_info,
+    get_user_profile_info,
 )
 
+# 兼容旧用法：从 request 取 auth 时可用 get_auth_data(request) 或 get_auth_data_from_request(request)
+get_auth_data_from_request = get_auth_data
+
 __all__ = [
     "parse_auth_headers",
     "extract_auth_from_request",
     "AuthData",
     "AuthHeader",
-    "get_auth_data_from_request",
     "get_auth_data",
+    "get_auth_data_from_request",
     "get_auth_data_from_context",
     "get_current_user_id",
     "get_current_tenant_id",
@@ -40,4 +44,6 @@ __all__ = [
     "set_auth_data",
     "update_auth_data",
     "get_world_data",
+    "set_user_profile_info",
+    "get_user_profile_info",
 ]

fiuai_sdk_python/auth/context_mgr.py

@@ -8,8 +8,10 @@
 """
 上下文管理：ContextManager、init_context、WorldData，
 以及从当前上下文获取/设置认证数据的 get_auth_data_from_context、set_auth_data、update_auth_data、get_world_data。
+可选：user_profile_info 的 set_user_profile_info / get_user_profile_info（请求级存储，不影响未使用的调用方）。
 """
 
+import contextvars
 import uuid
 import logging
 from typing import Dict, Any, Optional
@@ -24,6 +26,11 @@ logger = logging.getLogger(__name__)
 
 _current_context_manager: Optional["ContextManager"] = None
 
+# 可选：请求级 UserProfileInfo，仅当调用方 set 时存在，不 set 则 get 为 None
+_user_profile_info: contextvars.ContextVar[Optional[Any]] = contextvars.ContextVar(
+    "user_profile_info", default=None
+)
+
 
 class WorldData(BaseModel):
     """World 上下文数据模型"""
@@ -49,6 +56,7 @@ class ContextManager:
         world_data: Optional[WorldData] = None,
         event_id: Optional[str] = None,
         task_id: Optional[str] = None,
+        user_profile_info: Optional[Any] = None,
     ):
         if auth_data and headers:
             raise ValueError("不能同时提供 auth_data 和 headers，请只提供其中一个")
@@ -60,6 +68,9 @@ class ContextManager:
         else:
             self.world_data = WorldData()
 
+        self._user_profile_info = user_profile_info
+        self._user_profile_info_token: Optional[contextvars.Token] = None
+
         if auth_data:
             self._context = self._create_context_from_auth_data(auth_data)
         elif headers:
@@ -87,10 +98,15 @@ class ContextManager:
         global _current_context_manager
         _current_context_manager = self
         self._context.__enter__()
+        if self._user_profile_info is not None:
+            self._user_profile_info_token = _user_profile_info.set(self._user_profile_info)
         logger.debug("Context initialized")
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
+        if self._user_profile_info_token is not None:
+            _user_profile_info.reset(self._user_profile_info_token)
+            self._user_profile_info_token = None
         self._context.__exit__(exc_type, exc_val, exc_tb)
         global _current_context_manager
         _current_context_manager = None
@@ -124,17 +140,32 @@ def init_context(
     world_data: Optional[WorldData] = None,
     event_id: Optional[str] = None,
     task_id: Optional[str] = None,
+    user_profile_info: Optional[Any] = None,
     **kwargs: Any,
 ) -> ContextManager:
     """
     初始化上下文，用于后台任务。返回的 ContextManager 必须在 `with` 语句中使用。
 
     支持三种方式：1) auth_data 对象  2) headers 字典  3) user_id, auth_tenant_id, current_company。
+    trace_id 可从 auth_data.trace_id 或 kwargs["trace_id"]（仅方式 3）传入。
+    可选 user_profile_info：在 with 块内 get_user_profile_info() 可读。
     """
     if auth_data:
-        return ContextManager(auth_data=auth_data, world_data=world_data, event_id=event_id, task_id=task_id)
+        return ContextManager(
+            auth_data=auth_data,
+            world_data=world_data,
+            event_id=event_id,
+            task_id=task_id,
+            user_profile_info=user_profile_info,
+        )
     if headers:
-        return ContextManager(headers=headers, world_data=world_data, event_id=event_id, task_id=task_id)
+        return ContextManager(
+            headers=headers,
+            world_data=world_data,
+            event_id=event_id,
+            task_id=task_id,
+            user_profile_info=user_profile_info,
+        )
     if user_id and auth_tenant_id and current_company:
         auth_data = AuthData(
             user_id=user_id,
@@ -146,7 +177,13 @@ def init_context(
             client=kwargs.get("client", "unknown"),
             channel=kwargs.get("channel", "default"),
         )
-        return ContextManager(auth_data=auth_data, world_data=world_data, event_id=event_id, task_id=task_id)
+        return ContextManager(
+            auth_data=auth_data,
+            world_data=world_data,
+            event_id=event_id,
+            task_id=task_id,
+            user_profile_info=user_profile_info,
+        )
     raise ValueError(
         "必须提供以下之一："
         "1. auth_data 对象 "
@@ -235,3 +272,20 @@ def get_world_data() -> Optional[WorldData]:
     except Exception as e:
         logger.warning("Failed to get world data: %s", e)
         return None
+
+
+def set_user_profile_info(profile: Optional[Any]) -> None:
+    """
+    设置当前请求/上下文内的可选 UserProfileInfo。
+    仅当需要 profile 时调用；不调用则 get_user_profile_info() 为 None，不影响其他使用者。
+    在 HTTP 请求内由业务在 set_user_context 等入口调用；在 with init_context(...) 内也可通过 init_context(..., user_profile_info=...) 传入。
+    """
+    _user_profile_info.set(profile)
+
+
+def get_user_profile_info() -> Optional[Any]:
+    """
+    获取当前请求/上下文内的可选 UserProfileInfo。
+    未设置时返回 None；类型由调用方约定（如 profile.UserProfileInfo 或 dict）。
+    """
+    return _user_profile_info.get()

fiuai_sdk_python/auth/helper.py

@@ -8,172 +8,122 @@
 from fastapi import Request, HTTPException
 from typing import Optional, Union, Dict, Literal
 from .type import AuthData
+from .context_mgr import get_auth_data as get_auth_data_from_context
 
 
 def get_auth_data(
-    request: Union[Request, Dict[str, str]], 
-    engine: Literal["fastapi", "dict"] = "fastapi"
-) -> AuthData:
-    """
-    从请求中获取认证数据
-    
-    Args:
-        request: FastAPI Request 对象或包含认证数据的字典
-        engine: 请求引擎类型，默认为 "fastapi"
-        
-    Returns:
-        AuthData: 认证数据
-        
-    Raises:
-        HTTPException: 当认证数据不存在时抛出 401 错误（仅限 FastAPI）
-        ValueError: 当使用 dict 引擎且认证数据不存在时
+    request: Optional[Union[Request, Dict[str, str]]] = None,
+    engine: Literal["fastapi", "dict"] = "fastapi",
+) -> Optional[AuthData]:
     """
+    从请求或当前上下文中获取认证数据。
+    request 为 None 时从当前 RequestContext 解析（FiuaiContextMiddleware + AuthMiddleware 或 init_context 内可用），无上下文时返回 None。
+    传入 request 时从 request 取，不存在时抛 HTTPException/ValueError。
+    """
+    if request is None:
+        return get_auth_data_from_context()
     if engine == "fastapi":
         if not isinstance(request, Request):
-            raise TypeError("request must be a FastAPI Request object when engine='fastapi'")
-        auth_data = getattr(request.state, 'auth_data', None)
+            raise TypeError(
+                "request must be a FastAPI Request object when engine='fastapi'"
+            )
+        auth_data = getattr(request.state, "auth_data", None)
         if not auth_data:
             raise HTTPException(
                 status_code=401,
                 detail={
                     "error": "Unauthorized",
                     "message": "Authentication data not found",
-                    "code": "AUTH_NOT_FOUND"
-                }
+                    "code": "AUTH_NOT_FOUND",
+                },
             )
         return auth_data
-    elif engine == "dict":
+    if engine == "dict":
         if not isinstance(request, dict):
             raise TypeError("request must be a dict when engine='dict'")
-        auth_data = request.get('auth_data')
+        auth_data = request.get("auth_data")
         if not auth_data:
             raise ValueError("Authentication data not found in request dict")
         return auth_data
-    else:
-        raise ValueError("engine must be either 'fastapi' or 'dict'")
+    raise ValueError("engine must be either 'fastapi' or 'dict'")
 
 
 def get_current_user_id(
-    request: Union[Request, Dict[str, str]], 
-    engine: Literal["fastapi", "dict"] = "fastapi"
-) -> str:
-    """
-    获取当前用户ID
-    
-    Args:
-        request: FastAPI Request 对象或包含认证数据的字典
-        engine: 请求引擎类型，默认为 "fastapi"
-        
-    Returns:
-        str: 用户ID
+    request: Optional[Union[Request, Dict[str, str]]] = None,
+    engine: Literal["fastapi", "dict"] = "fastapi",
+) -> Optional[str]:
+    """
+    获取当前用户ID。request 为 None 时从当前上下文取；无上下文或未认证时返回 None。
     """
     auth_data = get_auth_data(request, engine)
-    return auth_data.user_id
+    return auth_data.user_id if auth_data else None
 
 
 def get_current_tenant_id(
-    request: Union[Request, Dict[str, str]], 
-    engine: Literal["fastapi", "dict"] = "fastapi"
-) -> str:
-    """
-    获取当前租户ID
-    
-    Args:
-        request: FastAPI Request 对象或包含认证数据的字典
-        engine: 请求引擎类型，默认为 "fastapi"
-        
-    Returns:
-        str: 租户ID
+    request: Optional[Union[Request, Dict[str, str]]] = None,
+    engine: Literal["fastapi", "dict"] = "fastapi",
+) -> Optional[str]:
+    """
+    获取当前租户ID。request 为 None 时从当前上下文取；无上下文或未认证时返回 None。
     """
     auth_data = get_auth_data(request, engine)
-    return auth_data.auth_tenant_id
+    return auth_data.auth_tenant_id if auth_data else None
 
 
 def get_current_company(
-    request: Union[Request, Dict[str, str]], 
-    engine: Literal["fastapi", "dict"] = "fastapi"
-) -> str:
-    """
-    获取当前公司ID
-    
-    Args:
-        request: FastAPI Request 对象或包含认证数据的字典
-        engine: 请求引擎类型，默认为 "fastapi"
-        
-    Returns:
-        str: 公司ID
+    request: Optional[Union[Request, Dict[str, str]]] = None,
+    engine: Literal["fastapi", "dict"] = "fastapi",
+) -> Optional[str]:
+    """
+    获取当前公司ID。request 为 None 时从当前上下文取；无上下文或未认证时返回 None。
     """
     auth_data = get_auth_data(request, engine)
-    return auth_data.current_company
+    return auth_data.current_company if auth_data else None
 
 
 def get_company_unique_no(
-    request: Union[Request, Dict[str, str]], 
-    engine: Literal["fastapi", "dict"] = "fastapi"
-) -> str:
-    """
-    获取当前公司唯一编号
-    
-    Args:
-        request: FastAPI Request 对象或包含认证数据的字典
-        engine: 请求引擎类型，默认为 "fastapi"
-        
-    Returns:
-        str: 公司唯一编号
+    request: Optional[Union[Request, Dict[str, str]]] = None,
+    engine: Literal["fastapi", "dict"] = "fastapi",
+) -> Optional[str]:
+    """
+    获取当前公司唯一编号。request 为 None 时从当前上下文取；无上下文或未认证时返回 None。
     """
     auth_data = get_auth_data(request, engine)
-    return auth_data.company_unique_no
+    return auth_data.company_unique_no if auth_data else None
 
 
 def get_impersonation(
-    request: Union[Request, Dict[str, str]], 
-    engine: Literal["fastapi", "dict"] = "fastapi"
-) -> str:
-    """
-    获取当前代表的租户ID
-    
-    Args:
-        request: FastAPI Request 对象或包含认证数据的字典
-        engine: 请求引擎类型，默认为 "fastapi"
-        
-    Returns:
-        str: 代表的租户ID
+    request: Optional[Union[Request, Dict[str, str]]] = None,
+    engine: Literal["fastapi", "dict"] = "fastapi",
+) -> Optional[str]:
+    """
+    获取当前代表的租户ID。request 为 None 时从当前上下文取；无上下文或未认证时返回 None。
     """
     auth_data = get_auth_data(request, engine)
-    return auth_data.impersonation
+    return auth_data.impersonation if auth_data else None
 
 
 def get_current_client(
-    request: Union[Request, Dict[str, str]], 
-    engine: Literal["fastapi", "dict"] = "fastapi"
-) -> str:
-    """
-    获取当前客户端标识
-    
-    Args:
-        request: FastAPI Request 对象或包含认证数据的字典
-        engine: 请求引擎类型，默认为 "fastapi"
-        
-    Returns:
-        str: 客户端标识
+    request: Optional[Union[Request, Dict[str, str]]] = None,
+    engine: Literal["fastapi", "dict"] = "fastapi",
+) -> Optional[str]:
+    """
+    获取当前客户端标识。request 为 None 时从当前上下文取；无上下文或未认证时返回 None。
     """
     auth_data = get_auth_data(request, engine)
-    return auth_data.client
+    return auth_data.client if auth_data else None
 
 
 def is_impersonating(
-    request: Union[Request, Dict[str, str]], 
-    engine: Literal["fastapi", "dict"] = "fastapi"
+    request: Optional[Union[Request, Dict[str, str]]] = None,
+    engine: Literal["fastapi", "dict"] = "fastapi",
 ) -> bool:
     """
-    检查是否正在代表其他租户
-    
-    Args:
-        request: FastAPI Request 对象或包含认证数据的字典
-        engine: 请求引擎类型，默认为 "fastapi"
-        
-    Returns:
-        bool: 是否正在代表其他租户
+    检查是否正在代表其他租户。request 为 None 时从当前上下文取；无上下文或未认证时返回 False。
     """
     auth_data = get_auth_data(request, engine)
-    return bool(auth_data.impersonation and auth_data.impersonation != auth_data.auth_tenant_id)
+    if not auth_data:
+        return False
+    return bool(
+        auth_data.impersonation and auth_data.impersonation != auth_data.auth_tenant_id
+    )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiuai_sdk_python
-Version: 0.6.9
+Version: 0.7.1
 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.9.dist-info → fiuai_sdk_python-0.7.1.dist-info}/RECORD

@@ -15,28 +15,21 @@ 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=AK1OQQJvX7tdzjOybt2UOcGABdXJzddWc49PHZeqxLY,1004
-fiuai_sdk_python/auth/context_mgr.py,sha256=Wl7Q0YCw0VKiPrYkPZXoBHJM6d0t8kkPOCFxxJv1O_A,9179
+fiuai_sdk_python/auth/__init__.py,sha256=bPLrLT2wDPURVXJ6a0Hi-AhwCCCj1PISY2Gn_Jv427o,1225
+fiuai_sdk_python/auth/context_mgr.py,sha256=cw7A9xfrJMPdRIwOWMr11HI8XEwTNTUYa9AzCObytB0,11296
 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/helper.py,sha256=DUKYe-Y0O-uRVeBqbmsayzF2EfogLNyXf05o4a8iAJc,4726
 fiuai_sdk_python/auth/type.py,sha256=lPUgbSOW-mQfOZpxPGhwDmpbKr5UfjznEuSKGwDosxY,2233
 fiuai_sdk_python/examples/fastapi_integration.py,sha256=6VonD8xkpwUFh3qwQh6mdHGbITscX-MMJF2k3Gj2bJc,1701
 fiuai_sdk_python/http/__init__.py,sha256=RMtrf0O-iuAGMIqfpQg6sQHj_O9Lo4Lhn7KejcapZzo,692
 fiuai_sdk_python/http/client.py,sha256=omcM8R8NGSszZlKBPikZr-NJXHgwpNYu7qDa_9H1Jug,14321
 fiuai_sdk_python/pkg/cache/__init__.py,sha256=7mVRUKkAxCAHIWVZrIslel_kr0S5Je_l0I9Fy_iZjzI,112
 fiuai_sdk_python/pkg/cache/redis_manager.py,sha256=APSRRmsJKRWfDvzIJiwNMtIqjzbheOdULskj5mI55Fk,6114
-fiuai_sdk_python/pkg/db/__init__.py,sha256=IK-zw5tTiSpVMtT3zdVGMaqup08TACIWcEYWpe1htkc,709
-fiuai_sdk_python/pkg/db/config.py,sha256=tId1db3209oZGVQKDwm-cvKu_GCbpbPerR8rgdeD3xE,645
-fiuai_sdk_python/pkg/db/errors.py,sha256=JJwfM_sHXYAOfP5peg9rg8n2BsCMnPXIKVLrOFMPHOs,489
-fiuai_sdk_python/pkg/db/manager.py,sha256=HapTkFOfCzQLCXWBAOlGHsjGCWVBNBLEMCDH7Kty7tI,14855
-fiuai_sdk_python/pkg/db/utils.py,sha256=qqZ14eV7fy9x_mwcEDKJDz1W54xPndpJ1QfM_D0E3FI,2419
-fiuai_sdk_python/pkg/vector/__init__.py,sha256=fvbetFxbHiFeojnTfKT3roA1hOcoNHF_eCRuG6HwMpI,404
-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=RuKn9TFmV1IfsRTV3ZdtXLZkM44GkHs32ehbJdrdu-8,3657
 fiuai_sdk_python/utils/text.py,sha256=bnob_W0nj_Vj8Hp93B0cYmFOY8IhUWF0C8UedOYCNvs,1667
-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,,
+fiuai_sdk_python-0.7.1.dist-info/METADATA,sha256=9zuPOwRytT_wRjNeyutOdtkpDHv7UlOA9FRPTJsDgcc,1523
+fiuai_sdk_python-0.7.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fiuai_sdk_python-0.7.1.dist-info/licenses/LICENSE,sha256=PFMF0dFErrBFqU-rryEby0yW8GBagYqrdbyZQHMUCJg,1062
+fiuai_sdk_python-0.7.1.dist-info/RECORD,,

fiuai_sdk_python/pkg/db/__init__.py

@@ -1,35 +0,0 @@
-# -- coding: utf-8 --
-# Project: fiuai-world
-# Created Date: 2025-01-27
-# Author: liming
-# Email: lmlala@aliyun.com
-# Copyright (c) 2025 FiuAI
-
-from pkg.db.errors import (
-    PostgresError,
-    PostgresConnectionError,
-    PostgresQueryError,
-    PostgresPoolError,
-)
-from pkg.db.config import PostgresConfig
-from pkg.db.manager import (
-    PostgresManager,
-    postgres_manager,
-)
-from pkg.db.utils import (
-    escape_table_name,
-    build_frappe_table_name,
-)
-
-__all__ = [
-    'PostgresManager',
-    'PostgresConfig',
-    'PostgresError',
-    'PostgresConnectionError',
-    'PostgresQueryError',
-    'PostgresPoolError',
-    'postgres_manager',
-    'escape_table_name',
-    'build_frappe_table_name',
-]
-

fiuai_sdk_python/pkg/db/config.py

@@ -1,25 +0,0 @@
-# -- coding: utf-8 --
-# Project: fiuai-world
-# Created Date: 2025-01-27
-# Author: liming
-# Email: lmlala@aliyun.com
-# Copyright (c) 2025 FiuAI
-
-from dataclasses import dataclass
-
-
-@dataclass
-class PostgresConfig:
-    """PostgreSQL 配置"""
-    host: str
-    port: int
-    user: str
-    password: str
-    database: str
-    pool_minconn: int = 1  # 连接池最小连接数
-    pool_maxconn: int = 10  # 连接池最大连接数
-    pool_timeout: int = 30  # 获取连接超时时间（秒）
-    connect_timeout: int = 10  # 连接超时时间（秒）
-    retry_count: int = 3  # 重试次数
-    retry_delay: int = 1  # 重试延迟（秒）
-

fiuai_sdk_python/pkg/db/errors.py

@@ -1,27 +0,0 @@
-# -- coding: utf-8 --
-# Project: fiuai-world
-# Created Date: 2025-01-27
-# Author: liming
-# Email: lmlala@aliyun.com
-# Copyright (c) 2025 FiuAI
-
-
-class PostgresError(Exception):
-    """PostgreSQL 基础错误类"""
-    pass
-
-
-class PostgresConnectionError(PostgresError):
-    """PostgreSQL 连接错误"""
-    pass
-
-
-class PostgresQueryError(PostgresError):
-    """PostgreSQL 查询错误"""
-    pass
-
-
-class PostgresPoolError(PostgresError):
-    """PostgreSQL 连接池错误"""
-    pass
-