agstack 1.0.8__tar.gz → 1.2.0__tar.gz

{agstack-1.0.8 → agstack-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.0.8
+Version: 1.2.0
 Summary: Production-ready toolkit for building FastAPI and LLM applications
 Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
 Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
@@ -24,18 +24,18 @@ Requires-Dist: ag-ui-protocol>=0.1.13
 Requires-Dist: aio-pika>=9.6.1
 Requires-Dist: asyncpg>=0.30.0
 Requires-Dist: elasticsearch[async]>=9.3.0
-Requires-Dist: fastapi>=0.133.0
+Requires-Dist: fastapi>=0.133.1
 Requires-Dist: jwcrypto>=1.5.6
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: nebula3-python>=3.8.3
-Requires-Dist: openai>=2.24.0
+Requires-Dist: openai>=2.26.0
 Requires-Dist: passlib[bcrypt]>=1.7.4
 Requires-Dist: pycasbin>=2.8.0
 Requires-Dist: pydantic>=2.12.4
 Requires-Dist: python-multipart>=0.0.20
 Requires-Dist: requests>=2.32.5
-Requires-Dist: sqlalchemy[asyncio]>=2.0.47
-Requires-Dist: sqlobjects>=1.2.3
+Requires-Dist: sqlalchemy[asyncio]>=2.0.48
+Requires-Dist: sqlobjects>=1.2.5
 Requires-Dist: tiktoken>=0.12.0
 Requires-Dist: uvicorn>=0.41.0
 Dynamic: license-file

{agstack-1.0.8 → agstack-1.2.0}/agstack/config/logger.py

@@ -26,16 +26,20 @@ class InterceptHandler(logging.Handler):
             level = record.levelno
 
         # 直接使用 logging.LogRecord 的信息，避免栈帧查找
-        logger.patch(
+        patched = logger.patch(
             lambda r: r.update(
                 name=record.name,
-                file={"name": record.pathname, "path": record.pathname},  # type: ignore[arg-type]
+                file={"name": record.pathname, "path": record.pathname},  # type: ignore
                 line=record.lineno,
                 function=record.funcName,
             )
-        ).log(level, record.getMessage())
+        )
+
+        if record.exc_info:
+            patched.opt(exception=record.exc_info).log(level, record.getMessage())
+        else:
+            patched.log(level, record.getMessage())
 
-        # CRITICAL/FATAL 级别自动退出
         if record.levelno >= logging.CRITICAL:
             sys.exit(1)
 

agstack-1.2.0/agstack/contexts.py

@@ -0,0 +1,21 @@
+#  Copyright (c) 2020-2025 XtraVisions, All rights reserved.
+
+"""运行时上下文"""
+
+import uuid
+from contextvars import ContextVar, Token
+
+
+_request_id: ContextVar[str | None] = ContextVar("request_id", default=None)
+
+
+def get_request_id() -> str:
+    return _request_id.get() or str(uuid.uuid4())
+
+
+def set_request_id(value: str) -> Token:
+    return _request_id.set(value)
+
+
+def reset_request_id(token: Token) -> None:
+    _request_id.reset(token)

{agstack-1.0.8 → agstack-1.2.0}/agstack/decorators.py

@@ -4,6 +4,7 @@ import asyncio
 import time
 from functools import wraps
 from logging import Logger
+from typing import Awaitable, Callable, ParamSpec, TypeVar
 
 from sqlobjects.session import ctx_session, has_session
 
@@ -49,17 +50,21 @@ def autoretry(
     return decorator
 
 
-def with_session(func, dbname: str | None = None):
+P = ParamSpec("P")
+R = TypeVar("R")
+
+
+def with_session(func: Callable[P, Awaitable[R]], dbname: str | None = None) -> Callable[P, Awaitable[R]]:
     """装饰器：确保方法在 session 上下文中执行，支持嵌套调用"""
 
     @wraps(func)
-    async def wrapper(self, *args, **kwargs):
+    async def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
         # 如果已经在 session 上下文中，直接执行
         if has_session(dbname):
-            return await func(self, *args, **kwargs)
+            return await func(*args, **kwargs)
 
         # 否则创建新的 session 上下文
         async with ctx_session(dbname):
-            return await func(self, *args, **kwargs)
+            return await func(*args, **kwargs)
 
     return wrapper

{agstack-1.0.8 → agstack-1.2.0}/agstack/events.py

@@ -13,10 +13,10 @@ class EventType(str, Enum):
     """事件类型定义"""
 
     # Infra 生命周期
-    DB_CONNECTED = "db.connected"
-    ES_CONNECTED = "es.connected"
-    MQ_CONNECTED = "mq.connected"
-    KG_CONNECTED = "kg.connected"
+    DB_INITED = "db.inited"
+    ES_INITED = "es.inited"
+    MQ_INITED = "mq.inited"
+    KG_INITED = "kg.inited"
 
     # 组件生命周期
     COMPONENT_REGISTERED = "component.registered"

{agstack-1.0.8 → agstack-1.2.0}/agstack/fastapi/middleware.py

@@ -8,6 +8,8 @@ from typing import Callable
 from fastapi import Request, Response
 from starlette.middleware.base import BaseHTTPMiddleware
 
+from ..contexts import reset_request_id, set_request_id
+
 
 class RequestIDMiddleware(BaseHTTPMiddleware):
     """请求 ID 中间件
@@ -22,8 +24,12 @@ class RequestIDMiddleware(BaseHTTPMiddleware):
         # 将 request_id 存储到 request.state（供后续使用）
         request.state.request_id = request_id
 
-        # 调用下一个处理器
-        response = await call_next(request)
+        token = set_request_id(request_id)
+
+        try:
+            response = await call_next(request)
+        finally:
+            reset_request_id(token)
 
         # 在响应头中返回 request_id
         response.headers["X-Request-ID"] = request_id

{agstack-1.0.8 → agstack-1.2.0}/agstack/infra/db/__init__.py

@@ -27,7 +27,7 @@ async def setup_db(
     **engine_kwargs: Any,
 ):
     url = f"postgresql+asyncpg://{username}:{password}@{host}/{database}"
-    await init_db(
+    db = await init_db(
         url,
         echo=echo,
         pool_size=pool_size,
@@ -36,7 +36,7 @@ async def setup_db(
         pool_recycle=pool_recycle,
         **engine_kwargs,
     )
-    await event_bus.publish(EventType.DB_CONNECTED)
+    await event_bus.publish(EventType.DB_INITED, {"db": db})
 
 
 async def shutdown_db():

{agstack-1.0.8 → agstack-1.2.0}/agstack/infra/es/__init__.py

@@ -14,7 +14,7 @@ async def setup_es(
     sniff_timeout: float = 3,
 ):
     # 为 elasticsearch-dsl 创建连接
-    async_connections.connections.create_connection(
+    es = async_connections.connections.create_connection(
         alias="default",
         hosts=hosts,
         verify_certs=False,
@@ -24,7 +24,7 @@ async def setup_es(
         sniff_on_node_failure=True,
         http_auth=(username, password),
     )
-    await event_bus.publish(EventType.ES_CONNECTED)
+    await event_bus.publish(EventType.ES_INITED, {"es": es})
 
 
 async def shutdown_es():

{agstack-1.0.8 → agstack-1.2.0}/agstack/infra/kg/__init__.py

@@ -42,17 +42,18 @@ async def setup_kg(
     if not pool.init(hosts, config):
         raise RuntimeError("Failed to initialize NebulaGraph connection pool")
 
-    # 验证连接
+    # 验证连接，space 不存在时自动创建
     session = pool.get_session(username, password)
     try:
-        result = session.execute(f"USE {space}")
+        session.execute(f"CREATE SPACE IF NOT EXISTS `{space}` (vid_type=FIXED_STRING(64))")
+        result = session.execute(f"USE `{space}`")
         if not result.is_succeeded():
             raise RuntimeError(f"Failed to use space '{space}': {result.error_msg()}")
     finally:
         session.release()
 
     _context = _KGContext(pool=pool, space=space, username=username, password=password)
-    await event_bus.publish(EventType.KG_CONNECTED)
+    await event_bus.publish(EventType.KG_INITED, {"pool": pool})
 
 
 async def shutdown_kg():

{agstack-1.0.8 → agstack-1.2.0}/agstack/infra/mq/__init__.py

@@ -20,7 +20,7 @@ async def setup_mq(host: str, port: int, username: str, password: str):
     connection_url = f"amqp://{username}:{password}@{host}:{port}/"
     _connection = await aio_pika.connect_robust(connection_url, loop=get_event_loop())
 
-    await event_bus.publish(EventType.MQ_CONNECTED)
+    await event_bus.publish(EventType.MQ_INITED, {"connection": _connection})
 
 
 async def shutdown_mq():

{agstack-1.0.8 → agstack-1.2.0}/agstack/llm/client.py

@@ -5,9 +5,12 @@ import time
 from typing import TYPE_CHECKING, Any, AsyncIterator, Literal, overload
 
 from httpx import AsyncClient
+from httpx import Timeout as HttpxTimeout
 from openai import APIError, APITimeoutError, AsyncOpenAI, OpenAI, RateLimitError
+from openai import Timeout as OpenAITimeout
 from openai.types.chat import ChatCompletionMessageParam
 
+from ..contexts import get_request_id
 from ..exceptions import AppException
 
 
@@ -51,16 +54,20 @@ class LLMClient:
         """
         self._base_url = base_url
 
+        # 只限制连接超时，读取不限（推理时间不可预估）
+        _openai_timeout = OpenAITimeout(connect=10.0, read=None, write=None, pool=None)
+        _httpx_timeout = HttpxTimeout(connect=10.0, read=None, write=None, pool=None)
+
         # 异步客户端
         self._async_client = AsyncOpenAI(
             base_url=base_url,
             api_key=api_key,
-            timeout=60.0,
+            timeout=_openai_timeout,
             max_retries=0,  # 手动控制重试
         )
         self._async_http_client = AsyncClient(
             headers={"Authorization": f"Bearer {api_key}"},
-            timeout=60.0,
+            timeout=_httpx_timeout,
         )
 
         # 同步客户端（延迟初始化）
@@ -69,7 +76,7 @@ class LLMClient:
         self._sync_client_config = {
             "base_url": base_url,
             "api_key": api_key,
-            "timeout": 60.0,
+            "timeout": _openai_timeout,
             "max_retries": 0,
         }
 
@@ -150,6 +157,7 @@ class LLMClient:
                     messages=messages,
                     temperature=temperature,
                     max_tokens=max_tokens,
+                    extra_headers={"X-Request-ID": get_request_id()},
                     **kwargs,
                 )
 
@@ -255,6 +263,7 @@ class LLMClient:
                 max_tokens=max_tokens,
                 stream=True,
                 stream_options={"include_usage": True},
+                extra_headers={"X-Request-ID": get_request_id()},
                 **kwargs,
             )
 
