[OND211-2418] Merge feature branch to master (CSI proto regen, nlu-client 7.0.2, keycloak) - #25
Merged
Merged
Conversation
…statuses and turn epoch
…ND211-2418-add-keycloak-for-2-fa head
…api to nlu-api 6.14.0
… nlu protos
Verified against the installed .dist-info/RECORD: ondewo-csi-client claims zero
files under ondewo/nlu and instead declares ondewo-nlu-client 7.0.1 as a runtime
dependency. That is the opposite of ondewo-vtsi-client, which vendors 55
ondewo/nlu files plus ondewo/{s2t,t2s,sip,qa} and therefore does need lockstep
regeneration. Recorded so nobody 'helpfully' adds vendored nlu protos here and
creates the duplicate-file-in-pool crash the current layout avoids.
Also notes that consumers pin this repo by git rev (23b568f today), so pushed
commits must never be rebased.
7.0.1 keyed its shared Keycloak token-provider registry by `id(config)`. A ClientConfig is unreachable the moment the client is built (the service interfaces keep only the grpc channel), so CPython reused its address for the next ClientConfig and the registry handed the new client the PREVIOUS user's still-live provider -- authenticating as the wrong user, including with credentials that do not exist. 7.0.2 keys it by a sha256 of the credential set. The `==7.0.1` here is a generation artifact, not a real API constraint: diffing the two wheels shows `ondewo/nlu/utils/keycloak.py` as the only file that changed, no `_pb2` at all, so the ondewo-nlu-api generation this client was regenerated against (7.0.0) is unchanged. Unblocks the ondewo-nlu-client 7.0.2 bump in ondewo-csi, which could not resolve while this exact pin stood.
The branch predates master's uv/pyproject migration, so four conflicts: - requirements.txt / requirements-dev.txt: deleted on master (deps moved to pyproject.toml). Took the deletion and carried both of the branch's intents across: ondewo-nlu-client is now pinned ==7.0.2 in [project.dependencies] and types-requests added to the dev extra. Relocked (uv.lock: nlu-client 6.14.0 -> 7.0.2, types-requests added). - ondewo-csi-api submodule: resolved to the branch's b4f8319 (CALL_ENDED control status, 2026-08-06), which strictly contains master's 8213619 (2026-07-05). - CLAUDE.md: append-vs-append; both sides' sections kept in order. The branch's section still described the pre-uv layout, so its 'requirements.txt declares ondewo-nlu-client==7.0.1' was reconciled to 'pyproject.toml declares ondewo-nlu-client==7.0.2'. ruff, mypy and all 54 unit tests pass on the merge result.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges the remaining
OND211-2418-add-keycloak-for-2-fawork intomaster(9 commits ahead,14 behind).
masterwas merged into the branch first.What this brings
CALL_ENDEDcontrol status for the persistent-listener reset, plusthe OND235-105 barge-in control statuses and turn epoch.
ondewo-nlu-client==7.0.2— 7.0.1 keyed its shared Keycloak token-provider registry byid(config), so a collectedClientConfig's reused address could hand a new client theprevious user's provider and authenticate as the wrong user. 7.0.2 keys by a sha256 of the
credential set.
types-requestsin the dev extra, and CLAUDE.md notes.Conflict resolution
The branch predates master's uv/pyproject migration, so there were four conflicts:
requirements.txt/requirements-dev.txtpyproject.toml). Took the deletion and carried both branch intents across:ondewo-nlu-client==7.0.2pinned in[project.dependencies],types-requestsadded to the dev extra. Relocked —uv.lock: nlu-client 6.14.0 → 7.0.2, types-requests added.ondewo-csi-apisubmoduleb4f8319(2026-08-06), which strictly contains master's8213619(2026-07-05) — nothing dropped.CLAUDE.mdrequirements.txt declares ondewo-nlu-client==7.0.1was reconciled topyproject.toml declares ondewo-nlu-client==7.0.2.ruff check,mypyand all 54 unit tests pass on the merge result.