pymmcore-plus 0.12.0__tar.gz → 0.13.1__tar.gz

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/.gitignore

@@ -139,6 +139,7 @@ cython_debug/
 
 Micro-Manager-*
 .vscode
+.idea
 
 docs/_includes/_cmmcore_members.md
 docs/_includes/_cmmcore_table.md

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pymmcore-plus
-Version: 0.12.0
+Version: 0.13.1
 Summary: pymmcore superset providing improved APIs, event handling, and a pure python acquisition engine
 Project-URL: Source, https://github.com/pymmcore-plus/pymmcore-plus
 Project-URL: Tracker, https://github.com/pymmcore-plus/pymmcore-plus/issues
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Hardware
 Classifier: Topic :: System :: Hardware :: Hardware Drivers
 Classifier: Topic :: Utilities
@@ -29,11 +30,10 @@ Requires-Dist: platformdirs>=3.0.0
 Requires-Dist: psygnal>=0.7
 Requires-Dist: pymmcore>=10.7.0.71.0
 Requires-Dist: rich>=10.2.0
-Requires-Dist: tensorstore
+Requires-Dist: tensorstore; python_version < '3.13'
 Requires-Dist: typer>=0.4.2
 Requires-Dist: typing-extensions
-Requires-Dist: useq-schema>=0.5.0
-Requires-Dist: wrapt>=1.14
+Requires-Dist: useq-schema>=0.6.2
 Provides-Extra: cli
 Requires-Dist: rich>=10.2.0; extra == 'cli'
 Requires-Dist: typer>=0.4.2; extra == 'cli'
@@ -53,9 +53,17 @@ Requires-Dist: mkdocstrings==0.22.0; extra == 'docs'
 Provides-Extra: io
 Requires-Dist: tifffile>=2021.6.14; extra == 'io'
 Requires-Dist: zarr<3,>=2.2; extra == 'io'
+Provides-Extra: pyqt5
+Requires-Dist: pyqt5>=5.15.4; extra == 'pyqt5'
+Provides-Extra: pyqt6
+Requires-Dist: pyqt6<6.8,>=6.4.2; extra == 'pyqt6'
+Provides-Extra: pyside2
+Requires-Dist: pyside2>=5.15; extra == 'pyside2'
+Provides-Extra: pyside6
+Requires-Dist: pyside6<6.8,>=6.4.0; extra == 'pyside6'
 Provides-Extra: test
 Requires-Dist: msgpack; extra == 'test'
-Requires-Dist: msgspec; extra == 'test'
+Requires-Dist: msgspec; (python_version < '3.13') and extra == 'test'
 Requires-Dist: pytest-cov>=4; extra == 'test'
 Requires-Dist: pytest-qt>=4; extra == 'test'
 Requires-Dist: pytest>=7.3.2; extra == 'test'

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/pyproject.toml

@@ -28,6 +28,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: System :: Hardware",
     "Topic :: System :: Hardware :: Hardware Drivers",
     "Topic :: Utilities",
