Add PVAccess information to Table records

.github/workflows/code.yml

@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python: ["3.9", "3.10", "3.11"]
+        python: ["3.9", "3.10"] # Disable 3.11 until this is fixed:https://github.com/PandABlocks/PandABlocks-client/issues/47
         install: ["-e .[dev]"]
         # Make one version be non-editable to test both paths of version code
         include:

.gitignore

@@ -66,4 +66,3 @@ venv*
 
 # further build artifacts
 lockfiles/
-

.vscode/launch.json

@@ -12,7 +12,8 @@
             "args": [
                 "softioc",
                 "172.23.252.201",
-                "SOME-PREFIX"
+                "SOME-PREFIX",
+                "./screens"
             ],
             "console": "integratedTerminal",
             "justMyCode": false

pyproject.toml

@@ -17,10 +17,9 @@ dependencies = [
     "numpy",
     "click",
     "h5py",
-    "softioc>=4.1.0",
+    "softioc>=4.3.0",
     "pandablocks>=0.3.1",
     "pvi[cli]>=0.4",
-    "aiohttp",
 ] # Add project dependencies here, e.g. ["click", "numpy"]
 dynamic = ["version"]
 license.file = "LICENSE"
@@ -37,6 +36,7 @@ dev = [
     "Flake8-pyproject",
     "pipdeptree",
     "pre-commit",
+    "p4p",
     "pydata-sphinx-theme>=0.12",
     "pytest-asyncio",
     "pytest-cov",
@@ -88,19 +88,25 @@ addopts = """
     --cov=pandablocks_ioc --cov-report term --cov-report xml:cov.xml
     """
 # https://iscinumpy.gitlab.io/post/bound-version-constraints/#watch-for-warnings
-# The ignores are all related to the test DummyServer, both async and in_thread variants, 
+# First ignore is due to p4p staticly linking an old numpy version and us installing
+# Next is something that needs to be fixed in PandABlocks-client asyncio.py's write_and_drain function
+# which triggers a deprecation warning on Python 3.9+. See https://github.com/PandABlocks/PandABlocks-client/issues/47.
+# a more recent version with a different C API. See https://github.com/mdavidsaver/p4p/issues/102.
+# Remaining ignores are all related to the test DummyServer, both async and in_thread variants, 
 # which appear to have issues cleanly shutting down and raise exceptions in their destructors.
 # The issue seems like all we need is to add await asyncio.sleep(0) to allow asyncio to
 # clean up its connections, but that doesn't seem to behave as expected inside pytest.
 filterwarnings = """
     error
+    ignore:numpy.ufunc size changed
+    ignore:The explicit passing of coroutine objects to asyncio.wait()
     ignore:unclosed transport <_SelectorSocketTransport:
     ignore:unclosed <socket.socket:
     ignore:unclosed event loop <_UnixSelectorEventLoop:
 """
-# ignore::ResourceWarning
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests"
+asyncio_mode = "auto"
 
 [tool.coverage.run]
 data_file = "/tmp/pandablocks_ioc.coverage"

src/pandablocks_ioc/__main__.py

@@ -31,11 +31,13 @@ def cli(ctx, log_level: str):
 @cli.command()
 @click.argument("host")
 @click.argument("prefix")
-def softioc(host: str, prefix: str):
+@click.argument("screens_dir")
+def softioc(host: str, prefix: str, screens_dir: str):
     """
-    Create a soft IOC, using "prefix" for the namespace of the records.
+    Connect to the given HOST and create an IOC with the given PREFIX.
+    Create .bob files for screens in the SCREENS_DIR. Directory must exist.
     """
-    create_softioc(host, prefix)
+    create_softioc(host=host, record_prefix=prefix, screens_dir=screens_dir)
 
 
 # test with: python -m pandablocks_ioc

src/pandablocks_ioc/_pvi.py

@@ -1,5 +1,4 @@
 import logging
-import tempfile
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
@@ -139,9 +138,13 @@ def add_positions_table_row(
 class Pvi:
     """TODO: Docs"""
 
-    # pvi_info_dict: Dict[EpicsName, PviInfo] = {}
+    _screens_dir: Path = Path()
     pvi_info_dict: Dict[str, Dict[PviGroup, List[Component]]] = {}
-    bob_file_dict: Dict[str, str] = {}
+
+    @staticmethod
+    def set_screens_dir(screens_dir: str):
+        Pvi._screens_dir = Path(screens_dir)
+        assert Pvi._screens_dir.is_dir(), "Screens directory must exist"
 
     @staticmethod
     def add_pvi_info(record_name: EpicsName, group: PviGroup, component: Component):
@@ -206,22 +209,19 @@ def create_pvi_records(record_prefix: str):
         # Create top level Device, with references to all child Devices
         device_refs = [DeviceRef(x, x) for x in pvi_records]
 
-        # # TODO: What should the label be?
         device = Device("TOP", device_refs)
         devices.append(device)
 
         # TODO: label widths need some tweaking - some are pretty long right now
+        # TODO: Need to decide how to handle already existing directory/files.
+        # Could still be left over stuff from a previous run?
         formatter = DLSFormatter(label_width=250)
-        with tempfile.TemporaryDirectory() as temp_dir:
-            for device in devices:
-                try:
-                    formatter.format(
-                        device,
-                        record_prefix + ":",
-                        Path(f"{temp_dir}/{device.label}.bob"),
-                    )
-                    with open(f"{temp_dir}/{device.label}.bob") as f:
-                        Pvi.bob_file_dict.update({f"{device.label}.bob": f.read()})
-
-                except NotImplementedError:
-                    logging.exception("Cannot create TABLES yet")
+        for device in devices:
+            try:
+                formatter.format(
+                    device,
+                    record_prefix + ":",
+                    Pvi._screens_dir / Path(f"{device.label}.bob"),
+                )
+            except NotImplementedError:
+                logging.exception("Cannot create TABLES yet")