@@ -293,7 +302,9 @@ class LLMClient:
             exceptions=(APITimeoutError, ConnectionError),
         )
         async def _call():
-            return await self._async_client.embeddings.create(model=model, input=texts)
+            return await self._async_client.embeddings.create(
+                model=model, input=texts, extra_headers={"X-Request-ID": get_request_id()}
+            )
 
         try:
             response = await _call()
@@ -447,6 +458,7 @@ class LLMClient:
                     "top_n": top_n,
                     "return_documents": True,
                 },
+                headers={"X-Request-ID": get_request_id()},
             )
 
         try:
@@ -495,7 +507,7 @@ class LLMClient:
                     "top_n": top_n,
                     "return_documents": True,
                 },
-                timeout=60.0,
+                timeout=None,
             )
             response.raise_for_status()
             data = response.json()

{agstack-1.0.8 → agstack-1.2.0}/agstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.0.8
+Version: 1.2.0
 Summary: Production-ready toolkit for building FastAPI and LLM applications
 Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
 Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
@@ -24,18 +24,18 @@ Requires-Dist: ag-ui-protocol>=0.1.13
 Requires-Dist: aio-pika>=9.6.1
 Requires-Dist: asyncpg>=0.30.0
 Requires-Dist: elasticsearch[async]>=9.3.0
