Support dot-path keyby and fix CI junit upload

- Resolve dotted attribute paths in DefaultState/DuckDBState insert so keyby can reference nested struct members (e.g. keyby='sub.id')

- Make --junitxml explicit in Makefile and switch upload-artifact/publish paths to 'junit.xml' so CI test results are reported (previously '**/junit.xml' produced 0 tests in the PR comment)

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>

Author: timkpaine

.github/workflows/build.yaml

@@ -111,13 +111,13 @@ jobs:
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
       with:
         name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
-        path: '**/junit.xml'
+        path: junit.xml
       if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'
 
     - name: Publish Unit Test Results
       uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2
       with:
-        files: '**/junit.xml'
+        files: junit.xml
       if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'
 
     - name: Upload coverage

Makefile

@@ -97,7 +97,7 @@ test-py:  ## run python tests
 tests-py: test-py
 
 coverage-py:  ## run python tests and collect test coverage
-	python -m pytest -v csp_gateway/tests --cov=csp_gateway --cov-report term-missing --cov-report xml
+	python -m pytest -v csp_gateway/tests --junitxml=junit.xml --cov=csp_gateway --cov-report term-missing --cov-report xml
 
 .PHONY: test-js tests-js coverage-js
 test-js:  ## run js tests

csp_gateway/server/gateway/csp/state.py

@@ -75,6 +75,16 @@ def disable_duckdb_state() -> None:
     _USE_DUCKDB_STATE = False
 
 
+def _resolve_keyby_attr(record: Any, path: str) -> Any:
+    """Resolve a (possibly dotted) attribute path on ``record``, returning ``None`` if any segment is missing."""
+    obj = record
+    for segment in path.split("."):
+        if obj is None:
+            return None
+        obj = getattr(obj, segment, None)
+    return obj
+
+
 class StateType(CoreEnum):
     UNKNOWN = 0
     DEFAULT = 1
@@ -149,7 +159,7 @@ def insert(self, record: Any) -> None:
 
         for subkey in self._keyby:
             # extract the key from the record
-            subkey_to_use = getattr(record, subkey, None)
+            subkey_to_use = _resolve_keyby_attr(record, subkey)
 
             if subkey == self._keyby[-1]:
                 # Put the element there if last
@@ -408,7 +418,7 @@ def insert(self, record: Struct) -> None:
             obj_id = None
             for subkey in self._keyby:
                 # extract the key from the record
-                subkey_to_use = getattr(record, subkey, None)
+                subkey_to_use = _resolve_keyby_attr(record, subkey)
 
                 if subkey == self._keyby[-1]:
                     if subkey_to_use not in place.keys():

csp_gateway/tests/server/gateway/csp/test_state.py

@@ -94,6 +94,22 @@ def test_state_keyby_unset():
         assert res == [ts]
 
 
+def test_state_keyby_dot_path():
+    for specialization, struct_type in zip(_STATES, _STRUCTS):
+        s = State[struct_type](keyby="g.suba")
+        assert s.state_type() == specialization
+        ts1 = struct_type(a=0, b="hello", g=CspSubStruct(suba=1))
+        ts2 = struct_type(a=1, b="world", g=CspSubStruct(suba=2))
+        s.insert(ts1)
+        s.insert(ts2)
+        assert sorted(s.query(), key=lambda r: r.g.suba) == [ts1, ts2]
+
+        # Overwriting with same nested key replaces the record.
+        ts3 = struct_type(a=2, b="again", g=CspSubStruct(suba=1))
+        s.insert(ts3)
+        assert sorted(s.query(), key=lambda r: r.g.suba) == [ts3, ts2]
+
+
 def test_state_keyby_two():
     for specialization, struct_type in zip(_STATES, _STRUCTS):
         s = State[struct_type](keyby=("a", "b"))