store-api-py 0.4.0__tar.gz → 0.5.0__tar.gz

{store_api_py-0.4.0 → store_api_py-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: store-api-py
-Version: 0.4.0
+Version: 0.5.0
 Summary: FastAPI adapter that auto-generates RESTful APIs for py-store schemas (schema-driven CRUD over GQL)
 License: MIT
 Keywords: py-store,storepy,fastapi,rest,crud,gql

{store_api_py-0.4.0 → store_api_py-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "store-api-py"
-version = "0.4.0"
+version = "0.5.0"
 description = "FastAPI adapter that auto-generates RESTful APIs for py-store schemas (schema-driven CRUD over GQL)"
 readme = "README.md"
 requires-python = ">=3.10"

{store_api_py-0.4.0 → store_api_py-0.5.0}/src/store_api_py/app.py

@@ -57,12 +57,17 @@ def create_app(
     file_resolver: Callable[[Request, dict, str], Any] | None = None,
     upload_resolver: Callable[[Request, dict, str], Any] | None = None,
     upload_limit: int = 32 * 1024 * 1024,
+    policy_provider: Callable[[Any], Any | None] | None = None,
 ) -> FastAPI:
     """为 store（py-store 的 store 实例，需已 init + register）生成 RESTful FastAPI 应用。
 
     - prefix: 路由前缀，如 '/api'
     - id_field: 单条路由主键字段名（双端一致，spec/01-routing.md，默认 '_id'）
     - context_provider: 每请求上下文钩子（spec/04-context.md）；非权限类抛错 ⇒ 401 CONTEXT_ERROR
+    - policy_provider: 每请求策略覆盖钩子 (ctx) => overrides | None（R2-04 §4.1）；
+      overrides 非 None 时经 store.base_view().with_policy(overrides) 派生视图，
+      并以 with_scope 作用域包裹全部 handler；None（缺省）= 不启用，行为同现状。
+      需宿主提供 base_view；provider 异常同走 map_error 单一出口（禁吞）
     - resources: 显式资源名；缺省取 store.list() 并过滤归档表
     - permission_error: store 权限错误类；缺省取 store.PermissionError
     - file_resolver: 下载字节接缝 (request, rec, rid) => {body, contentType, fileName}；缺省时下载 501
@@ -84,9 +89,46 @@ def create_app(
             "无需鉴权的内部服务请显式 store.set_require_context(False) 后再装配"
         )
 
+    # R2-04 装配守卫：注入 policy_provider 需宿主提供 base_view（py-store 提供）——
+    # 皮侧禁自持 Registry 派生视图（R2-04 §7），宿主不支持时装配期显式失败（fail-fast）。
+    if policy_provider is not None and not callable(getattr(store, "base_view", None)):
+        raise RuntimeError(
+            "ERR_POLICY_PROVIDER_CONFIG: 注入 policy_provider 需要宿主 store.base_view()"
+            "（py-store 提供）；皮侧禁自持 Registry 派生视图（R2-04 §7）"
+        )
+    _with_scope = None
+    if policy_provider is not None:
+        try:
+            from py_store import with_scope as _with_scope  # optional peer，惰性加载
+        except Exception as e:  # noqa: BLE001 — 依赖缺失装配期显式失败，禁静默降级
+            raise RuntimeError(
+                f"ERR_DEPENDENCY_MISSING: 注入 policy_provider 需要安装 py-store（with_scope）: {e}"
+            ) from e
+
     def _respond(mapped: StoreApiError) -> JSONResponse:
         return JSONResponse(status_code=mapped.status_code, content=error_payload(mapped.code, mapped.message))
 
+    # 注册顺序说明：Starlette 中间件后注册者在外层。执行序（外→内）=
+    # _annotate_cache → _inject_context → _scoped_dispatch → 路由。
+    # _scoped_dispatch 需读 _inject_context 写入的 request.state.store_ctx，故先注册（更内层）。
+    if policy_provider is not None:
+
+        @app.middleware("http")
+        async def _scoped_dispatch(request: Request, call_next):
+            # R2-04 §4.1：ctx 复用自 context_provider 已解析值（request.state.store_ctx，
+            # 禁二次调用 provider）；无 context_provider 时为 None。
+            # provider 异常同走 map_error 单一出口（禁吞、禁静默降级）。
+            try:
+                overrides = policy_provider(getattr(request.state, "store_ctx", None))
+            except Exception as e:  # noqa: BLE001 — 错误映射为带语义的 HTTP 响应，禁止静默
+                mapped = map_error(e, permission_error)
+                return JSONResponse(
+                    status_code=mapped.status_code, content=error_payload(mapped.code, mapped.message)
+                )
+            view = store.base_view().with_policy(overrides) if overrides is not None else None
+            with _with_scope(view):
+                return await call_next(request)
+
     if context_provider is not None:
 
         @app.middleware("http")
@@ -100,6 +142,8 @@ def create_app(
             # spec/04：返回 None 时同样显式注入空上下文（store.set_context(None) 语义为清除，
             # 有状态持有的运行时禁止残留上一请求上下文，防身份跨请求泄漏）
             store.set_context(ctx)
+            # R2-04：已解析 ctx 存 request.state 供 _scoped_dispatch 复用（禁二次调用 provider）
+            request.state.store_ctx = ctx
             return await call_next(request)
 
     # B6：`x-cache` 响应头注记位——取值唯一来源为宿主 store.cache_status（未实现时恒 BYPASS）；

{store_api_py-0.4.0 → store_api_py-0.5.0}/src/store_api_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: store-api-py
-Version: 0.4.0
+Version: 0.5.0
 Summary: FastAPI adapter that auto-generates RESTful APIs for py-store schemas (schema-driven CRUD over GQL)
 License: MIT
 Keywords: py-store,storepy,fastapi,rest,crud,gql

{store_api_py-0.4.0 → store_api_py-0.5.0}/tests/test_smoke.py

@@ -5,12 +5,15 @@ conformance 纪律：两端断言逐项对应，任何一端改动必须同步
 
 import sys
 from pathlib import Path
+from types import SimpleNamespace
 
 import pytest
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 
 sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
+# py-store 为 optional peer（跨仓源码直连，node 侧对应 junction link）
+sys.path.insert(0, str(Path(__file__).resolve().parents[3] / "py-store" / "src"))
 
 from store_api_py import ParamError, create_app, filter_archived, parse_query_params  # noqa: E402
 from store_api_py.params import convert_value  # noqa: E402
@@ -356,3 +359,89 @@ def test_upload_route_and_field():
                           headers={"content-type": "application/octet-stream"})
     assert missing.status_code == 404
     assert missing.json()["error"]["code"] == "NOT_FOUND"
+
+
+# ── R2-04：policy_provider 请求入口作用域化（与 node test/smoke.test.js 同构，双端 parity）──
+
+
+def test_policy_provider_guard_and_require_context():
+    """装配守卫 + requireContext 覆盖：无 ctx 请求 → no_context(403)；返回 None → 行为同现状。"""
+    from py_store import current_scope
+
+    # 装配守卫：宿主未导出 base_view() 时注入 policy_provider ⇒ 装配期显式失败（fail-fast，禁静默降级）
+    legacy = MockStore()
+    with pytest.raises(RuntimeError, match="ERR_POLICY_PROVIDER_CONFIG"):
+        build_app(legacy, policy_provider=lambda ctx: None)
+
+    store = MockStore()
+    store.base_view = lambda: SimpleNamespace(with_policy=lambda o: {"overrides": o})
+
+    # 作用域感知的 query（模拟宿主 fail-secure：视图要求 ctx 且当前 ctx 缺失 ⇒ NoContext）
+    async def scoped_query(gql, params=None):
+        scope = current_scope()
+        view = scope.view if scope is not None else None
+        ov = (view or {}).get("overrides") or {}
+        if ov.get("requireContext") and store.last_context is None:
+            e = RuntimeError("ERR_NO_CONTEXT:上下文缺失")
+            e.code = "no_context"
+            raise e
+        return list(store.rows.values())
+
+    store.query = scoped_query
+
+    # ① 注入 requireContext 覆盖：未配 context_provider（policy_provider 收到 None）→ 403 no_context
+    seen = []
+
+    def provider(ctx):
+        seen.append(ctx)
+        return {"requireContext": True}
+
+    client = TestClient(build_app(store, policy_provider=provider))
+    denied = client.get("/api/user")
+    assert seen == [None]  # policy_provider 入参 = 已解析 ctx（无 context_provider ⇒ None）
+    assert denied.status_code == 403
+    assert denied.json()["error"]["code"] == "no_context"
+
+    # ② 注入返回 None ⇒ 无视图作用域（current_scope().view 回退 None）→ 行为同现状
+    lax = TestClient(build_app(store, policy_provider=lambda ctx: None))
+    ok = lax.get("/api/user")
+    assert ok.status_code == 200
+    assert "error" not in ok.json()
+
+
+def test_policy_provider_profile_view_and_ctx_reuse():
+    """profile 覆盖经视图生效（查询面可观察）；ctx 复用自 context_provider（禁二次调用）。"""
+    from py_store import current_scope
+
+    store = MockStore()
+    store.base_view = lambda: SimpleNamespace(with_policy=lambda o: {"overrides": o})
+
+    # 档位判决可观察面：text2query 档视图下输出收缩（模拟 core 判决差异经宿主查询面可见）
+    async def scoped_query(gql, params=None):
+        scope = current_scope()
+        view = scope.view if scope is not None else None
+        ov = (view or {}).get("overrides") or {}
+        if ov.get("profile") == "text2query":
+            return [{"_id": "r1", "name": "redacted"}]
+        return list(store.rows.values())
+
+    store.query = scoped_query
+
+    ctx_calls = 0
+
+    def cp(request):
+        nonlocal ctx_calls
+        ctx_calls += 1
+        return {"uid": "u9"}
+
+    client = TestClient(build_app(
+        store,
+        context_provider=cp,
+        policy_provider=lambda ctx: {"profile": "text2query"} if ctx and ctx.get("uid") == "u9" else None,
+    ))
+    client.post("/api/user", json={"name": "a", "age": 1})
+    res = client.get("/api/user")
+    assert res.status_code == 200
+    assert res.json()["data"] == [{"_id": "r1", "name": "redacted"}]
+    # 两个请求各解析一次 context_provider（已解析值存 request.state 复用，禁二次调用）
+    assert ctx_calls == 2