Separate into base, templates, import and validation#547
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This pull request refactors the vehicle components handling by separating the logic into base, templates, import, and validation modules. Key changes include enhancing schema data extraction (with new helper methods), introducing a new data model for components to improve testability and JSON structure consistency, and updating various protocols and validation rules for FC parameters.
Reviewed Changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| update_vehicle_templates.py | Updated call to ComponentDataModel with datatypes from get_all_value_datatypes. |
| tests/test_backend_filesystem_vehicle_components.py | Added comprehensive tests for schema data extraction and type mapping. |
| ardupilot_methodic_configurator/data_model_vehicle_components_templates.py | Introduced a separate template interface with data operations. |
| ardupilot_methodic_configurator/data_model_vehicle_components_import.py | Enhanced FC parameters processing with improved validation and mapping. |
| ardupilot_methodic_configurator/data_model_vehicle_components_base.py | Created base data model with updated JSON structure and type-safe casting. |
| ardupilot_methodic_configurator/backend_filesystem_vehicle_components.py | Added methods for recursive extraction of Python datatypes from the vehicle components JSON schema. |
Contributor
☂️ Python Coverage
Overall Coverage
New Files
Modified Files
|
Contributor
Test Results 2 files ± 0 2 suites ±0 1m 29s ⏱️ +9s Results for commit 44d7997. ± Comparison against base commit 40c29ad. This pull request removes 62 and adds 258 tests. Note that renamed tests count towards both.♻️ This comment has been updated with latest results. |
amilcarlucas
force-pushed
the
data_model_vehicle_components_improvements
branch
from
67999d5 to
9775209
Compare
…s, import and validation This makes it simpler to test and keeps the linters happier Make the GNSS protocol depend on the GNSS connection type Restrict the RC receiver, telemetry and battery protocols depending on the selected FC connection type Improve and simplify the data validation code Update protocol choices when the type changes and is written. The cell voltage now changes when chemistry changes The TOW limits are checked against each other Validate the dict constants used to validate the data Re-use common fixatures to prevent code duplication
amilcarlucas
force-pushed
the
data_model_vehicle_components_improvements
branch
from
9775209 to
44d7997
Compare
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
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.
This makes it simpler to test and keeps the linters happier
Make the GNSS protocol depend on the GNSS connection type Restrict the RC receiver, telemetry and battery protocols depending on the selected FC connection type Improve and simplify the data validation code
Update protocol choices when the type changes and is written. The cell voltage now changes when chemistry changes The TOW limits are checked against each other.
This pull request introduces significant updates to the Ardupilot Methodic Configurator, focusing on schema data extraction and a new data model for vehicle components. Key changes include adding methods for extracting and mapping schema-defined data types, implementing a structured data model for component operations, and enhancing JSON format versioning and validation logic.
Schema Data Extraction Enhancements:
get_all_value_datatypesmethod inardupilot_methodic_configurator/backend_filesystem_vehicle_components.pyto extract and map all schema-defined data types into a nested dictionary. This includes recursive handling of schema references andallOfconstructs._extract_datatypes_from_component,_extract_datatypes_from_property, and_json_type_to_python_typeto support recursive traversal and type conversion for JSON schemas.New Data Model for Components:
ComponentDataModelBaseclass inardupilot_methodic_configurator/data_model_vehicle_components_base.pyto separate data operations from UI logic, improving testability.get_component_value) and setting (set_component_value) component values with type-safe casting based on schema-defined data types.These changes enhance the configurator's robustness by enabling schema-driven data validation and ensuring backward compatibility with older JSON formats.