Ruff.

Author: PeterKraus

src/tomato/daemon/cmd.py

@@ -226,7 +226,7 @@ def pipeline(msg: dict, daemon: Daemon) -> Reply:
     logger.debug("%s", msg)
     pip = msg["params"]
     if pip["name"] is None:
-        logger.error()
+        logger.error("no pipeline name supplied")
         return Reply(success=False, msg="no pipeline name supplied", data=msg)
     if pip["name"] not in daemon.pips:
         dest = Pipeline(**pip)

src/tomato/daemon/driver.py

@@ -48,7 +48,10 @@ def tomato_driver_bootstrap(
                     comp.name,
                 )
                 continue
-            elif interface.retries.get(key, 0) == MAX_REGISTER_RETRIES:
+            elif (
+                hasattr(interface, "retries")
+                and interface.retries.get(key, 0) == MAX_REGISTER_RETRIES
+            ):
                 logger.warning(
                     "component %s has exceeded MAX_REGISTER_RETRIES, skipping",
                     comp.name,
@@ -266,7 +269,6 @@ def tomato_driver() -> None:
                     )
                 elif msg["cmd"] == "settings":
                     interface.settings = msg["params"]
-                    params["settings"] = interface.settings
                     ret = Reply(
                         success=True,
                         msg="settings received",
@@ -350,7 +352,7 @@ def manager(port: int, timeout: int = 1000):
     while getattr(thread, "do_run"):
         spawned_drivers = []
         msg = dict(cmd="status", sender=sender)
-        ret, req = lpp.comm(req, msg, **lppargs)
+        ret, req = lpp.comm(req, msg, **lppargs)  # ty: ignore[invalid-argument-type]
         if req.closed:
             setattr(thread, "do_run", False)
             break

src/tomato/daemon/jobdb.py

@@ -6,26 +6,27 @@
 
 """
 
-import sqlite3
 import logging
 import os
 import pickle
+import sqlite3
+from pathlib import Path
 from tomato.models import Job
 
 logger = logging.getLogger(__name__)
 
 
-def connect_jobdb(dbpath: str):
-    head, tail = os.path.split(dbpath)
-    if head != "" and not os.path.exists(head):
+def connect_jobdb(dbpath: str | Path):
+    head = Path(dbpath).parent
+    if not head.exists():
         logger.warning("making local data folder '%s'", head)
         os.makedirs(head)
     conn = sqlite3.connect(dbpath)
     cur = conn.cursor()
     return conn, cur
 
 
-def jobdb_setup(dbpath: str) -> None:
+def jobdb_setup(dbpath: str | Path) -> None:
     user_version = 2
     conn, cur = connect_jobdb(dbpath)
     logger.debug("attempting to find table 'queue' in '%s'", dbpath)

src/tomato/tomato/__init__.py

@@ -256,8 +256,10 @@ def status(
                 msg=format_msg(msg=msg, objs=stgrp, yml=yaml, keys=keys, data=rets),
                 data=rets,
             )
-
-        return _status_helper(daemon=rep.data, yaml=yaml, stgrp=stgrp)
+        elif rep.data is not None:
+            return _status_helper(daemon=rep.data, yaml=yaml, stgrp=stgrp)
+        else:
+            return rep
     else:
         req.setsockopt(zmq.LINGER, 0)
         req.close()
@@ -272,7 +274,7 @@ def start(
     port: int,
     timeout: int,
     context: zmq.Context,
-    appdir: str,
+    appdir: str | Path,
     verbosity: int,
     **_: dict,
 ) -> Reply:
@@ -385,9 +387,9 @@ def stop(
 
 def init(
     *,
-    appdir: str,
-    datadir: str,
-    logdir: str,
+    appdir: str | Path,
+    datadir: str | Path,
+    logdir: str | Path,
     **_: dict,
 ) -> Reply:
     """
@@ -474,7 +476,7 @@ def reload(
     port: int,
     timeout: int,
     context: zmq.Context,
-    appdir: str,
+    appdir: str | Path,
     **_: dict,
 ) -> Reply:
     """
@@ -491,33 +493,33 @@ def reload(
     kwargs = dict(port=port, timeout=timeout, context=context)
     logger.debug("Loading settings.toml file from %s.", appdir)
     try:
-        settings = toml.load(Path(appdir) / "settings.toml")
+        toml.load(Path(appdir) / "settings.toml")
     except FileNotFoundError:
         return Reply(
             success=False,
             msg=f"settings file not found in {appdir}, run 'tomato init' to create one",
         )
 
-    logger.debug(f"status")
+    logger.debug("status")
     ret = status(**kwargs)
     if not ret.success:
         return ret
 
     req = context.socket(zmq.REQ)
     req.connect(f"tcp://127.0.0.1:{port}")
 
-    logger.debug(f"reload")
+    logger.debug("reload")
     req.send_pyobj(dict(cmd="reload", sender=f"{__name__}.reload"))
     ret = req.recv_pyobj()
     if ret.success is False:
         return ret
 
-    logger.debug(f"setup")
+    logger.debug("setup")
     req.send_pyobj(dict(cmd="setup", sender=f"{__name__}.reload"))
     ret = req.recv_pyobj()
     if ret.success is False:
         return ret
-    logger.debug(f"done")
+    logger.debug("done")
 
     return Reply(
         success=True,