Skip to content

Handles NaN searilization #1168

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
merged 1 commit into from
Jun 17, 2025
Merged

Handles NaN searilization #1168

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
6 changes: 5 additions & 1 deletion flow360/component/simulation/user_code/core/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,9 @@ def _serializer(value, info) -> dict:
pass

if isinstance(evaluated, Number):
serialized.evaluated_value = evaluated
serialized.evaluated_value = (
evaluated if not np.isnan(evaluated) else None # NaN-None handling
)
elif isinstance(evaluated, unyt_array):
if evaluated.size == 1:
serialized.evaluated_value = (
Expand All @@ -845,6 +847,8 @@ def _serializer(value, info) -> dict:
serialized.evaluated_units = str(evaluated.units.expr)
else:
serialized = SerializedValueOrExpression(type_name="number")
# Note: NaN handling should be unnecessary since it would
# have end up being expression first so not reaching here.
if isinstance(value, (Number, List)):
serialized.value = value
elif isinstance(value, unyt_array):
Expand Down
10 changes: 7 additions & 3 deletions tests/simulation/test_expressions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
import re
from typing import Annotated
from typing import Annotated, Optional

import numpy as np
import pydantic as pd
Expand Down Expand Up @@ -433,17 +433,21 @@ def test_serializer(
):
class TestModel(Flow360BaseModel):
field: ValueOrExpression[VelocityType] = pd.Field()
non_dim_field: Optional[ValueOrExpression[float]] = pd.Field(default=None)

x = UserVariable(name="x", value=4)
cp = UserVariable(name="my_cp", value=solution.Cp)

model = TestModel(field=x * u.m / u.s + 4 * x**2 * u.m / u.s)
model = TestModel(field=x * u.m / u.s + 4 * x**2 * u.m / u.s, non_dim_field=cp)

assert str(model.field) == "x * u.m / u.s + 4 * x ** 2 * u.m / u.s"

serialized = model.model_dump(exclude_none=True)
serialized = model.model_dump()

assert serialized["field"]["type_name"] == "expression"
assert serialized["field"]["expression"] == "x * u.m / u.s + 4 * x ** 2 * u.m / u.s"
assert serialized["non_dim_field"]["expression"] == "my_cp"
assert serialized["non_dim_field"]["evaluated_value"] == None # Not NaN anymore

model = TestModel(field=4 * u.m / u.s)

Expand Down