store-api-py 0.6.0__tar.gz → 0.6.2__tar.gz

{store_api_py-0.6.0 → store_api_py-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: store-api-py
-Version: 0.6.0
+Version: 0.6.2
 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.6.0 → store_api_py-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "store-api-py"
-version = "0.6.0"
+version = "0.6.2"
 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.6.0 → store_api_py-0.6.2}/src/store_api_py/errors.py

@@ -25,9 +25,44 @@ def error_payload(code: str, message: str | None) -> dict[str, Any]:
     return {"error": {"code": code, "message": message}}
 
 
-def store_code(err: BaseException) -> str:
-    """store 错误的分类码：优先 err.code，缺省用错误类名，再缺省用通用码。"""
-    return getattr(err, "code", None) or type(err).__name__ or "STORE_ERROR"
+_KNOWN_STORE_PREFIXES = (
+    ('ERR_PERMISSION:', 'ERR_PERMISSION'),
+    # machine code 统一为 no_context（与 rust map_store_err / node mapError 同口径）
+    ('ERR_NO_CONTEXT:', 'no_context'),
+    ('ERR_TEXT2QUERY:', 'ERR_TEXT2QUERY'),
+    ('ERR_GQL_PARSE:', 'GQL_PARSE'),
+    ('ERR_NOT_FOUND:', 'not_found'),
+)
+
+
+def _prefix_store_code(text: Any) -> str | None:
+    """解析单段文本的 `ERR_*` 稳定前缀（与 rust errors.rs::store_code 同口径）。"""
+    if not isinstance(text, str):
+        return None
+    for prefix, cls in _KNOWN_STORE_PREFIXES:
+        if text == prefix[:-1]:  # 宿主只给去冒号的 machine 前缀（如 code='ERR_NOT_FOUND'）
+            return cls
+        if not text.startswith(prefix):
+            continue
+        rest = text[len(prefix):]
+        seg, sep, _ = rest.partition(':')
+        return seg if sep and seg else cls
+    return None
+
+
+def store_code(err: Any) -> str:
+    """store 错误的分类码：`ERR_*` 稳定前缀（err.code / message）优先；
+    其余保持既有口径（err.code → 类名 → STORE_ERROR），禁吞成通用错误。"""
+    if isinstance(err, str):
+        return _prefix_store_code(err) or err or 'STORE_ERROR'
+    code = getattr(err, 'code', None)
+    return (
+        _prefix_store_code(code)
+        or _prefix_store_code(str(err))
+        or code
+        or type(err).__name__
+        or "STORE_ERROR"
+    )
 
 
 def invalid_body(message: str) -> StoreApiError:

{store_api_py-0.6.0 → store_api_py-0.6.2}/src/store_api_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: store-api-py
-Version: 0.6.0
+Version: 0.6.2
 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.6.0 → store_api_py-0.6.2}/tests/test_error_matrix.py

@@ -49,4 +49,23 @@ def test_matrix_other_to_500():
     r = map_error(_err("连接超时", "CONN_TIMEOUT"), PermissionError)
     assert r.status_code == 500
     assert r.code == "CONN_TIMEOUT"
-    assert r.message == "连接超时"
+    assert r.message == "连接超时"
+
+
+def test_cross_language_err_prefix_code_matches_rust():
+    """跨端 code 口径：同一 `ERR_*` 输入与 rust store_code 同 code（未知错误保持原样）。"""
+    cases = [
+        ("ERR_NOT_FOUND:目标记录不存在（写条件未命中任何行，_id 不存在或已被删除）", "not_found"),
+        ("ERR_NOT_FOUND", "not_found"),
+        ("ERR_NO_CONTEXT:缺少请求上下文", "no_context"),
+        ("ERR_NO_CONTEXT", "no_context"),
+        ("ERR_PERMISSION:RBAC:无权写入", "RBAC"),
+        ("ERR_TEXT2QUERY:档位不支持", "ERR_TEXT2QUERY"),
+        ("ERR_GQL_PARSE:意外的 token", "GQL_PARSE"),
+    ]
+    for message, code in cases:
+        r = map_error(Exception(message), PermissionError)
+        assert r.code == code, f"{message} ⇒ {code}"
+
+    unknown = _err("连接超时", "CONN_TIMEOUT")
+    assert map_error(unknown, PermissionError).code == "CONN_TIMEOUT"