Skip to content

Make optional input fields NotRequired #124

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
cbrewster merged 1 commit into from
Jan 6, 2025
Merged

Make optional input fields NotRequired #124

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
36 changes: 28 additions & 8 deletions replit_river/codegen/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
Literal,
Optional,
Mapping,
NotRequired,
Union,
Tuple,
TypedDict,
Expand Down Expand Up @@ -507,7 +508,9 @@ def extract_props(tpe: RiverType) -> list[dict[str, RiverType]]:
encoder_names.add(encoder_name)
typeddict_encoder.append(f"{encoder_name}(x[{repr(name)}])")
if name not in type.required:
typeddict_encoder.append(f"if x[{repr(name)}] else None")
typeddict_encoder.append(
f"if {repr(name)} in x and x[{repr(name)}] else None"
)
elif isinstance(prop, RiverIntersectionType):
encoder_name = TypeName(
f"encode_{ensure_literal_type(type_name)}"
Expand Down Expand Up @@ -541,7 +544,12 @@ def extract_props(tpe: RiverType) -> list[dict[str, RiverType]]:
items = cast(RiverConcreteType, prop).items
assert items, "Somehow items was none"
if is_literal(cast(RiverType, items)):
typeddict_encoder.append(f"x[{repr(name)}]")
if name in prop.required:
typeddict_encoder.append(f"x[{repr(name)}]")
else:
typeddict_encoder.append(
f"x.get({repr(safe_name)})"
)
else:
match type_name:
case ListTypeExpr(inner_type_name):
Expand Down Expand Up @@ -606,12 +614,24 @@ def extract_props(tpe: RiverType) -> list[dict[str, RiverType]]:
)
else:
if name not in type.required:
value = ""
if base_model != "TypedDict":
value = " = None"
current_chunks.append(
f" {name}: Optional[{render_type_expr(type_name)}]{value}"
)
if base_model == "TypedDict":
current_chunks.append(
reindent(
" ",
f"""\
{name}: NotRequired[Optional[{render_type_expr(type_name)}]]
""",
)
)
else:
current_chunks.append(
reindent(
" ",
f"""\
{name}: Optional[{render_type_expr(type_name)}] = None
""",
)
)
else:
current_chunks.append(
f" {name}: {render_type_expr(type_name)}"
Expand Down
Loading