Support MAUDE telemetry for events

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.7.2
+  rev: v0.9.0
   hooks:
     # Run the linter.
     - id: ruff

kadi/cmds/cmds.py

@@ -147,9 +147,9 @@ def _find(start=None, stop=None, **kwargs):
     if stop:
         ok &= idx_cmds["date"] < DateTime(stop).date
     for key, val in kwargs.items():
-        key = key.lower()
+        key = key.lower()  # noqa: PLW2901
         if isinstance(val, str):
-            val = val.upper()
+            val = val.upper()  # noqa: PLW2901
         if key in idx_cmds.dtype.names:
             ok &= idx_cmds[key] == val
         else:

kadi/commands/command_sets.py

@@ -259,7 +259,7 @@ def get_cmds_from_event(date, event, params_str):
     for step, cmd in enumerate(cmds):
         # Force CommandTable row to be a dict
         if not isinstance(cmd, dict):
-            cmd = {name: cmd[name] for name in cmd.colnames}
+            cmd = {name: cmd[name] for name in cmd.colnames}  # noqa: PLW2901
 
         # Get command duration (if any). If the cmd is only {'dur': <dt>} then
         # it is a pure delay so skip subsequent processing.

kadi/commands/commands_v2.py

@@ -361,7 +361,7 @@ def update_archive_and_get_cmds_recent(
 
     # Update loads table and download/archive backstop files from OCCweb
     loads = update_loads(scenario, cmd_events=cmd_events, lookback=lookback, stop=stop)
-    logger.info(f'Including loads {", ".join(loads["name"])}')
+    logger.info(f"Including loads {', '.join(loads['name'])}")
 
     for load in loads:
         load_name = load["name"]
@@ -437,7 +437,7 @@ def update_archive_and_get_cmds_recent(
         logger.info(f"Processing {cmds_source} with {len(cmds)} commands")
         end_scs = collections.defaultdict(list)
         if date_end := cmds.meta.get("rltt"):
-            source = f'RLTT in {cmds["source"][0]}'
+            source = f"RLTT in {cmds['source'][0]}"
             end_scs[date_end, source].extend([128, 129, 130, 131, 132, 133])
 
         # Explicit END SCS commands. Most commonly these come from command events
@@ -447,7 +447,7 @@ def update_archive_and_get_cmds_recent(
         if np.any(ok):
             for cmd in cmds[ok]:
                 if (scs := cmd["params"]["codisas1"]) >= 128:
-                    source = f'DISABLE SCS in {cmd["source"]} at {cmd["date"]}'
+                    source = f"DISABLE SCS in {cmd['source']} at {cmd['date']}"
                     end_scs[cmd["date"], source].append(scs)
 
         for (date_end, source), scss in end_scs.items():
@@ -465,7 +465,7 @@ def update_archive_and_get_cmds_recent(
                         n_bad = np.count_nonzero(bad)
                         logger.info(
                             f"Removing {n_bad} cmds in SCS slots {scss} from "
-                            f'{prev_cmds["source"][0]} due to {source}'
+                            f"{prev_cmds['source'][0]} due to {source}"
                         )
                     cmds_list[jj] = prev_cmds[~bad]
 
@@ -654,15 +654,15 @@ def get_cmds_obs_from_manvrs(cmds, prev_att=None):
                 npnt_enab = False
             if targ_att is None:
                 # No target attitude is unexpected since we got to a MANVR cmd.
-                logger.warning(f'WARNING: no target attitude for {cmd["date"]}')
+                logger.warning(f"WARNING: no target attitude for {cmd['date']}")
                 log_context_obs(cmds, cmd)
                 continue
             if prev_att is None:
                 # No previous attitude happens always for first manvr at the
                 # beginning of loads, and normally we just push on to the next
                 # OBS. But if we already have OBS command this is a problem.
                 if cmds_obs:
-                    logger.warning(f'WARNING: No previous attitude for {cmd["date"]}')
+                    logger.warning(f"WARNING: No previous attitude for {cmd['date']}")
                     log_context_obs(cmds, cmd)
                 prev_att = targ_att
                 continue

kadi/commands/core.py

@@ -411,9 +411,9 @@ def _find(
                 ok &= idx_cmds["date"] < CxoTime(stop).date
 
     for key, val in kwargs.items():
-        key = key.lower()
+        key = key.lower()  # noqa: PLW2901
         if isinstance(val, str):
-            val = val.upper()
+            val = val.upper()  # noqa: PLW2901
         if key in idx_cmds.dtype.names:
             ok &= idx_cmds[key] == val
         else:
@@ -892,7 +892,7 @@ def pformat_like_backstop(
                         fmt = "{}={}"
                     fmtvals.append(fmt.format(key, val))
 
-                fmtvals.append(f'scs={cmd["scs"]}')
+                fmtvals.append(f"scs={cmd['scs']}")
 
                 params_str = ", ".join(fmtvals)
             else:
@@ -1016,16 +1016,16 @@ def remove_not_run_cmds(self):
 
             # Now check that the params match.
             idxs_match = []
-            for idx in idxs:
+            for idx_check in idxs:
                 # Get the intersection of the keys in cmd_not_run["params"] and self["params"][idx]
-                self_params = self["params"][idx]
+                self_params = self["params"][idx_check]
                 cmd_not_run_params = cmd_not_run["params"]
                 keys = set(cmd_not_run_params) & set(self_params)
 
                 # Check that the values match for all common keys
                 match = all(cmd_not_run_params[key] == self_params[key] for key in keys)
                 if match:
-                    idxs_match.append(idx)
+                    idxs_match.append(idx_check)
 
             idxs_remove.update(idxs_match)
 

kadi/commands/tests/test_validate.py

@@ -173,7 +173,7 @@ def test_validate_regression(cls, no_exclude, fast_sun_position_method, regress_
     assert data_obs["vals_compressed"].keys() == data_exp["vals_compressed"].keys()
 
     for key, vals_obs in data_obs["vals_compressed"].items():
-        vals_obs = np.asarray(vals_obs)
+        vals_obs = np.asarray(vals_obs)  # noqa: PLW2901
         vals_exp = np.asarray(data_exp["vals_compressed"][key])
         assert vals_obs.shape == vals_exp.shape
         assert vals_obs.dtype.kind == vals_exp.dtype.kind

kadi/events/__init__.py

@@ -43,6 +43,8 @@
 import importlib
 import os
 
+import ska_helpers.logging
+
 # In addition, set DJANGO_ALLOW_ASYNC_UNSAFE, to avoid exception seen running in
 # Jupyter notebook: SynchronousOnlyOperation: You cannot call this from an async
 # context. See: https://stackoverflow.com/questions/59119396