labcode 0.1.1__tar.gz → 0.1.2__tar.gz

{labcode-0.1.1 → labcode-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labcode
-Version: 0.1.1
+Version: 0.1.2
 Summary: labcode -- a dialect wrapper over the Object-Flow Programming Language toolchain
 Author-email: Kazunari Kaizu <kwaizu@gmail.com>
 License-Expression: MIT
@@ -20,9 +20,9 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ofplang-validate>=0.1.2
+Requires-Dist: ofplang-validate>=0.1.3
 Requires-Dist: ofplang-schedule>=0.1.3
-Requires-Dist: ofplang-run>=0.1.9
+Requires-Dist: ofplang-run>=0.1.10
 Provides-Extra: test
 Requires-Dist: pytest>=7.0; extra == "test"
 Provides-Extra: dev

{labcode-0.1.1 → labcode-0.1.2}/labcode/run_cli.py

@@ -122,14 +122,14 @@ def main(argv: Sequence[str] | None = None) -> int:
 
     # labcode dialect front door: validate the env x-labcode extension (P5) over the
     # workflow (for (1)/(2) exclusivity) and the environment. Warnings are printed but do
-    # not block; errors are a usage error.
-    workflow_doc, err = _read_document(args.workflow, "workflow")
-    if err is not None:
-        return err
+    # not block; errors are a usage error. Use the *expanded* workflow the shared front
+    # door already resolved (`fd.document`), so `$import` is applied once, no second read
+    # happens, and imported types/ops are visible to the dialect check and `_id` setup.
+    workflow_doc = fd.document or {}
     env_doc, err = _read_document(args.env, "environment")
     if err is not None:
         return err
-    dialect = validate_dialect(workflow_doc or {}, env_doc or {})
+    dialect = validate_dialect(workflow_doc, env_doc or {})
     for warning in dialect.warnings:
         print(f"lc run: warning: {warning}", file=sys.stderr)
     if not dialect.ok:
@@ -153,7 +153,7 @@ def main(argv: Sequence[str] | None = None) -> int:
         # declare `_id`, mint the boundary's Object ids, share one IdGenerator with the
         # backend); it runs the rewritten document in memory (no temp file).
         result = run_labcode(
-            workflow_doc or {},
+            workflow_doc,
             args.env,
             boundary,
             running_task_margin=margin,

{labcode-0.1.1 → labcode-0.1.2}/labcode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labcode
-Version: 0.1.1
+Version: 0.1.2
 Summary: labcode -- a dialect wrapper over the Object-Flow Programming Language toolchain
 Author-email: Kazunari Kaizu <kwaizu@gmail.com>
 License-Expression: MIT
@@ -20,9 +20,9 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ofplang-validate>=0.1.2
+Requires-Dist: ofplang-validate>=0.1.3
 Requires-Dist: ofplang-schedule>=0.1.3
-Requires-Dist: ofplang-run>=0.1.9
+Requires-Dist: ofplang-run>=0.1.10
 Provides-Extra: test
 Requires-Dist: pytest>=7.0; extra == "test"
 Provides-Extra: dev

{labcode-0.1.1 → labcode-0.1.2}/labcode.egg-info/requires.txt

@@ -1,6 +1,6 @@
-ofplang-validate>=0.1.2
+ofplang-validate>=0.1.3
 ofplang-schedule>=0.1.3
-ofplang-run>=0.1.9
+ofplang-run>=0.1.10
 
 [dev]
 pytest>=7.0

{labcode-0.1.1 → labcode-0.1.2}/labcode.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.1.1",
+  "tag": "0.1.2",
   "distance": 0,
-  "node": "g486c970a4db122421a1238a63c0390fe48037a98",
+  "node": "gff018ed68475b09b06a1fcfbe92d5f5796bfa36a",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-07-28"

{labcode-0.1.1 → labcode-0.1.2}/pyproject.toml

@@ -32,9 +32,9 @@ classifiers = [
 # support so a described workflow passes the front door (spec 2.7, >=0.1.2). `validate`
 # and `schedule` subcommands still forward unchanged.
 dependencies = [
-    "ofplang-validate>=0.1.2",
+    "ofplang-validate>=0.1.3",
     "ofplang-schedule>=0.1.3",
-    "ofplang-run>=0.1.9",
+    "ofplang-run>=0.1.10",
 ]
 
 [project.urls]

{labcode-0.1.1 → labcode-0.1.2}/tests/test_run_cli.py

@@ -82,6 +82,42 @@ def test_e2e_lc_run_stamps_deterministic_object_ids(tmp_path):
     assert doc1 == yaml.safe_load(rb2.read_text(encoding="utf-8"))  # deterministic
 
 
+def test_e2e_lc_run_expands_imported_object_types_and_stamps_ids(tmp_path):
+    # `$import` and `_id` compose: the object types (Plate/Tube) are moved into an
+    # imported fragment, so the shared front door must expand it first; then
+    # LabcodeRunner injects `_id` into those *imported* object types. The Tube id
+    # still round-trips, proving expansion happens before `_id` injection.
+    pytest.importorskip("ofplang.schedule", reason="ofplang-schedule not installed")
+    import yaml
+
+    src = (EXAMPLES / "plate_line.workflow.yaml").read_text(encoding="utf-8")
+    head, body = src[: src.index("types:")], src[src.index("processes:") :]
+    (tmp_path / "plate_types.yaml").write_text(
+        "Plate:\n  domain: object\n  view:\n    barcode: { type: String }\n"
+        "Tube:\n  domain: object\n",
+        encoding="utf-8",
+    )
+    wf = tmp_path / "plate_line.workflow.yaml"
+    wf.write_text(head + "types:\n  $import: ./plate_types.yaml\n" + body, encoding="utf-8")
+
+    rb = tmp_path / "rb.yaml"
+    code = run_cli.main(
+        [
+            str(wf),
+            "--env", str(EXAMPLES / "plate_line.env.yaml"),
+            "--boundary", str(EXAMPLES / "plate_line.boundary.yaml"),
+            "--seconds-per-tick", "0.001",
+            "-o", str(tmp_path / "status.yaml"),
+            "--boundary-out", str(rb),
+        ]
+    )
+    assert code == 0
+    doc = yaml.safe_load(rb.read_text(encoding="utf-8"))
+    out_tube = doc["boundary"]["outputs"]["tube"]["view"]
+    in_tube = doc["boundary"]["inputs"]["tube"]["view"]
+    assert out_tube["_id"] and out_tube["_id"] == in_tube["_id"]
+
+
 def test_cli_dialect_error_is_a_usage_error(tmp_path, capsys):
     # A non-python x-labcode script is rejected at the dialect front door (exit 2), before
     # any execution.