Merge each OBS command from an obsid-changing CMD_EVT into the prior …

[taldcroft]

Description

The processing to generate kadi observations (OBS commands) splits an observation when the obsid changes. This allows capturing undercover observations etc. However, manually commanded obsid changes following an SCS-107 or an ECS measurement are somewhat different because their timing is unrelated to normal observation flow (maneuver => Kalman dwell).

In using the new scheduled obsid capability in practice, it became apparent that splitting an observation for a manual obsid change was undesirable. A query for a particular scheduled obsid is expected to return the single entire observation, not the two splits.

This PR does that merging within get_observations (and therefore get_starcats as well). The PR code provides another complementary description of what is going on here that might be helpful.

In case this behavior ends up being problematic somewhere, the PR also adds a configuration option to disable the merging.

Interface impacts

Testing

Unit tests

• Mac

(ska3) ➜  kadi git:(merge-obsid-obs-redux) git rev-parse --short HEAD
c874604
(ska3) ➜  kadi git:(merge-obsid-obs-redux) pytest
======================================= test session starts ========================================
platform darwin -- Python 3.13.11, pytest-9.0.2, pluggy-1.6.0
rootdir: /Users/aldcroft/git
configfile: pytest.ini
plugins: anyio-4.12.1, timeout-2.4.0
collected 310 items                                                                                

kadi/commands/tests/test_commands.py ....................................................... [ 17%]
.....s..............................                                                         [ 29%]
kadi/commands/tests/test_commands_v2.py ssssssssssssssssssssssssssssssssssssssssssssssssssss [ 46%]
ssssssssssssssssssssssssssssssssssss                                                         [ 57%]
kadi/commands/tests/test_filter_events.py ..                                                 [ 58%]
kadi/commands/tests/test_states.py ...............................................x......... [ 76%]
.................                                                                            [ 82%]
kadi/commands/tests/test_validate.py ......................                                  [ 89%]
kadi/tests/test_events.py ..........                                                         [ 92%]
kadi/tests/test_occweb.py .......................                                            [100%]

====================== 220 passed, 89 skipped, 1 xfailed in 113.23s (0:01:53) ======================
(ska3) ➜  kadi git:(merge-obsid-obs-redux) env KADI_CMDS_VERSION=2 pytest
======================================= test session starts ========================================
platform darwin -- Python 3.13.11, pytest-9.0.2, pluggy-1.6.0
rootdir: /Users/aldcroft/git
configfile: pytest.ini
plugins: anyio-4.12.1, timeout-2.4.0
collected 310 items                                                                                

kadi/commands/tests/test_commands.py sssssssssssssssssssssssssssssssssssssssssssssssssssssss [ 17%]
ssssssssssssssssssssssssssssssssssss                                                         [ 29%]
kadi/commands/tests/test_commands_v2.py .................................................... [ 46%]
....................................                                                         [ 57%]
kadi/commands/tests/test_filter_events.py ..                                                 [ 58%]
kadi/commands/tests/test_states.py ...............................................x......... [ 76%]
.................                                                                            [ 82%]
kadi/commands/tests/test_validate.py ......................                                  [ 89%]
kadi/tests/test_events.py ..........                                                         [ 92%]
kadi/tests/test_occweb.py .......................                                            [100%]

====================== 218 passed, 91 skipped, 1 xfailed in 116.28s (0:01:56) ======================

Independent check of unit tests by Jean

• OSX

(ska3-latest) flame:kadi jean$ pytest
======================================================================== test session starts ========================================================================
platform darwin -- Python 3.13.11, pytest-9.0.2, pluggy-1.6.0
rootdir: /Users/jean/git
configfile: pytest.ini
plugins: anyio-4.12.1, timeout-2.4.0
collected 314 items                                                                                                                                                 

kadi/commands/tests/test_commands.py ..............................................................s..............................                            [ 29%]
kadi/commands/tests/test_commands_v2.py ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss                              [ 57%]
kadi/commands/tests/test_filter_events.py ..                                                                                                                  [ 58%]
kadi/commands/tests/test_states.py .................................................x..........................                                               [ 82%]
kadi/commands/tests/test_validate.py ......................                                                                                                   [ 89%]
kadi/tests/test_events.py ..........                                                                                                                          [ 92%]
kadi/tests/test_occweb.py .......................                                                                                                             [100%]


================================================ 224 passed, 89 skipped, 1 xfailed, 2 warnings in 204.81s (0:03:24) =================================================
(ska3-latest) flame:kadi jean$ git rev-parse HEAD
fa6cb0ea348315faf23023ac32439d2913b88d49

Functional tests

No functional testing.

[jeanconn]

Is this also ready for review?

[taldcroft]

The actual code is ready. I'm going to add a quick test right now.

[taldcroft]

@jeanconn - ready for review!

[taldcroft]

Rebased and retested.

[jeanconn]

I could use a quick explanation of this "no need to set obs_stop" part, as copilot and I were both confused by that one.