apsbits 1.0.5__tar.gz → 2.0.0__tar.gz

{apsbits-1.0.5 → apsbits-2.0.0}/.github/workflows/code.yml

@@ -20,9 +20,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 
@@ -51,7 +51,7 @@ jobs:
       DISPLAY: ":99.0"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install OS libraries to test Linux PyQt apps
         run: |

{apsbits-1.0.5 → apsbits-2.0.0}/.github/workflows/docs.yml

@@ -50,11 +50,11 @@ jobs:
       run: echo "TZ=America/Chicago" >> "$GITHUB_ENV"
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0 # required for push to dest repo
 
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
           python-version: "3.11"
 

{apsbits-1.0.5 → apsbits-2.0.0}/.github/workflows/pypi.yml

@@ -18,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 

{apsbits-1.0.5 → apsbits-2.0.0}/.gitignore

@@ -176,3 +176,9 @@ existing_plans_and_devices.yaml
 
 # Local Run Engine metadata dictionary
 .re_md_dict.yml
+
+# Test/deleted artifacts
+.deleted/
+
+# Claude Code context files
+CLAUDE.md

{apsbits-1.0.5 → apsbits-2.0.0}/HISTORY.rst

@@ -84,6 +84,31 @@ Maintenance
 * adding install docs given new workflow
 * Feature/API_functionalities and Makedevices
 
+    Breaking Changes
+    ----------------
+
+    * **Callback file renaming**: Demo callback files renamed to follow `_demo` naming convention:
+
+      * ``nexus_data_file_writer.py`` → ``demo_nexus_callback.py``
+      * ``spec_data_file_writer.py`` → ``demo_spec_callback.py``
+
+      Import paths updated in startup.py. Direct imports of these modules will need updating.
+
+    * **DM plans removed**: The ``dm_plans.py`` file has been removed to reduce apstools dependency.
+      DM configuration infrastructure remains in iconfig.yml and startup.py.
+
+    * **StoredDict implementation**: Now uses local implementation instead of ``apstools.utils.StoredDict``.
+      This reduces external dependencies while maintaining full compatibility.
+
+    Enhancements
+    ------------
+
+    * **Improved error handling**: Enhanced error messages with specific exception types and detailed context across core modules (device loading, configuration parsing, RunEngine initialization, databroker catalog setup).
+
+    * **Complete type annotations**: Added comprehensive type annotations to all public APIs for better IDE support and code maintainability.
+
+    * **Code quality improvements**: Added ``py.typed`` marker for mypy support and improved code formatting compliance.
+
 1.0.1
 #####
 