-Requires-Dist: fastapi>=0.133.0
+Requires-Dist: fastapi>=0.133.1
 Requires-Dist: jwcrypto>=1.5.6
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: nebula3-python>=3.8.3
-Requires-Dist: openai>=2.24.0
+Requires-Dist: openai>=2.26.0
 Requires-Dist: passlib[bcrypt]>=1.7.4
 Requires-Dist: pycasbin>=2.8.0
 Requires-Dist: pydantic>=2.12.4
 Requires-Dist: python-multipart>=0.0.20
 Requires-Dist: requests>=2.32.5
-Requires-Dist: sqlalchemy[asyncio]>=2.0.47
-Requires-Dist: sqlobjects>=1.2.3
+Requires-Dist: sqlalchemy[asyncio]>=2.0.48
+Requires-Dist: sqlobjects>=1.2.5
 Requires-Dist: tiktoken>=0.12.0
 Requires-Dist: uvicorn>=0.41.0
 Dynamic: license-file

{agstack-1.0.8 → agstack-1.2.0}/agstack.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 agstack/__init__.py
+agstack/contexts.py
 agstack/decorators.py
 agstack/events.py
 agstack/exceptions.py

{agstack-1.0.8 → agstack-1.2.0}/agstack.egg-info/requires.txt

@@ -2,17 +2,17 @@ ag-ui-protocol>=0.1.13
 aio-pika>=9.6.1
 asyncpg>=0.30.0
 elasticsearch[async]>=9.3.0
