libbeachcomber 0.8.0__tar.gz → 0.9.1__tar.gz

{libbeachcomber-0.8.0 → libbeachcomber-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: libbeachcomber
-Version: 0.8.0
+Version: 0.9.1
 Summary: Python client SDK for the beachcomber (comb) shell-state daemon
 Project-URL: Homepage, https://github.com/NavistAu/beachcomber
 Project-URL: Repository, https://github.com/NavistAu/beachcomber
@@ -85,6 +85,15 @@ with client.session() as session:
     hostname = session.get("hostname")
 ```
 
+## Resolve and eval
+
+`client.resolve(key, cwd, env=None, overrides=None)` evaluates a declared
+virtual field client-side; `client.eval(template_str, cwd, env=None,
+overrides=None)` evaluates a raw expression the same way. Both `cwd`
+arguments are required. The expression itself accepts a bare expression, a
+single `{{ expr }}` tag, or literal text/several tags — the first two keep
+the expression's natural type, the third is always a string.
+
 ## Custom socket path
 
 ```python

{libbeachcomber-0.8.0 → libbeachcomber-0.9.1}/README.md

@@ -61,6 +61,15 @@ with client.session() as session:
     hostname = session.get("hostname")
 ```
 
+## Resolve and eval
+
+`client.resolve(key, cwd, env=None, overrides=None)` evaluates a declared
+virtual field client-side; `client.eval(template_str, cwd, env=None,
+overrides=None)` evaluates a raw expression the same way. Both `cwd`
+arguments are required. The expression itself accepts a bare expression, a
+single `{{ expr }}` tag, or literal text/several tags — the first two keep
+the expression's natural type, the third is always a string.
+
 ## Custom socket path
 
 ```python

{libbeachcomber-0.8.0 → libbeachcomber-0.9.1}/conformance_runner.py

@@ -153,8 +153,8 @@ def _run_op(
     Returns the raw response data (or None for ops that return nothing),
     or raises CombError / ServerError on failure.
 
-    `resolve_ctx` (only consulted for the `resolve` op) carries the
-    fixture's `virtual`/`env`/`cwd` blocks — see
+    `resolve_ctx` (only consulted for the `resolve` and `eval` ops) carries
+    the fixture's `virtual`/`env`/`cwd` blocks — see
     tests/conformance/README.md.
     """
     if op == "resolve":
@@ -166,6 +166,19 @@ def _run_op(
             env=resolve_ctx["env"] or None,
             overrides=resolve_ctx["virtual"] or None,
         )
+    if op == "eval":
+        assert resolve_ctx is not None
+        from libbeachcomber.result import CombResult
+
+        value = client.eval(
+            args.get("template", ""),
+            cwd=resolve_ctx["cwd"],
+            env=resolve_ctx["env"] or None,
+            overrides=resolve_ctx["virtual"] or None,
+        )
+        # Client.eval returns the bare value; wrap it the way Client.resolve
+        # already does so the shared expectation checks see one shape.
+        return CombResult(ok=True, data=value, age_ms=0, stale=False)
     if op == "get":
         return client.get(**args)
     if op == "refresh":
@@ -221,6 +234,7 @@ _SUPPORTED_OPS = {
     "watch",
     "introspect",
     "resolve",
+    "eval",
 }
 
 
@@ -408,7 +422,7 @@ def _check_data_type(data: Any, expected_type: str) -> bool:
         return isinstance(data, str)
     if expected_type == "number":
         return isinstance(data, (int, float)) and not isinstance(data, bool)
-    if expected_type == "boolean":
+    if expected_type == "bool":
         return isinstance(data, bool)
     if expected_type == "null":
         return data is None

{libbeachcomber-0.8.0 → libbeachcomber-0.9.1}/libbeachcomber/client.py

@@ -394,9 +394,13 @@ class Client:
         env: Optional[dict] = None,
         overrides: Optional[dict] = None,
     ) -> Any:
-        """Evaluate an arbitrary expression string — the same evaluator
-        :meth:`resolve` uses for a declared virtual field, but for a raw
-        expression that need not be registered anywhere.
+        """Evaluate a value expression — the same evaluator :meth:`resolve`
+        uses for a declared virtual field, but for a raw expression that
+        need not be registered anywhere.
+
+        ``template_str`` accepts a bare expression, a single ``{{ expr }}``
+        tag, or literal text/several tags — the first two keep the
+        expression's natural type, the third is always a string.
 
         Args:
             template_str: The expression to evaluate.

{libbeachcomber-0.8.0 → libbeachcomber-0.9.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "libbeachcomber"
-version = "0.8.0"
+version = "0.9.1"
 description = "Python client SDK for the beachcomber (comb) shell-state daemon"
 readme = "README.md"
 license = { text = "MIT" }