storepy 3.2.0__tar.gz → 3.3.0__tar.gz

{storepy-3.2.0 → storepy-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: storepy
-Version: 3.2.0
+Version: 3.3.0
 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-3.2.0 → storepy-3.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "storepy"
-version = "3.2.0"
+version = "3.3.0"
 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-3.2.0 → storepy-3.3.0}/src/py_store/workflow.py

@@ -16,6 +16,7 @@ import json
 import re
 import time
 from contextlib import contextmanager
+from typing import List
 
 from . import permission as _permission
 from .crud.exec import _call, _sources_of, run_atomic
@@ -268,6 +269,63 @@ def validate_defn(defn):
     return errors
 
 
+def _collect_param_keys(ast_value, out=None):
+    """递归收集 core 返回 ast 中所有 ``params`` 对象的字符串值（@key 名）。"""
+    if out is None:
+        out = set()
+    if isinstance(ast_value, dict):
+        params = ast_value.get('params')
+        if isinstance(params, dict):
+            # core `ast.params` 的值为 `@key` 形态（含前导 @，core parse.rs::parse_params
+            # 保留 ref 原值）；归一化去掉前导 @，使错误文案为 `@c0` 而非 `@@c0`。
+            for v in params.values():
+                if isinstance(v, str) and v:
+                    out.add(v[1:] if v.startswith('@') else v)
+        for v in ast_value.values():
+            _collect_param_keys(v, out)
+    elif isinstance(ast_value, _LIST_TYPES):
+        for v in ast_value:
+            _collect_param_keys(v, out)
+    return out
+
+
+def validate_planable(defn):
+    """注册期「只校验不绑参」可规划性校验 → 错误列表（空 = 通过）。纯内存、无 IO、无参数值绑定。
+
+    ① 结构性可规划：对每个 query 步骤的 gql 调 core 门面
+       ``_core.build_pipeline(gql, {}, None)``（params 传 {} = 不绑参；ctx 传 None）；
+       不可规划 → core 抛异常，此处汇聚为注册期错误。
+    ② 参数键完整：返回体 ``ast`` 暴露 ``params``（槽位→@key，含嵌套关系）；
+       gql 引用的每个 ``@key`` 须在 ``step['params']`` 顶层存在。
+
+    与 ``validate_defn``（纯函数）分职：本函数需要 core 注册表，故独立、不入 validate_defn。
+    """
+    errors: List[str] = []
+    if not isinstance(defn, dict):
+        return errors
+    steps = defn.get('steps')
+    if not isinstance(steps, _LIST_TYPES):
+        return errors
+    for i, step in enumerate(steps):
+        if not isinstance(step, dict) or step.get('op') != 'query':
+            continue
+        gql = step.get('gql')
+        if not isinstance(gql, str):
+            continue
+        where = f'steps[{i}]'
+        try:
+            built = _core.build_pipeline(gql, {}, None)
+        except Exception as e:  # 透传 core 文案，与 node 逐字节对齐
+            errors.append(f'{where}: gql 不可规划: {e}')
+            continue
+        params = step.get('params')
+        provided = set(params) if isinstance(params, dict) else set()
+        for key in sorted(_collect_param_keys(built.get('ast') if isinstance(built, dict) else None)):
+            if key not in provided:
+                errors.append(f'{where}: gql 引用了未提供的参数 @{key}（params 须提供该键）')
+    return errors
+
+
 def _split_when(when):
     """when → (op, param_key)；无歧义文法：含 exists 键即 op=exists（is 作参数键），
     其余算子的右值键统一 than（is 键已被 exists 参数占用；is/eq 算子同用 than）"""
@@ -317,6 +375,10 @@ def register(defn, ctx=None):
     errors = validate_defn(defn)
     if errors:
         raise WorkflowError('WORKFLOW_UNSUPPORTED: ' + '；'.join(errors))
+    # B1：注册期「只校验不绑参」可规划性（结构 + 参数键完整）；独立于纯函数 validate_defn
+    plan_errors = validate_planable(defn)
+    if plan_errors:
+        raise WorkflowError('WORKFLOW_UNSUPPORTED: ' + '；'.join(plan_errors))
     name = defn['name']
     if name in _workflows:
         if _workflows[name] == defn:

{storepy-3.2.0 → storepy-3.3.0}/src/storepy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: storepy
-Version: 3.2.0
+Version: 3.3.0
 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-3.2.0 → storepy-3.3.0}/tests/test_workflow.py

@@ -12,9 +12,23 @@ import pytest
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent / 'src'))
 
+from py_store import schema as sc
 from py_store import workflow as wf
 from py_store.workflow import WorkflowError
 
+
+# B1 前置：GOOD 的 gql/mutation 引用 Inventory，注册期可规划性校验要求其已注册。
+# 本仓 conftest 的模块级夹具会在每模块清空注册表（clear_schemas），故按约定入口
+# `_register_test_schemas` 提供（只定义不执行，由夹具在清场后重放）。
+def _register_test_schemas():
+    sc.register({
+        'name': 'Inventory', 'collection': 'inventory', 'idPrefix': 'inv',
+        'fields': {
+            '_id': {'type': 'string'}, 'stock': {'type': 'int'},
+            'productId': {'type': 'string'}, 'warehouse': {'type': 'string'},
+        },
+    })
+
 GOOD = {
     'name': 'placeOrder',
     'read': ['admin', 'ops'],
@@ -322,3 +336,26 @@ def test_parity_run_doc_shape():
         assert sorted(run_doc['steps'][1]) == ['as', 'op', 'state']
     finally:
         wf._workflows.pop('shapeWf', None)
+
+
+# ─── B1：注册期 GQL 可规划性校验（结构 + 参数键完整） ─────────
+
+def test_b1_planable_unplanned_rejected():
+    bad = {'name': 'noModelWf', 'steps': [
+        {'op': 'query', 'as': 'a', 'gql': 'NoSuchModel{_id}', 'params': {}}]}
+    assert len(wf.validate_planable(bad)) == 1
+    with pytest.raises(wf.WorkflowError, match=r'WORKFLOW_UNSUPPORTED: steps\[0\]: gql 不可规划'):
+        wf.register(bad)
+
+
+def test_b1_planable_missing_param_key():
+    bad = {'name': 'missParamWf', 'steps': [
+        {'op': 'query', 'as': 'a', 'gql': 'Inventory($condition:@c0){_id}', 'params': {}}]}
+    assert wf.validate_planable(bad) == [
+        'steps[0]: gql 引用了未提供的参数 @c0（params 须提供该键）']
+
+
+def test_b1_planable_ok():
+    assert wf.validate_planable({'name': 'okWf', 'steps': [
+        {'op': 'query', 'as': 'a', 'gql': 'Inventory($condition:@c0){_id, stock}',
+         'params': {'c0': {'stock': 1}}}]}) == []