storepy 4.2.0__tar.gz → 4.2.1__tar.gz

{storepy-4.2.0/src/storepy.egg-info → storepy-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: storepy
-Version: 4.2.0
+Version: 4.2.1
 Summary: Multi-backend data layer for Python asyncio (MongoDB, MySQL, SQLite, PostgreSQL): pure JSON schemas, GQL tree queries compiled to a single native query, GROUP BY/HAVING aggregation, computed columns, soft-delete and role-based access control
 Author-email: leo <coen_ddt@qq.com>
 License-Expression: MIT

{storepy-4.2.0 → storepy-4.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "storepy"
-version = "4.2.0"
+version = "4.2.1"
 description = "Multi-backend data layer for Python asyncio (MongoDB, MySQL, SQLite, PostgreSQL): pure JSON schemas, GQL tree queries compiled to a single native query, GROUP BY/HAVING aggregation, computed columns, soft-delete and role-based access control"
 readme = "README.md"
 requires-python = ">=3.10"

{storepy-4.2.0 → storepy-4.2.1}/src/py_store/resource/__init__.py

@@ -130,8 +130,10 @@ async def open(resource_id, *, order=None):
                             "message": f'资源副本读取失败，降级到下一副本（backend={loc["backend"]}, id={resource_id}）：{e}',
                             "hint": "检查该 provider 可用性；该副本可能需要重建"})
     if last_err is not None:
-        raise last_err
-    raise FileNotFoundError(f"资源不存在或无可读副本: {resource_id}")
+        raise last_err  # 有副本行但读取失败：原样重抛（500 透传），禁改语义
+    # core 稳定前缀（与 ERR_PERMISSION: / ERR_GQL_PARSE: 同构）：适配层按前缀判定 → 404，
+    # 禁按中文文案匹配。仅「按 resource_id 查到零 ResourceLocation 行」时抛出。
+    raise FileNotFoundError(f"ERR_RESOURCE_NOT_FOUND:资源不存在或无可读副本: {resource_id}")
 
 
 async def remove(resource_id):

{storepy-4.2.0 → storepy-4.2.1/src/storepy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: storepy
-Version: 4.2.0
+Version: 4.2.1
 Summary: Multi-backend data layer for Python asyncio (MongoDB, MySQL, SQLite, PostgreSQL): pure JSON schemas, GQL tree queries compiled to a single native query, GROUP BY/HAVING aggregation, computed columns, soft-delete and role-based access control
 Author-email: leo <coen_ddt@qq.com>
 License-Expression: MIT

{storepy-4.2.0 → storepy-4.2.1}/tests/test_resource.py

@@ -10,6 +10,8 @@ import asyncio
 import re
 import tempfile
 
+import pytest
+
 from py_store import feedback, resource
 
 
@@ -156,6 +158,45 @@ def test_open_degrade_on_provider_failure():
     _run(scenario())
 
 
+def test_open_missing_resource_raises_prefixed_error():
+    """零副本行 → 抛 FileNotFoundError 且带 ERR_RESOURCE_NOT_FOUND: 稳定前缀（spec/03 判定顺序第 4 层）。"""
+    async def scenario():
+        store = _FakeStore()
+        resource.register_provider('memory', _MemoryProvider)
+        resource.configure({'store': store, 'providers': [{'kind': 'memory'}], 'url': {}})
+
+        rid = '0' * 40
+        prefix = 'ERR_RESOURCE_NOT_FOUND:'
+        with pytest.raises(FileNotFoundError) as ei:
+            await resource.open(rid)
+        assert str(ei.value).startswith(prefix), str(ei.value)
+        assert str(ei.value)[len(prefix):] == f'资源不存在或无可读副本: {rid}'
+
+    _run(scenario())
+
+
+def test_open_provider_failure_reraises_without_prefix():
+    """有副本行但 provider 读取失败 → 原样重抛、不带前缀（保持 500 语义，禁伪装成「不存在」）。"""
+    async def scenario():
+        store = _FakeStore()
+        prev = feedback.get_sink()
+        feedback.set_sink(lambda e: None)
+        try:
+            resource.register_provider('badget', _BrokenGetProvider)
+            resource.configure({'store': store, 'providers': [{'kind': 'badget'}], 'url': {}})
+            store.rows.append({'_schema': 'ResourceLocation', 'resourceId': 'a' * 40,
+                               'backend': 'badget', 'key': 'k', 'status': 'ok', 'priority': 0})
+
+            with pytest.raises(RuntimeError) as ei:
+                await resource.open('a' * 40)
+            assert str(ei.value) == 'disk boom'
+            assert not str(ei.value).startswith('ERR_RESOURCE_NOT_FOUND:')
+        finally:
+            feedback.set_sink(prev)
+
+    _run(scenario())
+
+
 def test_partial_write_failure_persists_failed_and_feedback():
     async def scenario():
         store = _FakeStore()