-fastapi>=0.133.0
+fastapi>=0.133.1
 jwcrypto>=1.5.6
 loguru>=0.7.3
 nebula3-python>=3.8.3
-openai>=2.24.0
+openai>=2.26.0
 passlib[bcrypt]>=1.7.4
 pycasbin>=2.8.0
 pydantic>=2.12.4
 python-multipart>=0.0.20
 requests>=2.32.5
-sqlalchemy[asyncio]>=2.0.47
-sqlobjects>=1.2.3
+sqlalchemy[asyncio]>=2.0.48
+sqlobjects>=1.2.5
 tiktoken>=0.12.0
 uvicorn>=0.41.0

{agstack-1.0.8 → agstack-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agstack"
-version = "1.0.8"
+version = "1.2.0"
 description = "Production-ready toolkit for building FastAPI and LLM applications"
 readme = "README.md"
 license = "MIT"
@@ -43,18 +43,18 @@ dependencies = [
     "aio-pika>=9.6.1",
     "asyncpg>=0.30.0",
     "elasticsearch[async]>=9.3.0",
-    "fastapi>=0.133.0",
+    "fastapi>=0.133.1",
     "jwcrypto>=1.5.6",
     "loguru>=0.7.3",
     "nebula3-python>=3.8.3",
-    "openai>=2.24.0",
+    "openai>=2.26.0",
     "passlib[bcrypt]>=1.7.4",
     "pycasbin>=2.8.0",
     "pydantic>=2.12.4",
     "python-multipart>=0.0.20",
     "requests>=2.32.5",
-    "sqlalchemy[asyncio]>=2.0.47",
-    "sqlobjects>=1.2.3",
+    "sqlalchemy[asyncio]>=2.0.48",
+    "sqlobjects>=1.2.5",
     "tiktoken>=0.12.0",
     "uvicorn>=0.41.0",
 ]
@@ -62,7 +62,7 @@ dependencies = [
 dev = [
     "pre-commit>=4.4.0",
     "pyright>=1.1.407",
-    "ruff>=0.15.2",
+    "ruff>=0.15.5",
     "setuptools>=82.0.0",
 ]
 
@@ -96,6 +96,7 @@ select = [
 ]
 ignore = [
     "UP046", # disable none pep695 generic class
+    "UP047", # disable none pep695 generic function
     "UP035", # disable using `type` instead `types.Type`
 ]