-
Notifications
You must be signed in to change notification settings - Fork 1
FEAT: implement yaml schemas #546
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
102ecdc
add method validate
cc46387
add iterator for ConfigNodeWithPreset
cf91c82
resolve conversations without tests
cc96bdc
Merge branch 'main' into issue-535
S1mpotyaga 5a4a4fa
check hook
a5e38ee
check hook
6b59ef6
check hooks
9b700b1
Merge branch 'main' into issue-535
S1mpotyaga 203fcc7
Merge branch 'main' into issue-535
S1mpotyaga 40e6cf7
need to correct test
9d1922a
done
9bc87bc
resolve conversations. add SchemaServer
54d46f2
retell messages about errors
d82f004
done
0b0e6be
Merge branch 'main' into issue-535
S1mpotyaga 1d2c05f
fix
ce0f490
Merge branch 'main' into issue-535
S1mpotyaga 7504f48
resolved last conversations
d07bafd
fix
9ac8928
fix
b7919d3
done
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| #include "schema_server.hpp" | ||
|
|
||
| #include <spdlog/fmt/fmt.h> | ||
|
|
||
| #include <regex> | ||
| #include <unordered_set> | ||
|
|
||
| namespace sim { | ||
|
|
||
| SchemaServer::SchemaServer(const std::filesystem::path& a_schemas_dir) | ||
| : m_schemas_dir(a_schemas_dir) {} | ||
|
|
||
| bool SchemaServer::is_meta_field(const std::string& field) { | ||
| return field.starts_with('_'); | ||
| } | ||
|
|
||
| void SchemaServer::validate_untyped(const ConfigSchema& schema_node, | ||
| const ConfigNodeWithPreset& config_node) { | ||
| // create set of requried fields | ||
| std::unordered_set<std::string> schema_fields; | ||
| for (const auto& it : schema_node) { | ||
| const std::string& field = it.get_name_or_throw(); | ||
| if (!is_meta_field(field)) { | ||
| schema_fields.insert(field); | ||
| } | ||
| } | ||
|
|
||
| // check if config node has unknown fields | ||
| for (const auto& subnode : config_node) { | ||
| const std::string& field = subnode.get_name_or_throw(); | ||
| if (!schema_fields.contains(field)) { | ||
| std::stringstream ss; | ||
| ss << "Unknown field '" << field; | ||
| ss << "' found in configuration:\n"; | ||
| ss << subnode; | ||
| ss << "This field is not described in schema:\n"; | ||
| ss << schema_node; | ||
| throw config_node.create_parsing_error(ss.str()); | ||
| } | ||
| } | ||
|
|
||
| // check if config node has all required fields | ||
| for (const auto& required_field : schema_fields) { | ||
| ConfigNodeWithPresetExpected exp_field_config = | ||
| config_node[required_field]; | ||
| if (!exp_field_config.has_value()) { | ||
| std::stringstream ss; | ||
| ss << "Required field '" << required_field; | ||
| ss << "' is missing in configuration: \n"; | ||
| ss << config_node << '\n'; | ||
| ss << "Field is required by schema node: \n"; | ||
| ss << schema_node << "\n"; | ||
| throw config_node.create_parsing_error(ss.str()); | ||
|
S1mpotyaga marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
||
| for (const auto& it : schema_node) { | ||
| std::string field = it.get_name().value(); | ||
| if (!is_meta_field(field)) { | ||
| validate(schema_node[field].value(), config_node[field].value()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [[nodiscard]] bool SchemaServer::try_validate_basic_types( | ||
| const ConfigSchema& schema_node, const ConfigNodeWithPreset& config_node) { | ||
| std::string type = schema_node["_type"].value().as<std::string>().value(); | ||
| if (type == "size_t") { | ||
| config_node.as_or_throw<size_t>(); | ||
| } else if (type == "int") { | ||
| config_node.as_or_throw<int>(); | ||
| } else if (type == "double") { | ||
| config_node.as_or_throw<double>(); | ||
| } else if (type == "bool") { | ||
| config_node.as_or_throw<bool>(); | ||
| } else if (type == "string") { | ||
| config_node.as_or_throw<std::string>(); | ||
| } else if (type == "regex") { | ||
| std::string pattern = config_node.as_or_throw<std::string>(); | ||
|
S1mpotyaga marked this conversation as resolved.
Outdated
|
||
| try { | ||
| std::regex r(pattern); | ||
| } catch (const std::regex_error&) { | ||
| std::stringstream ss; | ||
| ss << "Field must contain valid regular expression.\n"; | ||
| ss << "Regex pattern: " << pattern << '\n'; | ||
| throw config_node.create_parsing_error(ss.str()); | ||
| } | ||
| } else { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| [[nodiscard]] bool SchemaServer::try_validate_custom_types( | ||
| const ConfigSchema& schema_node, const ConfigNodeWithPreset& config_node) { | ||
| ConfigSchema type_node = schema_node["_type"].value(); | ||
|
S1mpotyaga marked this conversation as resolved.
Outdated
|
||
| std::string type = type_node.as_or_throw<std::string>(); | ||
| if (type.ends_with(".schema")) { | ||
| std::filesystem::path nested_schema_path = std::filesystem::path(type); | ||
| std::filesystem::path sub_schema_path = | ||
| nested_schema_path.is_absolute() | ||
| ? nested_schema_path | ||
| : m_schemas_dir / nested_schema_path; | ||
|
S1mpotyaga marked this conversation as resolved.
Outdated
|
||
| auto exp_sub_schema = safe_load_file(sub_schema_path); | ||
| if (!exp_sub_schema) { | ||
| throw schema_node.create_parsing_error( | ||
| fmt::format("Could not find custom schema {} due to error {}", | ||
| type, exp_sub_schema.error())); | ||
| } | ||
| ConfigSchema sub_schema = exp_sub_schema.value(); | ||
| validate(sub_schema, config_node); | ||
|
S1mpotyaga marked this conversation as resolved.
Outdated
|
||
| return true; | ||
| } else { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| void SchemaServer::validate(const ConfigSchema& schema_node, | ||
| const ConfigNodeWithPreset& config_node) { | ||
| ConfigNodeExpected exp_type_node = schema_node["_type"]; | ||
| if (exp_type_node) { | ||
| std::string type = exp_type_node.value().as_or_throw<std::string>(); | ||
| if (try_validate_basic_types(schema_node, config_node)) { | ||
| return; | ||
| } | ||
| if (try_validate_custom_types(schema_node, config_node)) { | ||
| return; | ||
| } | ||
| std::stringstream ss; | ||
| ss << "Unknown specified type '" << type << "' in schema: "; | ||
| ss << schema_node; | ||
| throw schema_node.create_parsing_error(ss.str()); | ||
|
S1mpotyaga marked this conversation as resolved.
Outdated
|
||
| } else { | ||
| if (!config_node.IsMap()) { | ||
| std::stringstream ss; | ||
| ss << "Expected object/map for config node:\n"; | ||
| ss << config_node << ".\n"; | ||
| ss << "Because schema has nested fields:\n"; | ||
| ss << schema_node; | ||
|
S1mpotyaga marked this conversation as resolved.
Outdated
|
||
| throw config_node.create_parsing_error(ss.str()); | ||
|
S1mpotyaga marked this conversation as resolved.
|
||
| } | ||
| validate_untyped(schema_node, config_node); | ||
| } | ||
| } | ||
|
|
||
| void SchemaServer::validate(const std::filesystem::path& schema_path, | ||
| const ConfigNodeWithPreset& config_node) { | ||
| std::filesystem::path full_path = | ||
| schema_path.is_absolute() ? schema_path : m_schemas_dir / schema_path; | ||
| auto exp_sub_schema = safe_load_file(full_path); | ||
| if (!exp_sub_schema) { | ||
| throw config_node.create_parsing_error( | ||
| fmt::format("Could not find schema {} due to error {}", | ||
| full_path.string(), exp_sub_schema.error())); | ||
| } | ||
|
S1mpotyaga marked this conversation as resolved.
|
||
| validate(exp_sub_schema.value(), config_node); | ||
| } | ||
|
|
||
| } // namespace sim | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #pragma once | ||
|
|
||
| #include "parser/config_reader/config_node_with_preset.hpp" | ||
|
|
||
| namespace sim { | ||
|
|
||
| using ConfigSchema = ConfigNode; | ||
|
|
||
| class SchemaServer { | ||
| public: | ||
| SchemaServer(const std::filesystem::path& a_schema_path); | ||
|
S1mpotyaga marked this conversation as resolved.
Outdated
|
||
|
|
||
| void validate(const ConfigSchema& schema_node, | ||
| const ConfigNodeWithPreset& config_node); | ||
|
|
||
| void validate(const std::filesystem::path& schema_path, | ||
| const ConfigNodeWithPreset& config_node); | ||
|
|
||
| private: | ||
| // if schema_node correspond to basic type, validate config_node and returns | ||
| // true otherwise, returns false | ||
| [[nodiscard]] bool try_validate_basic_types( | ||
| const ConfigSchema& schema_node, | ||
| const ConfigNodeWithPreset& config_node); | ||
|
|
||
| // if schema_node correspond to custom type, validate config_node and | ||
| // returns true otherwise, returns false | ||
| [[nodiscard]] bool try_validate_custom_types( | ||
| const ConfigSchema& schema_node, | ||
| const ConfigNodeWithPreset& config_node); | ||
|
S1mpotyaga marked this conversation as resolved.
|
||
|
|
||
| void validate_untyped(const ConfigSchema& schema_node, | ||
| const ConfigNodeWithPreset& config_node); | ||
|
|
||
| static bool is_meta_field(const std::string& field); | ||
|
|
||
| private: | ||
| const std::filesystem::path m_schemas_dir; | ||
| }; | ||
|
|
||
| } // namespace sim | ||
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| node: | ||
| field1: | ||
| _type: size_t | ||
| field2: | ||
| _type: int | ||
| field3: | ||
| _type: double | ||
| field4: | ||
| _type: bool | ||
| field5: | ||
| _type: string | ||
| field6: | ||
| _type: regex |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| _type: int | ||
| _doc: Custom type |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| node: | ||
|
S1mpotyaga marked this conversation as resolved.
|
||
| field1: | ||
| _type: custom_type.schema | ||
| field2: | ||
| _type: int | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| node: | ||
|
S1mpotyaga marked this conversation as resolved.
Outdated
|
||
| _type: bool | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| node: | ||
| field1: 12389 | ||
| field2: 21039 | ||
| field3: 1.35 | ||
| field4: false | ||
| field5: hello | ||
| field6: ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| node: | ||
| field1: hello | ||
| field2: hello | ||
| field3: hello | ||
| field4: hello | ||
| field5: hello | ||
| field6: 1.25 |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.