feat: add selector tokenization support #1608
Merged
Conversation
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
benflexcompute
merged commit 21bf112
into
BenY/FXC-3494/TextExpression
18 checks passed
benflexcompute
added a commit
that referenced
this pull request
Nov 29, 2025
* [FXC-3529] Introduce `EntitySelector` data model into `EntityList` (#1466) * [FXC-3529] Introduce EntitySelector data model into EntityList * Remove unnecessary changes * [FXC-3530] Added `EntitySelector` expansion function (#1471) * Added the get_entity_database_for_selectors * WIP * Added support for generic Glob patterns * Ready * Added case sensitivity on Windows * [FXC-3554] `EntitySelector` generation flunet API (#1492) * Finished implementation * Removed equals and not_equals * Self review * Changed discriminator to be confromal to the user API * Removed Flow360BaseModel inheritance from InputFileModel * [Text expression] Update the service to ensure expanding before the validation (#1534) * Update the service to ensure expanding before the validation * Fixed unit test * Added support for assigning EntitySelector to EntityList, also updated validations to defer stored_entities related checks to validate_model() stage * Enabled pure selector input * fixed lint * Refactor on entity test structure * Added removal of matched entities before submission * Reviewed * Fixed pylint * fix(): Moving the preprocessing of dict before validaiton into a function before constructing ParamsValidationInfo() (#1607) * fix(): Moving the preprocessing of dict before validaiton into a function before constructing ParamsValidationInfo() * moving things around * Fix lint * feat: add selector tokenization support (#1608) * Added description and `selector_id` (#1610) * Added description and selector_id * resolve lintintg * Fixed linting * Added description and `selector_id` (#1612) * Added description and selector_id * resolve lintintg * Fixed linting * Fixed linting * Added contexted field/model validators (#1613) * renamed to contextual and also examined stored entities validations * Added unit test ensuring the entities matched by selectors are removed before upload * Added warning and empty selector error * QOL: Removed the logging for unit system internally * Fixed unit test * Fixed linting * fix(): Change tokening with name to with ID instead
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Selector Tokenization Support
AssetCache.selectors) and ensured it survives preprocessing so selector definitions can be reused across the tree._process_selectors,_expand_node_selectors,expand_entity_selectors_in_place) plus a new helper,collect_and_tokenize_selectors_in_place, to collect unique selector definitions and replace inline JSON with tokens.services_utils.has_any_entity_selectorsandstrip_selector_matches_inplaceto understand string tokens, and wired draft uploads (Draft.update_simulation_params) to run tokenization before stripping entities.tests/simulation/framework/test_entity_selector_token.pycovering token round-trip, mixed token/dict usage, and expansion results.