@@ -38,10 +39,9 @@ dependencies = [
     "numpy >=1.17.3",
     "psygnal >=0.7",
     "pymmcore >=10.7.0.71.0",
-    "typing-extensions",      # not actually required at runtime
-    "useq-schema >=0.5.0",
-    "wrapt >=1.14",
-    "tensorstore",
+    "typing-extensions",                    # not actually required at runtime
+    "useq-schema >=0.6.2",
+    "tensorstore; python_version < '3.13'",
     # cli requirements included by default for now
     "typer >=0.4.2",
     "rich >=10.2.0",
@@ -52,8 +52,12 @@ dependencies = [
 [project.optional-dependencies]
 cli = ["typer >=0.4.2", "rich >=10.2.0"]
 io = ["tifffile >=2021.6.14", "zarr >=2.2,<3"]
+PySide2 = ["PySide2 >=5.15"]
+PySide6 = ["PySide6 >=6.4.0,<6.8"]
+PyQt5 = ["PyQt5 >=5.15.4"]
+PyQt6 = ["PyQt6 >=6.4.2,<6.8"]
 test = [
-    "msgspec",
+    "msgspec; python_version < '3.13'",
     "msgpack",
     "pytest-cov >=4",
     "pytest-qt >=4",
@@ -98,7 +102,7 @@ include = ["/src", "/tests"]
 only-include = ["src"]
 sources = ["src"]
 
-# https://beta.ruff.rs/docs/rules/
+# https://docs.astral.sh/ruff/rules/
 [tool.ruff]
 line-length = 88
 target-version = "py39"
@@ -117,7 +121,7 @@ select = [
     "A001", # flake8-builtins
     "RUF",  # ruff-specific rules
     "TID",  # tidy
-    "TCH",  # typecheck
+    "TC",   # typecheck
     "SLF",  # private-access
 ]
 ignore = [
@@ -141,6 +145,7 @@ docstring-code-format = true
 minversion = "6.0"
 testpaths = ["tests"]
 filterwarnings = ["error", "ignore:Failed to disconnect::pytestqt"]
+markers = ["run_last: mark a test to run last"]
 
 # https://mypy.readthedocs.io/en/stable/config_file.html
 [tool.mypy]
@@ -151,6 +156,9 @@ disallow_subclassing_any = false
 show_error_codes = true
 pretty = true
 plugins = "pydantic.mypy"
+# see https://github.com/python/mypy/issues/5374 and related discussions
+# it causes more pain than it solves
+disable_error_code = ["type-abstract"]
 
 [[tool.mypy.overrides]]
 module = ["tests.*"]
@@ -185,4 +193,4 @@ ignore = [
 ]
 
 [tool.typos.default]
-extend-ignore-identifiers-re = ["(?i)nd2?.*", "(?i)ome"]
+extend-ignore-identifiers-re = ["(?i)nd2?.*", "(?i)ome", "anager"]

pymmcore_plus-0.13.1/src/pymmcore_plus/_benchmark.py

@@ -0,0 +1,203 @@
+from __future__ import annotations
+
+import timeit
+import warnings
+from typing import TYPE_CHECKING
+
+from pymmcore_plus import CMMCorePlus, DeviceType
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator, Sequence
+
+    from pymmcore_plus.core._device import Device
+
+
+class Benchmark:
+    device_type = DeviceType.Camera
+
+    def __init__(self, core: CMMCorePlus, label: str = "") -> None:
+        self.core = core
+        self.label = label
+
+    def setup(self) -> None:
+        pass
+
+    def device(self) -> Device | None:
+        if self.label is not None:
+            return self.core.getDeviceObject(self.label)
+        return None
+
+    def run(self, number: int) -> Iterator[tuple[str, float | str]]:
+        # get methods in the order of definition, in reverse MRO order
+
+        try:
+            self.setup()
+        except Exception as e:  # pragma: no cover
+            warnings.warn(
+                f"Setup failed on device {self.label!r}: {e}",
+                RuntimeWarning,
+                stacklevel=2,
+            )
+            return
+
+        methods: list[str] = []
+        for base in reversed(type(self).mro()):
+            methods.extend(m for m in base.__dict__ if m.startswith("bench_"))
+
+        for method_name in methods:
+            try:
+                t = timeit.timeit(getattr(self, method_name), number=number)
+                result: float | str = round(1000 * t / number, 3)
+            except Exception as e:
+                result = str(e)
+            yield method_name[6:], result
+
+
+class CoreBenchmark(Benchmark):
+    device_type = DeviceType.Core
+
+    def bench_getDeviceAdapterNames(self) -> None:
+        self.core.getDeviceAdapterNames()
+
+    def bench_getLoadedDevices(self) -> None:
+        self.core.getLoadedDevices()
+
+    def bench_getSystemState(self) -> None:
+        self.core.getSystemState()
+
+
+class CameraBenchmark(Benchmark):
+    device_type = DeviceType.Camera
+
+    def setup(self) -> None:
+        self.core.setCameraDevice(self.label)
+        self.core.setExposure(self.label, 1)
+
+    def bench_getMultiROI(self) -> None:
+        self.core.getMultiROI()
+
+    def bench_getExposure(self) -> None:
+        self.core.getExposure(self.label)
+
+    def bench_snapImage(self) -> None:
+        self.core.snapImage()
+
+    def bench_getImage(self) -> None:
+        self.core.getImage()
+
+    def bench_getImageWidth(self) -> None:
+        self.core.getImageWidth()
+
+    def bench_getImageHeight(self) -> None:
+        self.core.getImageHeight()
+
+    def bench_getImageBufferSize(self) -> None:
+        self.core.getImageBufferSize()
+
+    def bench_getImageBitDepth(self) -> None:
+        self.core.getImageBitDepth()
+
+    def bench_getNumberOfComponents(self) -> None:
+        self.core.getNumberOfComponents()
+
+    def bench_getNumberOfCameraChannels(self) -> None:
+        self.core.getNumberOfCameraChannels()
+
+
+class XYStageBenchmark(Benchmark):
+    device_type = DeviceType.XYStage
+
+    def setup(self) -> None:
+        self.core.setXYStageDevice(self.label)
+        self.position = self.core.getXYPosition(self.label)
+
+    def bench_getXYPosition(self) -> None:
+        self.core.getXYPosition(self.label)
+
+    def bench_getXPosition(self) -> None:
+        self.core.getXPosition(self.label)
+
+    def bench_getYPosition(self) -> None:
+        self.core.getYPosition(self.label)
+
+    def bench_setXYPosition(self) -> None:
+        self.core.setXYPosition(self.label, *self.position)
+
+    def bench_setRelativeXYPosition(self) -> None:
+        self.core.setRelativeXYPosition(self.label, 0, 0)
+
+    def bench_isXYStageSequenceable(self) -> None:
+        self.core.isXYStageSequenceable(self.label)
+
+
+class StageBenchmark(Benchmark):
+    device_type = DeviceType.Stage
+
+    def setup(self) -> None:
+        self.position = self.core.getPosition(self.label)
+
+    def bench_getPosition(self) -> None:
+        self.core.getPosition(self.label)
+
+    def bench_setPosition(self) -> None:
+        self.core.setPosition(self.label, self.position)
+
+    def bench_setRelativePosition(self) -> None:
+        self.core.setRelativePosition(self.label, 0)
+
+    def bench_isStageSequenceable(self) -> None:
+        self.core.isStageSequenceable(self.label)
+
+    def bench_isStageLinearSequenceable(self) -> None:
+        self.core.isStageLinearSequenceable(self.label)
+
+
+class StateBenchmark(Benchmark):
+    device_type = DeviceType.State
+
+    def setup(self) -> None:
+        self.initial_state = self.core.getState(self.label)
+        try:
+            self.labels: Sequence[str] = self.core.getStateLabels(self.label)
+        except Exception:
+            self.labels = []
+
+    def bench_getState(self) -> None:
+        self.core.getState(self.label)
+
+    def bench_setState(self) -> None:
+        self.core.setState(self.label, self.initial_state)
+
+    def bench_getNumberOfStates(self) -> None:
+        self.core.getNumberOfStates(self.label)
+
+    def bench_getStateLabel(self) -> None:
+        self.core.getStateLabel(self.label)
+
+    def bench_getStateFromLabel(self) -> None:
+        for label in self.labels:
+            self.core.getStateFromLabel(self.label, label)
+
+
+def benchmark_core_and_devices(
+    core: CMMCorePlus, number: int = 100
+) -> Iterable[Device | None | tuple[str, float | str]]:
+    """Take an initialized core with devices and benchmark various methods.
+
+    Yields
+    ------
+    Device | None | tuple[str, float | str]
+        If a `Device`, it is the device object being benchmarked.
+        If None, it is the core object being benchmarked.
+        If a tuple, it is the method name and the time taken to run it.
+    """
+    for cls in Benchmark.__subclasses__():
+        if cls.device_type == DeviceType.Core:
+            bench = cls(core, "Core")
+            yield bench.device()
+            yield from bench.run(number)
+        else:
+            for dev in core.getLoadedDevicesOfType(cls.device_type):
+                bench = cls(core, dev)
+                yield bench.device()
+                yield from bench.run(number)

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/_cli.py

@@ -8,6 +8,9 @@ from contextlib import suppress
 from pathlib import Path
 from typing import Optional, Union, cast
 
+from pymmcore_plus.core._device import Device
+from pymmcore_plus.core._mmcore_plus import CMMCorePlus
+
 try:
     import typer
     from rich import print
@@ -28,14 +31,31 @@ app = typer.Typer(name="mmcore", no_args_is_help=True)
 
 def _show_version_and_exit(value: bool) -> None:
     if value:
-        import pymmcore
-
         typer.echo(f"pymmcore-plus v{pymmcore_plus.__version__}")
-        typer.echo(f"pymmcore v{pymmcore.__version__}")
-        typer.echo(f"MMCore v{pymmcore.CMMCore().getAPIVersionInfo()}")
+        try:
+            import pymmcore_nano as pymmcore
+
+            typer.echo(f"pymmcore-nano v{pymmcore.__version__}")
+        except ImportError:
+            import pymmcore
+
+            typer.echo(f"pymmcore v{pymmcore.__version__}")
+        typer.echo(f"MMCore v{pymmcore.CMMCore().getVersionInfo()}")
+        typer.echo(f"{pymmcore.CMMCore().getAPIVersionInfo()}")
         raise typer.Exit()
 
 
+CONFIG_PARAM = typer.Option(
+    None,
+    "-c",
+    "--config",
+    dir_okay=False,
+    exists=True,
+    resolve_path=True,
+    help="Path to Micro-Manager system configuration file.",
+)
+
+
 @app.callback()
 def _main(
     version: Optional[bool] = typer.Option(
@@ -168,15 +188,7 @@ def run(
         resolve_path=True,
         help="Path to useq-schema file.",
     ),
-    config: Optional[Path] = typer.Option(
-        None,
-        "-c",
-        "--config",
-        dir_okay=False,
-        exists=True,
-        resolve_path=True,
-        help="Path to Micro-Manager system configuration file.",
-    ),
+    config: Optional[Path] = CONFIG_PARAM,
     z_go_up: Optional[bool] = typer.Option(None, help="Acquire from bottom to top."),
     z_top: Optional[float] = typer.Option(None, help="Top of z-stack."),
     z_bottom: Optional[float] = typer.Option(None, help="Bottom of z-stack."),
@@ -423,5 +435,58 @@ def _tail_file(file_path: Union[str, Path], interval: float = 0.1) -> None:
             time.sleep(1)
 
 
+@app.command()
+def bench(
+    config: Optional[Path] = CONFIG_PARAM,
+    number: int = typer.Option(
+        10, "-n", "--number", help="Number of iterations for each test."
+    ),
+) -> None:
+    """Run a benchmark of Core and Devices loaded with `config` (or Demo)."""
+    from rich.console import Console
+    from rich.live import Live
+    from rich.table import Table
+
+    from pymmcore_plus._benchmark import benchmark_core_and_devices
+
+    console = Console()
+
+    core = CMMCorePlus()
+    if config is not None:
+        console.log(
+            f"Loading config {config} ...",
+            style="bright_blue",
+            end="",
+        )
+        core.loadSystemConfiguration(str(config))
+    else:
+        console.log("Loading DEMO configuration ...", style="bright_blue", end="")
+        core.loadSystemConfiguration()
+    console.log("Loaded.", style="bright_blue")
+
+    table = Table()
+    table.add_column("Method")
+    table.add_column("Time (ms)")
+
+    with Live(table, console=console, refresh_per_second=4):
+        for item in benchmark_core_and_devices(core, number):
+            if item is None:
+                table.add_row("Device: Core", "------", style="yellow")
+            elif isinstance(item, Device):
+                console.print(
+                    f"Measuring ({item.type()}) Device: "
+                    f"{item.label!r} <{item.library()}::{item.name()}>"
+                    f": {item.description()}",
+                    style="#333333",
+                )
+                table.add_row(f"Device: {item.label}", "------", style="yellow")
+            else:
+                method, time = item
+                if isinstance(time, float):
+                    table.add_row(method, f"{time:.4f}")
+                else:
+                    table.add_row(method, str(time), style="red")
+
+
 def main() -> None:  # pragma: no cover
     app()

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/_logger.py

@@ -118,9 +118,17 @@ def configure_logging(
 
     # automatically log to stderr
     if log_to_stderr and sys.stderr:
-        stderr_handler = logging.StreamHandler(sys.stderr)
+        # try to use rich for stderr logging
+        # fallback to plain text if rich is not installed
+        try:
+            from rich.logging import RichHandler
+
+            stderr_handler: logging.Handler = RichHandler()
+        except ImportError:
+            stderr_handler = logging.StreamHandler(sys.stderr)
+            stderr_handler.setFormatter(CustomFormatter())
+
         stderr_handler.setLevel(stderr_level)
-        stderr_handler.setFormatter(CustomFormatter())
         logger.addHandler(stderr_handler)
 
     # automatically log to file

pymmcore_plus-0.13.1/src/pymmcore_plus/_pymmcore.py

@@ -0,0 +1,12 @@
+"""Internal module to choose between pymmcore and pymmcore-nano."""
+
+try:
+    from pymmcore_nano import *  # noqa F403
+    from pymmcore_nano import __version__
+
+    BACKEND = "pymmcore-nano"
+except ImportError:
+    from pymmcore import *  # noqa F403
+    from pymmcore import __version__  # noqa F401
+
+    BACKEND = "pymmcore"

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/_util.py

@@ -39,7 +39,7 @@ except ImportError:
     from contextlib import nullcontext as no_stdout
 
 
-__all__ = ["find_micromanager", "retry", "no_stdout", "signals_backend"]
+__all__ = ["find_micromanager", "no_stdout", "retry", "signals_backend"]
 
 APP_NAME = "pymmcore-plus"
 USER_DATA_DIR = Path(user_data_dir(appname=APP_NAME))
@@ -418,13 +418,10 @@ def _sorted_rows(data: dict, sort: str | None) -> list[tuple]:
     """Return a list of rows, sorted by the given column name."""
     rows = list(zip(*data.values()))
     if sort is not None:
-        try:
+        with suppress(ValueError):
+            # silently ignore if the sort column is not found
             sort_idx = [x.lower() for x in data].index(sort.lower())
-        except ValueError:  # pragma: no cover
-            raise ValueError(
-                f"invalid sort column: {sort!r}. Must be one of {list(data)}"
-            ) from None
-        rows.sort(key=lambda x: x[sort_idx])
+            rows.sort(key=lambda x: x[sort_idx])
     return rows
 
 
@@ -550,16 +547,25 @@ def system_info() -> dict[str, str]:
 
     This backs the `mmcore info` command in the CLI.
     """
-    import pymmcore
-
     import pymmcore_plus
 
     info = {
         "python": sys.version,
         "platform": platform.platform(),
         "pymmcore-plus": getattr(pymmcore_plus, "__version__", "err"),
-        "pymmcore": getattr(pymmcore, "__version__", "err"),
     }
+    try:
+        import pymmcore
+
+        info["pymmcore"] = getattr(pymmcore, "__version__", "err")
+    except ImportError:
+        info["pymmcore"] = ""
+    try:
+        import pymmcore_nano
+
+        info["pymmcore-nano"] = getattr(pymmcore_nano, "__version__", "err")
+    except ImportError:
+        info["pymmcore-nano"] = ""
 
     with suppress(Exception):
         core = pymmcore_plus.CMMCorePlus.instance()

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/core/__init__.py

@@ -18,6 +18,8 @@ __all__ = [
     "PixelFormat",
     "PortType",
     "PropertyType",
+    "SequencedEvent",
+    "iter_sequenced_events",
 ]
 
 from ._adapter import DeviceAdapter
@@ -41,3 +43,4 @@ from ._device import Device
 from ._metadata import Metadata
 from ._mmcore_plus import CMMCorePlus
 from ._property import DeviceProperty
+from ._sequencing import SequencedEvent, iter_sequenced_events

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/core/_config.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections import defaultdict
 from typing import TYPE_CHECKING, Any, overload
 
-import pymmcore
+import pymmcore_plus._pymmcore as pymmcore
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Iterator

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/core/_config_group.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections.abc import Iterator, MutableMapping
 from typing import TYPE_CHECKING, Any, Literal, overload
 
-import pymmcore
+import pymmcore_plus._pymmcore as pymmcore
 
 from ._config import Configuration
 from ._property import DeviceProperty
@@ -73,7 +73,7 @@ class ConfigGroup(MutableMapping[str, Configuration]):
     def __getitem__(self, configName: str) -> Configuration:
         try:
             return self._mmc.getConfigData(self._name, configName)
-        except ValueError as e:
+        except (ValueError, RuntimeError) as e:
             if configName not in self:
                 raise KeyError(
                     f"Group {self._name!r} does not have a config {configName!r}"

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/core/_constants.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from enum import Enum, IntEnum
-from typing import Literal
+from enum import Enum, IntEnum, auto
+from typing import Any, Literal
 
-import pymmcore
+import pymmcore_plus._pymmcore as pymmcore
 
 # NOTE: by using pymmcore.attributes, we guarantee that the values are the same
 # however, we also risk AttributeErrors in the future.
@@ -157,6 +157,7 @@ class PropertyType(IntEnum):
     String = pymmcore.String
     Float = pymmcore.Float
     Integer = pymmcore.Integer
+    Boolean = auto()  # not supported in pymmcore
 
     def to_python(self) -> type | None:
         return {0: None, 1: str, 2: float, 3: int}[self]
@@ -167,6 +168,29 @@ class PropertyType(IntEnum):
     def __repr__(self) -> Literal["undefined", "float", "int", "str"]:
         return getattr(self.to_python(), "__name__", "undefined")
 
+    @classmethod
+    def create(cls, value: Any) -> PropertyType:
+        if isinstance(value, PropertyType):
+            return value
+        if value is None:
+            return PropertyType.Undef
+        if isinstance(value, str):
+            return PropertyType[value.lower().capitalize()]
+        if isinstance(value, type):
+            if value is float:
+                return PropertyType.Float
+            elif value is int:
+                return PropertyType.Integer
+            elif value is str:
+                return PropertyType.String
+            elif value is bool:
+                return PropertyType.Boolean
+
+        raise TypeError(
+            f"Property type must be a PropertyType enum member, "
+            f"a string, or a type. Got: {type(value)}"
+        )
+
 
 class ActionType(IntEnum):
     NoAction = pymmcore.NoAction

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/core/_device.py

@@ -43,12 +43,12 @@ class Device:
     >>> device.schema()  # JSON schema of device properties
     """
 
-    UNASIGNED = "__UNASIGNED__"
+    UNASSIGNED = "__UNASSIGNED__"
     propertyChanged: PSignalInstance
 
     def __init__(
         self,
-        device_label: str = UNASIGNED,
+        device_label: str = UNASSIGNED,
         mmcore: CMMCorePlus | None = None,
         adapter_name: str = "",
         device_name: str = "",
@@ -162,7 +162,7 @@ class Device:
             raise TypeError("Must specify device_name")
         if device_label:
             self.label = device_label
-        elif self.label == self.UNASIGNED:
+        elif self.label == self.UNASSIGNED:
             self.label = f"{adapter_name}-{device_name}"
 
         self._mmc.loadDevice(self.label, adapter_name, device_name)
@@ -208,7 +208,7 @@ class Device:
     def __repr__(self) -> str:
         if self.isLoaded():
             n = len(self.propertyNames())
-            props = f'{n} {"properties" if n>1 else "property"}'
+            props = f"{n} {'properties' if n > 1 else 'property'}"
             lib = f"({self.library()}::{self.name()}) "
         else:
             props = "NOT LOADED"

{pymmcore_plus-0.12.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/core/_metadata.py

@@ -4,7 +4,7 @@ from collections.abc import ItemsView, Iterator, KeysView, Mapping, ValuesView
 from types import new_class
 from typing import Any, cast
 
-import pymmcore
+import pymmcore_plus._pymmcore as pymmcore
 
 _NULL = object()