Skip to content

#133 Patched the version management to handle the newer method FOCUS is using with hosting Requirements Model files #134

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.

Sign up for GitHub

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
mike-finopsorg merged 6 commits into from
Feb 26, 2026
Merged

#133 Patched the version management to handle the newer method FOCUS is using with hosting Requirements Model files #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99466c7
Patched the version management to handle the newer method FOCUS is us…
mike-finopsorg Feb 25, 2026
81c3500
Clean up for lint checks
mike-finopsorg Feb 25, 2026
3f9570d
Update json loader to return extra data need to avoid duplicate JSON …
mike-finopsorg Feb 26, 2026
4e4b2bd
Fix so newest match wins
mike-finopsorg Feb 26, 2026
c53c1cf
Updated model file is needed for github unittests to run
mike-finopsorg Feb 26, 2026
0ac1890
fix tests to work with locally available 1.2 version of the model
mike-finopsorg Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.0.1
current_version = 2.0.2
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>(rc|dev))(?P<build>\d+))?
Expand Down
6 changes: 3 additions & 3 deletions focus_validator/config_objects/json_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@ def load_json_rules_with_dependencies_and_types(
focus_dataset: Optional[str] = "",
filter_rules: Optional[str] = None,
applicability_criteria_list: Optional[List[str]] = None,
) -> Tuple[ValidationPlan, Dict[str, str]]:
) -> Tuple[ValidationPlan, Dict[str, str], Dict[str, Any]]:
"""
Load CR JSON, build the dependency graph with RuleDependencyResolver,
select relevant rules, and return both an execution-ready ValidationPlan
(parents preserved, topo-ordered nodes + layers) and a column type mapping.

Returns:
Tuple of (ValidationPlan, Dict[column_name, pandas_dtype])
Tuple of (ValidationPlan, Dict[column_name, pandas_dtype], Dict[model_data])
"""
model_data = JsonLoader.load_json_rules(json_rule_file)

Expand Down Expand Up @@ -227,4 +227,4 @@ def load_json_rules_with_dependencies_and_types(
exec_ctx=None, # supply a runtime context later if you want gated edges
)

return val_plan, column_types
return val_plan, column_types, model_data
6 changes: 3 additions & 3 deletions focus_validator/rules/model-1.2.json → focus_validator/rules/model-1.2.0.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Details": {
"ModelVersion": "1.2",
"ModelVersion": "1.2.0.1",
"FOCUSVersion": "1.2"
},
"ApplicabilityCriteria": {
Expand Down Expand Up @@ -9713,7 +9713,7 @@
},
"Condition": {
"CheckFunction": "CheckNotValue",
"CheckCondition": "ResourceId",
"ColumnName": "ResourceId",
"Value": null
},
"Dependencies": [
Expand Down Expand Up @@ -12674,7 +12674,7 @@
"MustSatisfy": "CommitmentDiscountStatus MUST be null when CommitmentDiscountId is null.",
"Keyword": "MUST",
"Requirement": {
"CheckFunction": "CheckNotValue",
"CheckFunction": "CheckValue",
"ColumnName": "CommitmentDiscountStatus",
"Value": null
},
Expand Down
Loading