Skip to content

feat: Add default_value and value_type to Variable class #227

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

Closed
anth-volk wants to merge 1 commit into from
Closed

feat: Add default_value and value_type to Variable class #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions src/policyengine/core/variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ class Variable(BaseModel):
description: str | None = None
data_type: type = None
possible_values: list[Any] | None = None
default_value: Any = None
value_type: type | None = None
9 changes: 9 additions & 0 deletions src/policyengine/tax_benefit_models/uk/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,13 @@ def __init__(self, **kwargs: dict):
self.id = f"{self.model.id}@{self.version}"

for var_obj in system.variables.values():
# Serialize default_value for JSON compatibility
default_val = var_obj.default_value
if var_obj.value_type is Enum:
default_val = default_val.name
elif var_obj.value_type is datetime.date:
default_val = default_val.isoformat()

variable = Variable(
id=self.id + "-" + var_obj.name,
name=var_obj.name,
Expand All @@ -135,6 +142,8 @@ def __init__(self, **kwargs: dict):
data_type=var_obj.value_type
if var_obj.value_type is not Enum
else str,
default_value=default_val,
value_type=var_obj.value_type,
)
if (
hasattr(var_obj, "possible_values")
Expand Down
9 changes: 9 additions & 0 deletions src/policyengine/tax_benefit_models/us/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ def __init__(self, **kwargs: dict):
self.id = f"{self.model.id}@{self.version}"

for var_obj in system.variables.values():
# Serialize default_value for JSON compatibility
default_val = var_obj.default_value
if var_obj.value_type is Enum:
default_val = default_val.name
elif var_obj.value_type is datetime.date:
default_val = default_val.isoformat()

variable = Variable(
id=self.id + "-" + var_obj.name,
name=var_obj.name,
Expand All @@ -128,6 +135,8 @@ def __init__(self, **kwargs: dict):
data_type=var_obj.value_type
if var_obj.value_type is not Enum
else str,
default_value=default_val,
value_type=var_obj.value_type,
)
if (
hasattr(var_obj, "possible_values")
Expand Down
Loading