Skip to content
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

fix parse_func #45

Merged
merged 3 commits into from
Nov 11, 2024
Merged

fix parse_func #45

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70f2028
fix parse_func.py
chirizxc Oct 30, 2024
876fc6d
add tests
chirizxc Oct 31, 2024
a7d6fd9
fix test for ruff
chirizxc Oct 31, 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
45 changes: 24 additions & 21 deletions src/dataclass_rest/parse_func.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
TypeAlias,
TypedDict,
Union,
get_type_hints,
)

from .http_request import File
Expand All @@ -25,9 +26,9 @@ def get_url_params_from_string(url_template: str) -> List[str]:


def create_query_params_type(
spec: FullArgSpec,
func: Callable,
skipped: Sequence[str],
spec: FullArgSpec,
func: Callable,
skipped: Sequence[str],
) -> Type:
fields = {}
self_processed = False
Expand All @@ -37,48 +38,50 @@ def create_query_params_type(
continue
if x in skipped:
continue
fields[x] = spec.annotations.get(x, Any)
fields[x] = get_type_hints(func).get(x, Any)
return TypedDict(f"{func.__name__}_Params", fields)


def create_body_type(
spec: FullArgSpec,
body_param_name: str,
spec: FullArgSpec,
func: Callable,
body_param_name: str,
) -> Type:
return spec.annotations.get(body_param_name, Any)
return get_type_hints(func).get(body_param_name, Any)


def create_response_type(
spec: FullArgSpec,
func: Callable,
) -> Type:
return spec.annotations.get("return", Any)
return get_type_hints(func).get("return", Any)


def get_file_params(spec):
def get_file_params(func: Callable) -> List[str]:
type_hints = get_type_hints(func)
return [
field
for field, field_type in spec.annotations.items()
for field, field_type in type_hints.items()
if isclass(field_type) and issubclass(field_type, File)
]


def get_url_params_from_callable(
url_template: Callable[..., str],
url_template: Callable[..., str],
) -> List[str]:
url_template_func_arg_spec = getfullargspec(url_template)
return url_template_func_arg_spec.args


def parse_func(
func: Callable,
method: str,
url_template: UrlTemplate,
additional_params: Dict[str, Any],
is_json_request: bool, # noqa: FBT001
body_param_name: str,
func: Callable,
method: str,
url_template: UrlTemplate,
additional_params: Dict[str, Any],
is_json_request: bool, # noqa: FBT001
body_param_name: str,
) -> MethodSpec:
spec = getfullargspec(func)
file_params = get_file_params(spec)
file_params = get_file_params(func)

is_string_url_template = isinstance(url_template, str)
url_template_callable = (
Expand All @@ -99,8 +102,8 @@ def parse_func(
url_template=url_template_callable,
url_params=url_params,
query_params_type=create_query_params_type(spec, func, skipped_params),
body_type=create_body_type(spec, body_param_name),
response_type=create_response_type(spec),
body_type=create_body_type(spec, func, body_param_name),
response_type=create_response_type(func),
body_param_name=body_param_name,
additional_params=additional_params,
is_json_request=is_json_request,
Expand Down