testql 1.2.64__tar.gz → 1.2.65__tar.gz

{testql-1.2.64/testql.egg-info → testql-1.2.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testql
-Version: 1.2.64
+Version: 1.2.65
 Summary: TestQL — Multi-DSL Test Platform: TestTOON / NL / SQL / Proto / GraphQL adapters with Unified IR, generator engine, and meta-testing
 License-Expression: Apache-2.0
 Requires-Python: <3.14,>=3.11

{testql-1.2.64 → testql-1.2.65}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "testql"
-version = "1.2.64"
+version = "1.2.65"
 description = "TestQL — Multi-DSL Test Platform: TestTOON / NL / SQL / Proto / GraphQL adapters with Unified IR, generator engine, and meta-testing"
 readme = "README.md"
 requires-python = ">=3.11,<3.14"

{testql-1.2.64 → testql-1.2.65}/testql/interpreter/_api_runner.py

@@ -72,7 +72,7 @@ class ApiRunnerMixin:
                     continue
                 # Re-raise non-retryable errors
                 raise
-            except Exception as e:
+            except Exception:
                 # Non-retryable errors
                 raise
 
@@ -128,7 +128,7 @@ class ApiRunnerMixin:
             return
 
         method = parts[0].upper()
-        url = parts[1].strip("\"'")
+        url = self.vars.interpolate(parts[1].strip("\"'"))
         body_str = parts[2] if len(parts) > 2 else ""
 
         if url.startswith("/"):

{testql-1.2.64 → testql-1.2.65}/testql/interpreter/_testtoon_parser.py

@@ -19,9 +19,6 @@ import json
 
 from ._gui_expand import expand_gui_row
 from ._parser import OqlLine, OqlScript
-from .testtoon_models import ToonSection, ToonScript
-from .testtoon_parser import parse_testtoon
-
 # Backward compatibility: re-export classes that were moved
 from .testtoon_models import ToonSection, ToonScript  # noqa: F401
 from .testtoon_parser import parse_testtoon  # noqa: F401
@@ -110,9 +107,38 @@ def _append_api_asserts(row: dict, lines: list[OqlLine], line_num: int) -> int:
     return line_num
 
 
-def _expand_api(section: ToonSection, lines: list[OqlLine], line_num: int) -> int:
+def _append_api_captures(
+    row: dict,
+    api_step: int,
+    capture_rows: list[dict],
+    lines: list[OqlLine],
+    line_num: int,
+) -> int:
+    """Append captures assigned to an API row by its 1-based index or name."""
+    step_name = str(row.get('name', '')).strip()
+    for capture in capture_rows:
+        target = str(capture.get('step', '')).strip()
+        if target != str(api_step) and (not step_name or target != step_name):
+            continue
+        var_name = str(capture.get('var', '')).strip()
+        from_path = str(capture.get('from', '')).strip()
+        if not var_name or not from_path:
+            continue
+        args = f'{var_name} FROM "{from_path}"'
+        line_num = _append_raw_command(lines, line_num, 'CAPTURE', args)
+    return line_num
+
+
+def _expand_api(
+    section: ToonSection,
+    lines: list[OqlLine],
+    line_num: int,
+    *,
+    capture_rows: list[dict] | None = None,
+    step_offset: int = 0,
+) -> int:
     """Expand API section → API + ASSERT_STATUS commands."""
-    for row in section.rows:
+    for row_index, row in enumerate(section.rows, 1):
         method = row.get('method', 'GET')
         endpoint = row.get('endpoint', '/')
         body = row.get('body')
@@ -127,6 +153,13 @@ def _expand_api(section: ToonSection, lines: list[OqlLine], line_num: int) -> in
         raw = f'API {method} "{endpoint}"{body_str}'
         lines.append(OqlLine(number=line_num, command='API', args=f'{method} "{endpoint}"{body_str}', raw=raw))
         line_num = _append_api_asserts(row, lines, line_num + 1)
+        line_num = _append_api_captures(
+            row,
+            step_offset + row_index,
+            capture_rows or [],
+            lines,
+            line_num,
+        )
     return line_num
 
 
@@ -649,8 +682,29 @@ def testtoon_to_oql(text: str, filename: str = "<string>") -> OqlScript:
     toon = parse_testtoon(text, filename)
     lines: list[OqlLine] = []
     line_num = 1
+    api_step_count = 0
+    capture_rows = [
+        row
+        for section in toon.sections
+        if section.type == 'CAPTURE'
+        for row in section.rows
+    ]
 
     for section in toon.sections:
+        if section.type == 'CAPTURE':
+            # Captures must run while the referenced API response is still the
+            # current response, so API expansion interleaves them above.
+            continue
+        if section.type == 'API':
+            line_num = _expand_api(
+                section,
+                lines,
+                line_num,
+                capture_rows=capture_rows,
+                step_offset=api_step_count,
+            )
+            api_step_count += len(section.rows)
+            continue
         expander = _SECTION_EXPANDERS.get(section.type, _expand_generic)
         line_num = expander(section, lines, line_num)
 

{testql-1.2.64 → testql-1.2.65}/testql/ir_runner/engine.py

@@ -49,7 +49,14 @@ def _apply_captures(step, result: StepResult, ctx: ExecutionContext) -> None:
         return
     payload = (result.details or {}).get("payload", {})
     for capture in captures:
-        value = navigate(payload, capture.from_path)
+        # API capture paths are relative to the response body (`response.data.id`
+        # is normalized to `data.id`). Other executors expose their result fields
+        # directly. Fall back to the full envelope so API status/header captures
+        # remain possible.
+        capture_root = payload.get("data", {}) if getattr(step, "kind", "") == "api" else payload
+        value = navigate(capture_root, capture.from_path)
+        if value is None and capture_root is not payload:
+            value = navigate(payload, capture.from_path)
         if value is None:
             ctx.warnings.append(
                 f"capture {capture.var_name!r} from {capture.from_path!r}: path not found"

{testql-1.2.64 → testql-1.2.65/testql.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testql
-Version: 1.2.64
+Version: 1.2.65
 Summary: TestQL — Multi-DSL Test Platform: TestTOON / NL / SQL / Proto / GraphQL adapters with Unified IR, generator engine, and meta-testing
 License-Expression: Apache-2.0
 Requires-Python: <3.14,>=3.11

{testql-1.2.64 → testql-1.2.65}/tests/test_interpreter.py

@@ -103,6 +103,34 @@ class TestTestTOONExpansion:
         assert script.lines[3].command == "ASSERT_STATUS"
         assert "201" in script.lines[3].args
 
+    def test_capture_is_interleaved_after_referenced_api_step(self):
+        source = (
+            "API[2]{method, endpoint, status}:\n"
+            "  POST, /devices, 201\n"
+            "  GET, /devices/${device_id}, 200\n"
+            "CAPTURE[1]{step, var, from}:\n"
+            "  1, device_id, data.id\n"
+        )
+
+        script = _testtoon_to_oql(source, "test.testql.toon.yaml")
+
+        assert [line.command for line in script.lines] == [
+            "API", "ASSERT_STATUS", "CAPTURE", "API", "ASSERT_STATUS",
+        ]
+        assert script.lines[2].args == 'device_id FROM "data.id"'
+
+    def test_capture_can_reference_named_api_step(self):
+        source = (
+            "API[1]{method, endpoint, status, name}:\n"
+            "  POST, /devices, 201, createDevice\n"
+            "CAPTURE[1]{step, var, from}:\n"
+            "  createDevice, device_id, data.id\n"
+        )
+
+        script = _testtoon_to_oql(source, "test.testql.toon.yaml")
+
+        assert script.lines[-1].command == "CAPTURE"
+
     def test_encoder_expansion(self):
         source = (
             "ENCODER[2]{action, target, value, wait_ms}:\n"
@@ -227,6 +255,22 @@ class TestOqlInterpreter:
         assert result.ok
         assert result.passed >= 1
 
+    def test_api_interpolates_captured_variable_in_url(self, monkeypatch):
+        requested_urls = []
+
+        def fake_request(_self, _method, url, _body):
+            requested_urls.append(url)
+            return 200, {"ok": True}, {}
+
+        monkeypatch.setattr(OqlInterpreter, "_do_http_request_with_retry", fake_request)
+        interp = OqlInterpreter(quiet=True, api_url="http://localhost:8101")
+        interp.vars.set("device_id", "dev-7")
+
+        result = interp.run('API GET "/devices/${device_id}"', "test.tql")
+
+        assert result.ok
+        assert requested_urls == ["http://localhost:8101/devices/dev-7"]
+
     def test_set_get(self):
         source = 'SET foo "bar"\nGET foo'
         interp = OqlInterpreter(dry_run=True, quiet=True)

{testql-1.2.64 → testql-1.2.65}/tests/test_ir_runner_captures.py

@@ -77,6 +77,26 @@ class TestShellCaptures:
         assert "hello" in runner.ctx.vars.get("out")
 
 
+class TestApiCaptures:
+    def test_capture_is_relative_to_response_body(self, monkeypatch):
+        from testql.ir_runner.executors import api
+
+        monkeypatch.setattr(api, "_do_request", lambda *args: (201, {"data": {"id": "sc-1"}}))
+        plan = _plan(
+            ApiStep(
+                method="POST",
+                path="/api/v3/scenarios",
+                captures=[Capture(var_name="scenario_id", from_path="data.id")],
+            )
+        )
+        runner = IRRunner()
+
+        result = runner.run(plan)
+
+        assert result.ok
+        assert runner.ctx.vars.get("scenario_id") == "sc-1"
+
+
 # ── Missing path → warning, not failure ─────────────────────────────────────