builder2ibek 2.0.1__tar.gz → 2.0.2__tar.gz

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.claude/commands/ioc-convert.md

@@ -283,7 +283,26 @@ To check what macros a db file expects:
 grep "^# % macro" /dls_sw/prod/R3.14.12.7/support/<module>/<version>/db/<file>.db
 ```
 
-### 5c. Report and suggest commits
+### 5c. Refresh the global schema
+
+The isolated `EPICS_ROOT` from Phase 0 keeps this run's schema separate, but it
+also means the **global** schema at `/epics/ibek-defs/ioc.schema.json` (which
+the editor's yaml-language-server reads — see line 1 of every `ioc.yaml`) is
+unaware of any new support YAMLs created during this run. The result is
+spurious "unknown type" warnings in the IDE on freshly-converted ioc.yaml
+files, even though `ibek runtime generate2` succeeded.
+
+If any support YAMLs were created or modified during this run, refresh the
+global schema so the editor sees the new entity types:
+
+```bash
+EPICS_ROOT=/epics ./update-schema
+```
+
+If no support YAMLs changed (pure ioc.yaml-only conversion), this step can be
+skipped.
+
+### 5d. Report and suggest commits
 
 Once clean, **do not commit anything**. Report to the user:
 

builder2ibek-2.0.2/.claude/skills/beamline-gui/SKILL.md

@@ -0,0 +1,109 @@
+---
+name: beamline-gui
+description: DLS beamline EDM screen layout and conventions — use when locating, reading, or editing `*.edl` files for hardware-status / IOC-status synoptics, debugging wrong-target buttons (PC / Terminal / Start-Stop), or making sense of EDM positional layout.
+---
+
+# Beamline GUI (EDM Screens)
+
+DLS beamline GUIs are EDM `.edl` files. This skill covers where they live and
+how the common synoptic screens are wired.
+
+---
+
+## Where the screens live
+
+Pattern (same for every beamline):
+
+```
+/dls_sw/{work,prod}/R<EPICS-VER>/ioc/BLxxI/BL/
+  BLxxIApp/opi/edl/*.edl     # SOURCE — edit these
+  data/*.edl                 # deployed copy — overwritten by build; do not edit
+```
+
+`*.edl~` are EDM editor backups — ignore.
+
+`/dls_sw/work/` is the unreleased tree (edit here); `/dls_sw/prod/` is the
+released equivalent (read-only).
+
+**EPICS version varies per beamline.** `R3.14.12.7` is currently the most
+common, but older beamlines may still live under `R3.14.11`, `R3.14.12.3`,
+`R3.14.8.2`, etc., and newer / RTEMS-based ones under `R7.0.7`. Don't hard-code
+the version — discover it:
+
+```bash
+ls -d /dls_sw/{work,prod}/R*/ioc/BLxxI/BL 2>/dev/null
+```
+
+Pick the most recent / actively-modified tree (check mtimes on the `edl/`
+directory if there are several).
+
+---
+
+## Key screens
+
+| File | Purpose |
+|---|---|
+| `BLxxI-hardware-status.edl` | Top-level synoptic for the beamline |
+| `BLxxI-ioc-status-embed.edl` | Per-IOC rows; embedded in hardware-status via `activePipClass` |
+
+The hardware-status screen embeds the ioc-status-embed via `displayFileName`.
+
+---
+
+## How a row is laid out
+
+EDM is positional. A row of buttons shares a single `y` coordinate; the row's
+human-readable name is a `(Static Text)` object at the same y on the left.
+Buttons sit at increasing `x`. **Object order in the file does not follow
+visual order — match by coordinates, not file position.**
+
+Typical row (left to right):
+
+| Element | Class | Real wiring lives in |
+|---|---|---|
+| Row label | `activeXTextClass` | `value { "Merlin 01 IOC" }` — cosmetic |
+| IOC button | `relatedDisplayClass` | `displayFileName: ioc_stats_soft`, `symbols: ioc=$(dom)-XX-IOC-NN` |
+| Traffic light | `activeSymbolClass` | `controlPvs: <IOC>:LOAD.SEVR` |
+| Terminal | `shellCmdClass` | `command: gnome-terminal -x console <IOC>` |
+| Start/Stop | `relatedDisplayClass` | `procServControl.edl`, `symbols: procServ=<IOC>` |
+| PC | `shellCmdClass` | `command: dls-remote-desktop.sh ... <hostname>` |
+| Save/Restore icon | `relatedDisplayClass` | `save_restoreStatus_more`, `symbols: P=<IOC>` |
+
+`$(dom)` is the beamline domain macro (e.g. `BL20I`), substituted at runtime.
+
+---
+
+## Finding the code behind a visible button
+
+1. Grep the row's static-text label (the name shown on screen):
+   ```bash
+   grep -n '"Merlin 02 IOC"' BLxxI-ioc-status-embed.edl
+   ```
+2. Read around the hit to find the row's `y` coordinate.
+3. Grep `buttonLabel` (or the action class — `shellCmdClass`, `relatedDisplayClass`)
+   and look for objects with the same y — those are the buttons in that row.
+
+Don't trust `buttonLabel` text alone: the visible label and the actual target
+in `command` / `symbols` can disagree. That mismatch is the "wrong PC" bug class.
+
+---
+
+## Wiring/label mismatch (the wrong-target bug)
+
+Each PC / Terminal / Start-Stop button has a `command` string (or `symbols`
+substitution) naming the real target. The visible label is decorative. When
+a button "opens the wrong thing", the fix is in `command` or `symbols`, not
+in the label or the static text next to it.
+
+Two buttons that target swapped hosts get fixed by swapping the `command`
+strings — coordinates, colours, and labels stay put.
+
+---
+
+## Editing rules
+
+- Edit `BLxxIApp/opi/edl/<file>.edl` — never `data/<file>.edl` (deployed
+  output, overwritten on build).
+- Never touch `*.edl~` (EDM autosave).
+- When swapping wiring between rows, preserve x/y/colours/labels; change only
+  the `command` / `symbols` lines.

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.claude/skills/ibek-concepts/SKILL.md

@@ -106,6 +106,46 @@ float, `42` becomes int. Type mismatch → schema validation failure.
 
 ---
 
+## Leading-zero int params (gauge ids, controller addresses)
+
+XML attributes like `id="02"` or `address="001"` are zero-padded because the
+builder XML used them as raw PV-name segments. In ibek, these should almost
+always be `type: int` — the zero padding is a *rendering* concern for the db
+substitution, not a property of the parameter itself.
+
+Three-part pattern:
+
+1. **Support YAML** — declare `type: int`, render padded in `databases.args`:
+   ```yaml
+   id:
+     type: int
+     description: Gauge ID. Rendered zero-padded to 2 digits in PV
+       substitutions (e.g. 1 -> "01").
+   ...
+   databases:
+     - file: $(MOD)/db/foo.template
+       args:
+         id: "{{ '%02d' % id }}"
+   ```
+2. **Converter** — coerce the string to int in the module's converter. The
+   generic `convert.py::_has_leading_zero` deliberately preserves
+   zero-padded strings (so PV-name segments survive), so per-module
+   converters must override:
+   ```python
+   if entity_type == "mks937aGauge" and entity.id is not None:
+       entity.id = int(entity.id)
+   ```
+3. **Result** — ioc.yaml holds `id: 2` (bare int), and ibek's Jinja step
+   renders `"02"` in ioc.subst. st.cmd / ioc.subst output is unchanged
+   byte-for-byte.
+
+**When to keep them as strings instead**: if the value is a PV-name
+quadrant code or a string enum (e.g. `SR-VA.gaugeSetA.q` = "S" / "A" / "SS",
+`dlsPLC.fastVacuumChannel.id` declared `type: enum` with string values like
+"01"), leave it as `type: str` / `type: enum`.
+
+---
+
 ## Reference examples
 
 | Module | Path | Notes |

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.claude/skills/shared/support-yaml-rules.md

@@ -34,6 +34,11 @@ topics. Key reminders:
   module — it is not always `PORT`. Always check the `ArgInfo` declaration in
   builder.py; if it uses `Ident(...)` it must be `type: object` in the support YAML.
 - `.*:` in `databases.args` passes all parameters through.
+- Zero-padded numeric params (gauge ids like `"02"`, controller addresses
+  like `"001"`) → `type: int` in the support YAML, render padded in
+  `databases.args` with `{{ '%02d' % id }}`, and add a per-module
+  converter coercion `entity.id = int(entity.id)` so ioc.yaml holds a bare
+  int. See [ibek-concepts](../ibek-concepts/SKILL.md) for the full pattern.
 
 ## STREAM_PROTOCOL_PATH
 

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.copier-answers.yml

@@ -1,6 +1,7 @@
 # Changes here will be overwritten by Copier
-_commit: 5.0.2
+_commit: 5.0.3-3-gd645eb3
 _src_path: gh:diamondlightsource/python-copier-template
+add_claude: true
 author_email: giles.knap@diamond.ac.uk
 author_name: Giles Knap
 description: Conversion tool for DLS XML builder IOC instances to ibek ioc.yaml
@@ -9,6 +10,8 @@ docker: false
 docs_type: sphinx
 git_platform: github.com
 github_org: epics-containers
+install_gh: true
+install_glab: true
 package_name: builder2ibek
 pypi: true
 repo_name: builder2ibek

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.devcontainer/Dockerfile

@@ -19,6 +19,13 @@ RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | \
     apt-get update && apt-get install -y gh && \
     rm -rf /var/lib/apt/lists/*
 
+# Install glab (GitLab CLI) — no apt repo, use the release tarball from gitlab.com
+ARG GLAB_VERSION=1.92.1
+RUN curl -fsSL "https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VERSION}/downloads/glab_${GLAB_VERSION}_linux_amd64.tar.gz" \
+      | tar -xz -C /tmp bin/glab && \
+    install -m 0755 /tmp/bin/glab /usr/local/bin/glab && \
+    rm -rf /tmp/bin
+
 FROM base as developer
 
 WORKDIR /workspace

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.devcontainer/devcontainer.json

@@ -21,6 +21,8 @@
         "VSCODE_GIT_ASKPASS_MAIN": "",
         "VSCODE_GIT_ASKPASS_NODE": "",
         "VSCODE_GIT_ASKPASS_EXTRA_ARGS": "",
+        // Mark this shell as running inside the devcontainer
+        "IN_DEVCONTAINER": "1",
         // Put things that allow it in the persistent cache
         "PRE_COMMIT_HOME": "/cache/pre-commit",
         "UV_CACHE_DIR": "/cache/uv",
@@ -61,8 +63,8 @@
                 "streetsidesoftware.code-spell-checker",
                 "moshfeu.compare-folders",
                 "nsd.vscode-epics",
-                "anthropic.claude-code",
-                "github.copilot-chat"
+                "ms-azuretools.vscode-docker",
+                "anthropic.claude-code"
             ]
         }
     },
@@ -97,6 +99,12 @@
             "target": "/root/.config/gh",
             "type": "volume"
         },
+        // Persist glab auth across container rebuilds (GitLab CLI, for ibek-support-dls)
+        {
+            "source": "glab-auth-${localWorkspaceFolderBasename}",
+            "target": "/root/.config/glab-cli",
+            "type": "volume"
+        },
         // Mount Claude config from host (settings, memory, skills)
         {
             "source": "${localEnv:HOME}/.claude",

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.devcontainer/postCreate.sh

@@ -8,4 +8,6 @@ curl -fsSL https://claude.ai/install.sh | bash
 uv venv --clear
 uv sync
 pre-commit install --install-hooks
-git submodule update --init
+
+# Initialise git submodules if any are declared
+[ -f .gitmodules ] && git submodule update --init || true

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.devcontainer/postStart.sh

@@ -8,10 +8,11 @@ set -euo pipefail
 git config --global credential.helper ''
 git config --global --unset-all url.ssh://git@github.com/.insteadOf 2>/dev/null || true
 
-# Force all GitHub SSH URLs to use HTTPS so the gh credential helper handles
-# auth. This keeps the container SSH-key-free (Claude stays sandboxed) while
-# still allowing push/pull on repos whose remotes are set to git@github.com:.
+# Force all SSH-style remotes to use HTTPS so the gh/glab credential helpers
+# handle auth. This keeps the container SSH-key-free (Claude stays sandboxed)
+# while still allowing push/pull on repos whose remotes are set to git@...:.
 git config --global url."https://github.com/".insteadOf "git@github.com:"
+git config --global url."https://gitlab.diamond.ac.uk/".insteadOf "git@gitlab.diamond.ac.uk:"
 
 # If gh CLI has cached credentials (survive container rebuild), re-register
 # its git credential helper so HTTPS remotes authenticate automatically.

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.github/CONTRIBUTING.md

@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
 
 This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
 
-For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.2/how-to.html).
+For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.3/how-to.html).

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/.gitignore

@@ -78,3 +78,4 @@ lockfiles/
 .claude/commands/ioc-convert/last-services-repo
 .claude/commands/ioc-check/last-services-repo
 DONE
+.claude/scheduled_tasks.lock

builder2ibek-2.0.2/Dockerfile

@@ -0,0 +1,31 @@
+# The devcontainer should use the developer target and run as root with podman
+# or docker with user namespaces.
+ARG PYTHON_VERSION=3.13
+FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:noble AS developer
+
+# Add any system dependencies for the developer/build environment here
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+    graphviz \
+    && apt-get dist-clean
+
+# Node is required by Claude Code's hook runtime
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+    nodejs \
+    && apt-get dist-clean
+
+# GitHub CLI — used by Claude to authenticate to github.com via PAT
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | \
+    dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
+    chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
+        | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
+    apt-get update && apt-get install -y --no-install-recommends gh && \
+    apt-get dist-clean
+
+# GitLab CLI — used by Claude to authenticate to gitlab instances via PAT.
+# No apt repo, so install from the upstream release tarball.
+ARG GLAB_VERSION=1.92.1
+RUN curl -fsSL "https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VERSION}/downloads/glab_${GLAB_VERSION}_linux_amd64.tar.gz" \
+      | tar -xz -C /tmp bin/glab && \
+    install -m 0755 /tmp/bin/glab /usr/local/bin/glab && \
+    rm -rf /tmp/bin

{builder2ibek-2.0.1/src/builder2ibek.egg-info → builder2ibek-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: builder2ibek
-Version: 2.0.1
+Version: 2.0.2
 Summary: Conversion tool for DLS XML builder IOC instances to ibek ioc.yaml
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License
@@ -225,8 +225,9 @@ Dynamic: license-file
 A tool suite for converting DLS XMLbuilder IOC projects to
 [epics-containers](https://github.com/epics-containers) ibek.
 
-Source          | <https://github.com/epics-containers/builder2ibek>
+What            | Where
 :---:           | :---:
+Source          | <https://github.com/epics-containers/builder2ibek>
 PyPI            | `pip install builder2ibek`
 Documentation   | <https://epics-containers.github.io/builder2ibek>
 Releases        | <https://github.com/epics-containers/builder2ibek/releases>

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/README.md

@@ -8,8 +8,9 @@
 A tool suite for converting DLS XMLbuilder IOC projects to
 [epics-containers](https://github.com/epics-containers) ibek.
 
-Source          | <https://github.com/epics-containers/builder2ibek>
+What            | Where
 :---:           | :---:
+Source          | <https://github.com/epics-containers/builder2ibek>
 PyPI            | `pip install builder2ibek`
 Documentation   | <https://epics-containers.github.io/builder2ibek>
 Releases        | <https://github.com/epics-containers/builder2ibek/releases>

builder2ibek-2.0.2/justfile

@@ -0,0 +1,22 @@
+# Start Claude Code in sandbox mode (no SSH agent, skip permission prompts)
+claude:
+    SSH_AUTH_SOCK= IS_SANDBOX=1 claude --dangerously-skip-permissions
+
+
+# Authenticate gh CLI with a GitHub PAT (token not stored in shell history)
+gh-auth:
+    #!/bin/bash
+    read -sp "GitHub PAT: " t && echo
+    echo "$t" | gh auth login --with-token
+    unset t
+    gh auth setup-git
+    gh auth status
+
+
+# Authenticate glab CLI with a GitLab PAT (token not stored in shell history). --git-protocol https prevents glab's SSH insteadOf rewrite.
+glab-auth hostname="gitlab.diamond.ac.uk":
+    #!/bin/bash
+    read -sp "GitLab PAT for {{ hostname }}: " t && echo
+    echo "$t" | glab auth login --stdin --hostname {{ hostname }} --git-protocol https
+    unset t
+    glab auth status

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/pyproject.toml

@@ -26,6 +26,7 @@ dev = [
     "pytest",
     "pytest-cov",
     "pytest-mock",
+    "pytest-xdist",
     "ruff",
     "sphinx-autobuild",
     "sphinx-copybutton",
@@ -53,7 +54,7 @@ ignore_missing_imports = true # Ignore missing stubs in imported modules
 [tool.pytest.ini_options]
 # Run pytest with all our checkers, and don't spam us with massive tracebacks on error
 addopts = """
-    --tb=native -vv --doctest-modules --doctest-glob="*.rst"
+    --tb=native -vv --doctest-modules --doctest-glob="*.rst" -n auto
     """
 # https://iscinumpy.gitlab.io/post/bound-version-constraints/#watch-for-warnings
 filterwarnings = "error"

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/src/builder2ibek/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.0.1'
-__version_tuple__ = version_tuple = (2, 0, 1)
+__version__ = version = '2.0.2'
+__version_tuple__ = version_tuple = (2, 0, 2)
 
-__commit_id__ = commit_id = 'g576c57179'
+__commit_id__ = commit_id = 'g73d451bd1'

builder2ibek-2.0.2/src/builder2ibek/converters/insertionDevice.py

@@ -0,0 +1,17 @@
+from builder2ibek.converters.globalHandler import globalHandler
+from builder2ibek.types import Entity, Generic_IOC
+
+xml_component = "insertionDevice"
+
+
+@globalHandler
+def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
+    """
+    XML to YAML converter for the insertionDevice support module.
+    """
+
+    entity.remove("name")
+
+    if entity_type == "insertionDevice4V_generic_DTTemplate":
+        if hasattr(entity, "comptable"):
+            entity.comptable = str(entity.comptable)

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/src/builder2ibek/converters/interlock.py

@@ -20,6 +20,10 @@ def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
         entity.type = "dlsPLC.interlock"
         entity.remove("name")
         hex_to_int(entity, "ilk")
+        # addr is type: int in the support YAML; XML can encode it zero-padded
+        # ("07"), which the generic converter preserves as a string. Coerce.
+        if entity.addr is not None:
+            entity.addr = int(entity.addr)
 
     if entity_type == "overrideRequestMain":
         entity.type = "dlsPLC.overrideRequestMain"

builder2ibek-2.0.2/src/builder2ibek/converters/mks937a.py

@@ -0,0 +1,21 @@
+from builder2ibek.converters.globalHandler import globalHandler
+from builder2ibek.types import Entity, Generic_IOC
+
+xml_component = "mks937a"
+
+
+@globalHandler
+def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
+    """
+    XML to YAML specialist convertor function for the mks937a support module
+    """
+    # remove GUI only parameters (except on mks937aGauge which uses it for object ref)
+    if entity_type not in ["mks937aGauge", "mks937a"]:
+        entity.remove("name")
+
+    # mks937aGauge(EGU).id is type: int in the support YAML, but XML encodes
+    # it as a zero-padded string (e.g. "02") which the generic converter
+    # preserves. Coerce to int so ioc.yaml holds a bare integer; the support
+    # YAML re-pads with Jinja (`{{ '%02d' % id }}`) when rendering databases.
+    if entity_type in ("mks937aGauge", "mks937aGaugeEGU") and entity.id is not None:
+        entity.id = int(entity.id)

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/src/builder2ibek/converters/mks937b.py

@@ -20,3 +20,12 @@ def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
         "mks937bCap",
     ):
         entity.remove("name")
+
+    # mks937bGauge.id and mks937b.address are type: int in the support YAML,
+    # but XML encodes them zero-padded ("02", "001") which the generic
+    # converter preserves. Coerce to int; the support YAML re-pads with Jinja
+    # (`{{ '%02d' % id }}`, `{{ '%03d' % address }}`) when rendering.
+    if entity_type == "mks937bGauge" and entity.id is not None:
+        entity.id = int(entity.id)
+    if entity_type == "mks937b" and entity.address is not None:
+        entity.address = int(entity.address)

{builder2ibek-2.0.1 → builder2ibek-2.0.2/src/builder2ibek.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: builder2ibek
-Version: 2.0.1
+Version: 2.0.2
 Summary: Conversion tool for DLS XML builder IOC instances to ibek ioc.yaml
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License
@@ -225,8 +225,9 @@ Dynamic: license-file
 A tool suite for converting DLS XMLbuilder IOC projects to
 [epics-containers](https://github.com/epics-containers) ibek.
 
-Source          | <https://github.com/epics-containers/builder2ibek>
+What            | Where
 :---:           | :---:
+Source          | <https://github.com/epics-containers/builder2ibek>
 PyPI            | `pip install builder2ibek`
 Documentation   | <https://epics-containers.github.io/builder2ibek>
 Releases        | <https://github.com/epics-containers/builder2ibek/releases>

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/src/builder2ibek.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ uv.lock
 .claude/commands/support-create.md
 .claude/commands/support-fix.md
 .claude/commands/support-inspect.md
+.claude/skills/beamline-gui/SKILL.md
 .claude/skills/ibek-concepts/SKILL.md
 .claude/skills/ibek-support-ansible/SKILL.md
 .claude/skills/shared/builder-py-analysis.md
@@ -187,6 +188,7 @@ src/builder2ibek/converters/gdaPlugins.yaml
 src/builder2ibek/converters/globalHandler.py
 src/builder2ibek/converters/harvardSyringe.py
 src/builder2ibek/converters/hidenRGA.py
+src/builder2ibek/converters/insertionDevice.py
 src/builder2ibek/converters/interlock.py
 src/builder2ibek/converters/ipac.py
 src/builder2ibek/converters/keithley6514.py

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/tests/conftest.py

@@ -3,17 +3,14 @@ import subprocess
 from pathlib import Path
 
 import pytest
+from filelock import FileLock
 
 REPO_ROOT = Path(__file__).parent.parent
 DLS_SUPPORT = REPO_ROOT / "ibek-support-dls"
 HAS_DLS_SUPPORT = any(DLS_SUPPORT.glob("*/*.ibek.support.yaml"))
 
 
-@pytest.fixture(scope="session", autouse=True)
-def update_schema(tmp_path_factory):
-    """Regenerate the ibek schema before tests so support YAMLs stay in sync."""
-    if not HAS_DLS_SUPPORT:
-        pytest.skip("ibek-support-dls not available")
+def _run_update_schema(tmp_path_factory):
     env = os.environ.copy()
     # Use a temp dir when /epics is not writable (e.g. CI runners)
     epics_root = Path(env.get("EPICS_ROOT", "/epics"))
@@ -30,6 +27,28 @@ def update_schema(tmp_path_factory):
     assert result.returncode == 0, f"update-schema failed:\n{result.stderr}"
 
 
+@pytest.fixture(scope="session", autouse=True)
+def update_schema(tmp_path_factory, worker_id):
+    """Regenerate the ibek schema before tests so support YAMLs stay in sync.
+
+    With pytest-xdist, every worker wants to run this — but they all write to
+    the same $EPICS_ROOT/ibek-defs, so the classic xdist file-lock pattern
+    runs it exactly once and lets the rest wait for the sentinel.
+    """
+    if not HAS_DLS_SUPPORT:
+        pytest.skip("ibek-support-dls not available")
+    if worker_id == "master":
+        # non-xdist run: just do it
+        _run_update_schema(tmp_path_factory)
+        return
+    shared_tmp = tmp_path_factory.getbasetemp().parent
+    done = shared_tmp / "schema.done"
+    with FileLock(str(shared_tmp / "schema.lock")):
+        if not done.exists():
+            _run_update_schema(tmp_path_factory)
+            done.touch()
+
+
 requires_dls = pytest.mark.skipif(
     not HAS_DLS_SUPPORT,
     reason="ibek-support-dls submodule not available",

{builder2ibek-2.0.1 → builder2ibek-2.0.2}/tests/samples/bl04i-va-ioc-01.yaml

@@ -232,7 +232,7 @@ entities:
     port: ty_42_0
 
   - type: mks937b.mks937b
-    address: '001'
+    address: 1
     device: BL04I-VA-GCTLR-01
     name: GCTLR01
     port: ty_40_5
@@ -240,28 +240,28 @@ entities:
   - type: mks937a.mks937aGauge
     c: 50
     dom: BL04I
-    id: '03'
+    id: 3
     name: GAUGE3
     s: 3
 
   - type: mks937a.mks937aGauge
     c: 50
     dom: BL04I
-    id: '04'
+    id: 4
     name: GAUGE4
     s: 4
 
   - type: mks937a.mks937aGauge
     c: 50
     dom: BL04I
-    id: '05'
+    id: 5
     name: GAUGE5
     s: 5
 
   - type: mks937a.mks937aGauge
     c: 50
     dom: BL04I
-    id: '06'
+    id: 6
     name: GAUGE6
     s: 6
 
@@ -306,13 +306,13 @@ entities:
 
   - type: mks937b.mks937bGauge
     dom: BL04I
-    id: '01'
+    id: 1
     name: GAUGE1
     plog_adc_pv: BL04I-VA-ADC-01:CH1
 
   - type: mks937b.mks937bGauge
     dom: BL04I
-    id: '02'
+    id: 2
     name: GAUGE2
     plog_adc_pv: BL04I-VA-ADC-01:CH2
 
@@ -854,7 +854,7 @@ entities:
     port: ty_40_0
 
   - type: dlsPLC.interlock
-    addr: '07'
+    addr: 7
     desc: Water Flow Interlocks
     device: BL04I-VA-VLVCC-01
     ilk0: I04 Filter
@@ -877,7 +877,7 @@ entities:
     port: ty_40_0
 
   - type: dlsPLC.interlock
-    addr: '09'
+    addr: 9
     desc: Front End Permit
     device: BL04I-VA-VLVCC-01
     ilk0: Waterflows