{apsbits-1.0.5 → apsbits-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apsbits
-Version: 1.0.5
+Version: 2.0.0
 Summary: Model of a Bluesky Data Acquisition Instrument in console, notebook, & queueserver.
 Author-email: Eric Codrea <ecodrea@anl.gov>, Pete Jemian <prjemian+instrument@gmail.com>, Rafael Vescovi <rvescovi@anl.gov>
 Maintainer-email: Eric Codrea <ecodrea@anl.gov>, Pete Jemian <prjemian+instrument@gmail.com>, Rafael Vescovi <rvescovi@anl.gov>
@@ -17,25 +17,27 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apstools>=1.7.2
-Requires-Dist: bluesky-queueserver-api
+Requires-Dist: apstools
 Requires-Dist: bluesky-queueserver>=0.0.22
+Requires-Dist: bluesky-queueserver-api
 Requires-Dist: bluesky-widgets
 Requires-Dist: bluesky
 Requires-Dist: caproto
 Requires-Dist: databroker==1.2.5
-Requires-Dist: guarneri
+Requires-Dist: guarneri>=0.4.0
 Requires-Dist: ipython
 Requires-Dist: jupyterlab
+Requires-Dist: matplotlib
+Requires-Dist: ophyd-async
 Requires-Dist: ophyd-registry
 Requires-Dist: ophyd
 Requires-Dist: PyQt5>5.15
 Requires-Dist: pyRestTable
 Requires-Dist: pysumreg
 Requires-Dist: qtpy
-Requires-Dist: toml
-Requires-Dist: tomli
+Requires-Dist: tiled[all]
 Requires-Dist: tomli-w
+Requires-Dist: tomli
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: isort; extra == "dev"
@@ -59,6 +61,7 @@ Requires-Dist: sphinx-tabs; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: graphviz; extra == "doc"
 Requires-Dist: dot; extra == "doc"
+Requires-Dist: tomli-w; extra == "doc"
 Provides-Extra: all
 Requires-Dist: apsbits[dev,doc]; extra == "all"
 Dynamic: license-file

{apsbits-1.0.5 → apsbits-2.0.0}/apsbits.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apsbits
-Version: 1.0.5
+Version: 2.0.0
 Summary: Model of a Bluesky Data Acquisition Instrument in console, notebook, & queueserver.
 Author-email: Eric Codrea <ecodrea@anl.gov>, Pete Jemian <prjemian+instrument@gmail.com>, Rafael Vescovi <rvescovi@anl.gov>
 Maintainer-email: Eric Codrea <ecodrea@anl.gov>, Pete Jemian <prjemian+instrument@gmail.com>, Rafael Vescovi <rvescovi@anl.gov>
@@ -17,25 +17,27 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apstools>=1.7.2
-Requires-Dist: bluesky-queueserver-api
+Requires-Dist: apstools
 Requires-Dist: bluesky-queueserver>=0.0.22
+Requires-Dist: bluesky-queueserver-api
 Requires-Dist: bluesky-widgets
 Requires-Dist: bluesky
 Requires-Dist: caproto
 Requires-Dist: databroker==1.2.5
-Requires-Dist: guarneri
+Requires-Dist: guarneri>=0.4.0
 Requires-Dist: ipython
 Requires-Dist: jupyterlab
+Requires-Dist: matplotlib
+Requires-Dist: ophyd-async
 Requires-Dist: ophyd-registry
 Requires-Dist: ophyd
 Requires-Dist: PyQt5>5.15
 Requires-Dist: pyRestTable
 Requires-Dist: pysumreg
 Requires-Dist: qtpy
-Requires-Dist: toml
-Requires-Dist: tomli
+Requires-Dist: tiled[all]
 Requires-Dist: tomli-w
+Requires-Dist: tomli
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: isort; extra == "dev"
@@ -59,6 +61,7 @@ Requires-Dist: sphinx-tabs; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: graphviz; extra == "doc"
 Requires-Dist: dot; extra == "doc"
+Requires-Dist: tomli-w; extra == "doc"
 Provides-Extra: all
 Requires-Dist: apsbits[dev,doc]; extra == "all"
 Dynamic: license-file

{apsbits-1.0.5 → apsbits-2.0.0}/apsbits.egg-info/SOURCES.txt

@@ -42,18 +42,16 @@ docs/source/api/utils.rst
 docs/source/api/generated/apsbits.core.best_effort_init.rst
 docs/source/api/generated/apsbits.core.catalog_init.rst
 docs/source/api/generated/apsbits.core.run_engine_init.rst
-docs/source/api/generated/apsbits.demo_instrument.callbacks.nexus_data_file_writer.rst
+docs/source/api/generated/apsbits.demo_instrument.callbacks.demo_nexus_callback.rst
+docs/source/api/generated/apsbits.demo_instrument.callbacks.demo_spec_callback.rst
 docs/source/api/generated/apsbits.demo_instrument.callbacks.rst
-docs/source/api/generated/apsbits.demo_instrument.callbacks.spec_data_file_writer.rst
 docs/source/api/generated/apsbits.demo_instrument.configs.rst
 docs/source/api/generated/apsbits.demo_instrument.devices.rst
-docs/source/api/generated/apsbits.demo_instrument.plans.dm_plans.rst
 docs/source/api/generated/apsbits.demo_instrument.plans.rst
 docs/source/api/generated/apsbits.demo_instrument.plans.sim_plans.rst
 docs/source/api/generated/apsbits.demo_instrument.rst
 docs/source/api/generated/apsbits.demo_instrument.startup.rst
 docs/source/api/generated/apsbits.demo_qserver.rst
-docs/source/api/generated/apsbits.utils.aps_functions.rst
 docs/source/api/generated/apsbits.utils.config_loaders.rst
 docs/source/api/generated/apsbits.utils.controls_setup.rst
 docs/source/api/generated/apsbits.utils.helper_functions.rst
@@ -79,6 +77,7 @@ docs/source/guides/startup.rst
 docs/source/guides/template_creation.rst
 src/apsbits/__init__.py
 src/apsbits/_version.py
+src/apsbits/py.typed
 src/apsbits/api/__init__.py
 src/apsbits/api/create_new_instrument.py
 src/apsbits/api/delete_instrument.py
@@ -93,8 +92,8 @@ src/apsbits/demo_instrument/README.md
 src/apsbits/demo_instrument/__init__.py
 src/apsbits/demo_instrument/startup.py
 src/apsbits/demo_instrument/callbacks/__init__.py
-src/apsbits/demo_instrument/callbacks/nexus_data_file_writer.py
-src/apsbits/demo_instrument/callbacks/spec_data_file_writer.py
+src/apsbits/demo_instrument/callbacks/demo_nexus_callback.py
+src/apsbits/demo_instrument/callbacks/demo_spec_callback.py
 src/apsbits/demo_instrument/configs/__init__.py
 src/apsbits/demo_instrument/configs/devices.yml
 src/apsbits/demo_instrument/configs/devices_aps_only.yml
@@ -102,13 +101,12 @@ src/apsbits/demo_instrument/configs/extra_logging.yml
 src/apsbits/demo_instrument/configs/iconfig.yml
 src/apsbits/demo_instrument/devices/__init__.py
 src/apsbits/demo_instrument/plans/__init__.py
-src/apsbits/demo_instrument/plans/dm_plans.py
 src/apsbits/demo_instrument/plans/sim_plans.py
+src/apsbits/demo_instrument/qserver/qs-config.yml
+src/apsbits/demo_instrument/qserver/user_group_permissions.yaml
 src/apsbits/demo_instrument/suspenders/__init__.py
 src/apsbits/demo_instrument/utils/__init__.py
-src/apsbits/demo_qserver/qs-config.yml
-src/apsbits/demo_qserver/qs_host.sh
-src/apsbits/demo_qserver/user_group_permissions.yaml
+src/apsbits/demo_scripts/qs_host.sh
 src/apsbits/tests/__init__.py
 src/apsbits/tests/conftest.py
 src/apsbits/tests/test_config.py

{apsbits-1.0.5 → apsbits-2.0.0}/apsbits.egg-info/requires.txt

@@ -1,22 +1,24 @@
-apstools>=1.7.2
-bluesky-queueserver-api
+apstools
 bluesky-queueserver>=0.0.22
+bluesky-queueserver-api
 bluesky-widgets
 bluesky
 caproto
 databroker==1.2.5
-guarneri
+guarneri>=0.4.0
 ipython
 jupyterlab
+matplotlib
+ophyd-async
 ophyd-registry
 ophyd
 PyQt5>5.15
 pyRestTable
 pysumreg
 qtpy
-toml
-tomli
+tiled[all]
 tomli-w
+tomli
 
 [all]
 apsbits[dev,doc]
@@ -45,3 +47,4 @@ sphinx-tabs
 sphinx
 graphviz
 dot
+tomli-w

apsbits-2.0.0/docs/source/api/generated/apsbits.demo_instrument.callbacks.demo_nexus_callback.rst

@@ -0,0 +1,17 @@
+apsbits.demo\_instrument.callbacks.demo\_nexus\_callback
+======================================================
+
+.. automodule:: apsbits.demo_instrument.callbacks.demo_nexus_callback
+
+
+   .. rubric:: Functions
+
+   .. autosummary::
+
+      nxwriter_init
+
+   .. rubric:: Classes
+
+   .. autosummary::
+
+      MyNXWriter

apsbits-2.0.0/docs/source/api/generated/apsbits.demo_instrument.callbacks.demo_spec_callback.rst

@@ -0,0 +1,13 @@
+apsbits.demo\_instrument.callbacks.demo\_spec\_callback
+=====================================================
+
+.. automodule:: apsbits.demo_instrument.callbacks.demo_spec_callback
+
+
+   .. rubric:: Functions
+
+   .. autosummary::
+
+      spec_comment
+      newSpecFile
+      init_specwriter_with_RE

{apsbits-1.0.5 → apsbits-2.0.0}/docs/source/api/generated/apsbits.demo_instrument.callbacks.rst

@@ -10,5 +10,5 @@ apsbits.demo\_instrument.callbacks
    :toctree:
    :recursive:
 
-   nexus_data_file_writer
-   spec_data_file_writer
+   demo_nexus_callback
+   demo_spec_callback

{apsbits-1.0.5 → apsbits-2.0.0}/docs/source/api/generated/apsbits.demo_instrument.plans.rst

@@ -10,5 +10,4 @@ apsbits.demo\_instrument.plans
    :toctree:
    :recursive:
 
-   dm_plans
    sim_plans

{apsbits-1.0.5 → apsbits-2.0.0}/docs/source/api/index.rst

@@ -72,7 +72,6 @@ The utilities module provides helper functions and tools:
    :toctree: generated
    :recursive:
 
-   apsbits.utils.aps_functions
    apsbits.utils.config_loaders
    apsbits.utils.controls_setup
    apsbits.utils.helper_functions

{apsbits-1.0.5 → apsbits-2.0.0}/docs/source/api/utils.rst

@@ -11,7 +11,6 @@ The utilities module provides helper functions and tools for working with Bluesk
    :toctree: generated
    :recursive:
 
-   aps_functions
    config_loaders
    controls_setup
    helper_functions

{apsbits-1.0.5 → apsbits-2.0.0}/docs/source/license.rst

@@ -6,7 +6,7 @@ Software License
 ================
 
 License
-=======
+-------
 
 The project is licensed under the following terms:
 

{apsbits-1.0.5 → apsbits-2.0.0}/pyproject.toml

@@ -33,25 +33,27 @@ classifiers = [
     "Topic :: Utilities",
 ]
 dependencies = [
-    "apstools >= 1.7.2",
-    "bluesky-queueserver-api",
+    "apstools",
     "bluesky-queueserver >=0.0.22",
+    "bluesky-queueserver-api",
     "bluesky-widgets",
     "bluesky",
     "caproto",
-    "databroker ==1.2.5",
-    "guarneri",
+    "databroker==1.2.5",
+    "guarneri>=0.4.0",
     "ipython",
     "jupyterlab",
+    "matplotlib",
+    "ophyd-async",
     "ophyd-registry",
     "ophyd",
     "PyQt5>5.15",
     "pyRestTable",
     "pysumreg",
     "qtpy",
-    "toml",
-    "tomli",
+    "tiled[all]",
     "tomli-w",
+    "tomli",
 ]
 
 [project.optional-dependencies]
@@ -73,6 +75,7 @@ doc = [
     "sphinx",
     "graphviz",
     "dot",
+    "tomli-w",
 ]
 
 all = ["apsbits[dev,doc]"]

{apsbits-1.0.5 → apsbits-2.0.0}/src/apsbits/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.0.5'
-__version_tuple__ = version_tuple = (1, 0, 5)
+__version__ = version = '2.0.0'
+__version_tuple__ = version_tuple = (2, 0, 0)
+
+__commit_id__ = commit_id = 'g484b02f15'

{apsbits-1.0.5 → apsbits-2.0.0}/src/apsbits/api/create_new_instrument.py

@@ -15,6 +15,38 @@ import sys
 from pathlib import Path
 
 
+def create_qserver_script(scripts_dir: Path, name: str) -> None:
+    """
+    Create a qserver script file in the scripts directory.
+    """
+
+    demo_scripts_path: Path = (
+        Path(__file__).resolve().parent.parent / "demo_scripts"
+    ).resolve()
+
+    for scripts_file in demo_scripts_path.glob("*"):
+        shutil.copy2(scripts_file, scripts_dir)
+
+    # Rename qs_host.sh to include the instrument name
+    os.rename(scripts_dir / "qs_host.sh", scripts_dir / f"{name}_qs_host.sh")
+
+    new_script_path = scripts_dir / f"{name}_qs_host.sh"
+
+    # Read script contents
+    with open(new_script_path, "r") as src:
+        script_contents = src.read()
+
+    # Replace demo package name with new instrument name
+    updated_contents = script_contents.replace("demo_instrument", name)
+
+    # Write updated script
+    with open(new_script_path, "w") as dest:
+        dest.write(updated_contents)
+
+    # Make script executable
+    os.chmod(new_script_path, new_script_path.stat().st_mode | 0o755)
+
+
 def copy_instrument(destination_dir: Path) -> None:
     """
     Copy template directory to the destination.
@@ -31,20 +63,11 @@ def copy_instrument(destination_dir: Path) -> None:
     shutil.copytree(str(demo_template_path), str(destination_dir))
 
 
-def create_qserver(qserver_dir: Path, name: str) -> None:
+def edit_qserver_folder(qserver_dir: Path, name: str) -> None:
     """
     Create a qserver config file in the destination directory.
     """
 
-    demo_qserver_path: Path = (
-        Path(__file__).resolve().parent.parent / "demo_qserver"
-    ).resolve()
-
-    os.makedirs(qserver_dir, exist_ok=True)
-    # Copy all yml files from demo_qserver to destination qserver dir
-    for yml_file in demo_qserver_path.glob("*"):
-        shutil.copy2(yml_file, qserver_dir)
-
     # Update startup module in qs-config.yml
     qs_config_path = qserver_dir / "qs-config.yml"
 
@@ -58,22 +81,6 @@ def create_qserver(qserver_dir: Path, name: str) -> None:
     with open(qs_config_path, "w") as f:
         f.write(updated_contents)
 
-    new_script_path = qserver_dir / "qs_host.sh"
-
-    # Read script contents
-    with open(new_script_path, "r") as src:
-        script_contents = src.read()
-
-    # Replace demo package name with new instrument name
-    updated_contents = script_contents.replace("demo_instrument", name)
-
-    # Write updated script
-    with open(new_script_path, "w") as dest:
-        dest.write(updated_contents)
-
-    # Make script executable
-    os.chmod(new_script_path, new_script_path.stat().st_mode | 0o755)
-
 
 def main() -> None:
     """
@@ -97,13 +104,19 @@ def main() -> None:
 
     new_instrument_dir: Path = main_path / "src" / args.name
 
-    new_qserver_dir: Path = main_path / "src" / f"{args.name}_qserver"
+    qserver_dir: Path = main_path / "src" / args.name / "qserver"
+
+    scripts_dir: Path = main_path / "scripts"
 
     print(
         f"Creating instrument '{args.name}' from demo_instrument into \
         '{new_instrument_dir}'."
     )
 
+    if not scripts_dir.exists():
+        print("Error: Destination scripts directory does not exist.", file=sys.stderr)
+        sys.exit(1)
+
     if new_instrument_dir.exists():
         print(f"Error: Destination '{new_instrument_dir}' exists.", file=sys.stderr)
         sys.exit(1)
@@ -114,10 +127,16 @@ def main() -> None:
     except Exception as exc:
         print(f"Error copying instrument: {exc}", file=sys.stderr)
         sys.exit(1)
+    try:
+        create_qserver_script(scripts_dir, args.name)
+        print(f"Qserver script created in '{scripts_dir}'.")
+    except Exception as exc:
+        print(f"Error creating qserver script: {exc}", file=sys.stderr)
+        sys.exit(1)
 
     try:
-        create_qserver(new_qserver_dir, args.name)
-        print(f"Qserver config created in '{new_qserver_dir}'.")
+        edit_qserver_folder(qserver_dir, args.name)
+        print(f"Qserver config created in '{qserver_dir}'.")
     except Exception as exc:
         print(f"Error creating qserver config: {exc}", file=sys.stderr)
         sys.exit(1)

{apsbits-1.0.5 → apsbits-2.0.0}/src/apsbits/api/delete_instrument.py

@@ -15,7 +15,8 @@ import shutil
 import sys
 from datetime import datetime
 from pathlib import Path
-from typing import Tuple
+
+# No typing imports needed - using built-in types
 
 
 def validate_instrument_name(name: str) -> bool:
@@ -28,7 +29,7 @@ def validate_instrument_name(name: str) -> bool:
     return re.fullmatch(r"[a-z][_a-z0-9]*", name) is not None
 
 
-def get_instrument_paths(name: str) -> Tuple[Path, Path]:
+def get_instrument_paths(name: str) -> tuple[Path, Path]:
     """
     Get the paths to the instrument and qserver directories.
 
@@ -38,17 +39,17 @@ def get_instrument_paths(name: str) -> Tuple[Path, Path]:
     """
     main_path: Path = Path(os.getcwd()).resolve()
     instrument_dir: Path = main_path / "src" / name
-    qserver_dir: Path = main_path / "src" / f"{name}_qserver"
+    qserver_script_dir: Path = main_path / "scripts" / f"{name}_qs_host.sh"
 
-    return instrument_dir, qserver_dir
+    return instrument_dir, qserver_script_dir
 
 
-def delete_instrument(instrument_dir: Path, qserver_dir: Path) -> None:
+def delete_instrument(instrument_dir: Path, qserver_script_dir: Path) -> None:
     """
     Move the instrument and qserver directories to a .deleted directory.
 
     :param instrument_dir: Path to the instrument directory.
-    :param qserver_dir: Path to the qserver directory.
+    :param qserver_script_dir: Path to the qserver script.
     :return: None
     """
     main_path: Path = Path(os.getcwd()).resolve()
@@ -72,13 +73,15 @@ def delete_instrument(instrument_dir: Path, qserver_dir: Path) -> None:
     else:
         print(f"Warning: Instrument directory '{instrument_dir}' does not exist.")
 
-    if qserver_dir.exists():
+    if qserver_script_dir.exists():
         # Create a new path with timestamp
-        new_qserver_path = deleted_dir / f"{qserver_dir.name}_{timestamp}"
-        shutil.move(str(qserver_dir), str(new_qserver_path))
-        print(f"Qserver directory '{qserver_dir}' moved to '{new_qserver_path}'.")
+        new_qserver_path = deleted_dir / f"{qserver_script_dir.name}_{timestamp}"
+        shutil.move(str(qserver_script_dir), str(new_qserver_path))
+        print(
+            f"Qserver directory '{qserver_script_dir}' moved to '{new_qserver_path}'."
+        )
     else:
-        print(f"Warning: Qserver directory '{qserver_dir}' does not exist.")
+        print(f"Warning: Qserver directory '{qserver_script_dir}' does not exist.")
 
 
 def main() -> None:
@@ -108,13 +111,13 @@ def main() -> None:
 
     instrument_dir, qserver_dir = get_instrument_paths(args.name)
 
-    if not instrument_dir.exists() and not qserver_dir.exists():
-        msg = (
-            f"Error: Neither instrument '{args.name}' nor its qserver "
-            f"configuration exist."
-        )
+    if not instrument_dir.exists():
+        msg = f"Error: Instrument '{args.name}' does not exist."
+        print(msg, file=sys.stderr)
+
+    if not qserver_dir.exists():
+        msg = f"Error: Qserver script for instrument '{args.name}' does not exist."
         print(msg, file=sys.stderr)
-        sys.exit(1)
 
     if not args.force:
         prompt = (

{apsbits-1.0.5 → apsbits-2.0.0}/src/apsbits/api/run_instrument.py

@@ -12,14 +12,12 @@ import argparse
 import importlib
 import sys
 from typing import Any
-from typing import Dict
 from typing import Optional
-from typing import Tuple
 
 from apsbits.core.instrument_init import oregistry as Registry
 
 
-def run_instrument_startup(package_name: str) -> Tuple[bool, Optional[Dict[str, Any]]]:
+def run_instrument_startup(package_name: str) -> tuple[bool, Optional[dict[str, Any]]]:
     """
     Run a package's startup module and return the ophyd registry information.