Skip to content

SerDe tweaks #61

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 2 commits into from
Aug 9, 2024
Merged

SerDe tweaks #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7b2fdc
parse_obj_as is deprecated
blast-hardcheese Aug 9, 2024
08491df
If x is a primitive, model_dump will not be defined
blast-hardcheese Aug 9, 2024
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
33 changes: 17 additions & 16 deletions replit_river/codegen/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def generate_river_client_module(
"import datetime",
"from typing import Any, Dict, List, Literal, Optional, Mapping, Union, Tuple",
"",
"from pydantic import BaseModel, Field, parse_obj_as",
"from pydantic import BaseModel, Field, TypeAdapter",
"from replit_river.error_schema import RiverError",
"",
"import replit_river as river",
Expand Down Expand Up @@ -243,21 +243,22 @@ def generate_river_client_module(
if error_type == "None":
error_type = "RiverError"
output_or_error_type = f"Union[{output_type}, {error_type}]"
error_encoder = f"parse_obj_as({error_type}, x)"
error_encoder = f"TypeAdapter({error_type}).validate_python(x)"
else:
output_or_error_type = f"Union[{output_type}, {error_type}]"
error_encoder = f"parse_obj_as({error_type}, x)"
error_encoder = f"TypeAdapter({error_type}).validate_python(x)"
chunks.extend(errors_chunks)
else:
error_type = "RiverError"
output_or_error_type = f"Union[{output_type}, {error_type}]"
error_encoder = f"parse_obj_as({error_type}, x)"
error_encoder = f"TypeAdapter({error_type}).validate_python(x)"

output_encoder = f"parse_obj_as({output_type}, x)"
output_encoder = f"TypeAdapter({output_type}).validate_python(x)"
if output_type == "None":
output_encoder = "None"
# TODO: mypy ignore is added because parse_obj_as cannot handle Union types,
# it should be fixed by making parse_output_method type aware.
# TODO: mypy ignore is added because TypeAdapter(...).validate_python
# cannot handle Union types, it should be fixed by making
# parse_output_method type aware.
parse_output_method = (
f"lambda x: {output_encoder}, # type: ignore[arg-type]"
)
Expand All @@ -277,7 +278,7 @@ def generate_river_client_module(
f" '{schema_name}',",
f" '{name}',",
" input,",
" lambda x: x.model_dump(",
" lambda x: TypeAdapter({input_type}).dump_python(x, ",
" by_alias=True,",
" exclude_none=True,",
" ),",
Expand All @@ -297,7 +298,7 @@ def generate_river_client_module(
f" '{schema_name}',",
f" '{name}',",
" input,",
" lambda x: x.model_dump(",
" lambda x: TypeAdapter({input_type}).dump_python(x,",
" by_alias=True,",
" exclude_none=True,",
" ),",
Expand All @@ -308,7 +309,7 @@ def generate_river_client_module(
)
elif procedure.type == "upload":
control_flow_keyword = "return "
output_encoder = f"parse_obj_as({output_type}, x)"
output_encoder = f"TypeAdapter({output_type}).validate_python(x)"
if output_type == "None":
control_flow_keyword = ""
output_encoder = "None"
Expand All @@ -325,8 +326,8 @@ def generate_river_client_module(
f" '{name}',",
" init,",
" inputStream,",
f" lambda x: parse_obj_as({init_type}, x),",
" lambda x: x.model_dump(",
f" lambda TypeAdapter({init_type}).validate_python,",
" lambda x: TypeAdapter({input_type}).dump_python(x, ",
" by_alias=True,",
" exclude_none=True,",
" ),",
Expand All @@ -348,7 +349,7 @@ def generate_river_client_module(
" None,",
" inputStream,",
" None,",
" lambda x: x.model_dump(",
" lambda x: TypeAdapter({input_type}).dump_python(x, ",
" by_alias=True,",
" exclude_none=True,",
" ),",
Expand All @@ -371,8 +372,8 @@ def generate_river_client_module(
f" '{name}',",
" init,",
" inputStream,",
f" lambda x: parse_obj_as({init_type}, x),",
" lambda x: x.model_dump(",
f" TypeAdapter({init_type}).validate_python,",
" lambda x: TypeAdapter({init_type}).dump_python(x, ",
" by_alias=True,",
" exclude_none=True,",
" ),",
Expand All @@ -394,7 +395,7 @@ def generate_river_client_module(
" None,",
" inputStream,",
" None,",
" lambda x: x.model_dump(",
" lambda x: TypeAdapter({input_type}).dump_python(x, ",
" by_alias=True,",
" exclude_none=True,",
" ),",
Expand Down
Loading