Skip to content

Commit f6dab5d

Browse files
committed
removed some unnecessary functions from reflect module
1 parent 2c59670 commit f6dab5d

File tree

13 files changed

+60
-58
lines changed

13 files changed

+60
-58
lines changed

ellar/common/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Module,
99
command,
1010
exception_handler,
11+
extra_args,
1112
file,
1213
guards,
1314
middleware,
@@ -98,6 +99,7 @@
9899
"Http",
99100
"UploadFile",
100101
"file",
102+
"extra_args",
101103
]
102104

103105

ellar/common/decorators/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from .command import command
55
from .controller import Controller
66
from .exception import exception_handler
7+
from .extra_args import extra_args
78
from .file import file
89
from .guards import guards
910
from .html import render, template_filter, template_global
@@ -31,6 +32,7 @@
3132
"middleware",
3233
"openapi_info",
3334
"Module",
35+
"extra_args",
3436
]
3537

3638

ellar/common/decorators/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
def set_metadata(
99
meta_key: t.Any,
1010
meta_value: t.Optional[t.Any] = NOT_SET,
11-
default_value: t.Any = None,
1211
) -> t.Callable:
1312
if meta_value is NOT_SET:
1413
return partial(set_metadata, meta_key)
1514

1615
def _decorator(target: t.Union[t.Callable, t.Any]) -> t.Union[t.Callable, t.Any]:
17-
reflect.define_metadata(meta_key, meta_value, target, default_value)
16+
reflect.define_metadata(meta_key, meta_value, target)
1817
return target
1918

2019
return _decorator

ellar/common/decorators/controller.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ def reflect_all_controller_type_routes(cls: t.Type[ControllerBase]) -> None:
5858
reflect.define_metadata(CONTROLLER_CLASS_KEY, cls, endpoint_func)
5959
reflect.define_metadata(
6060
CONTROLLER_OPERATION_HANDLER_KEY,
61-
operation,
61+
[operation],
6262
cls,
63-
default_value=[],
6463
)
6564

6665

ellar/common/decorators/extra_args.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import typing as t
2+
3+
from ellar.constants import EXTRA_ROUTE_ARGS_KEY
4+
from ellar.core.params import ExtraEndpointArg
5+
6+
from .base import set_metadata as set_meta
7+
8+
9+
def extra_args(*args: ExtraEndpointArg) -> t.Callable:
10+
"""
11+
=========FUNCTION DECORATOR ==============
12+
13+
Programmatically adds extra route function parameter.
14+
see https://github.com/eadwinCode/ellar/blob/main/tests/test_routing/test_extra_args.py for usages
15+
:param args: Collection ExtraEndpointArg
16+
:return:
17+
"""
18+
return set_meta(EXTRA_ROUTE_ARGS_KEY, list(args))

ellar/common/decorators/guards.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ def guards(
1818
:param _guards: Guard Type or Instance
1919
:return:
2020
"""
21-
return set_meta(GUARDS_KEY, _guards, default_value=[])
21+
return set_meta(GUARDS_KEY, list(_guards))

ellar/common/decorators/modules.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ def Module(
9090
"""
9191
kwargs = AttributeDict(
9292
name=name,
93-
controllers=controllers,
93+
controllers=list(controllers),
9494
base_directory=base_directory,
9595
static_folder=static_folder,
96-
routers=routers,
97-
providers=providers,
96+
routers=list(routers),
97+
providers=list(providers),
9898
template_folder=template_folder,
99-
modules=modules,
100-
commands=commands,
99+
modules=list(modules),
100+
commands=list(commands),
101101
)
102102

103103
return partial(

ellar/common/decorators/openapi.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ def openapi_info(
3333
deprecated=deprecated,
3434
tags=tags,
3535
),
36-
default_value=AttributeDict(),
3736
)

ellar/common/decorators/versioning.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,4 @@ def version(*_version: str) -> t.Callable:
1313
:param _version: allowed versions
1414
:return:
1515
"""
16-
return set_meta(
17-
VERSIONING_KEY, set([str(i) for i in _version]), default_value=set()
18-
)
16+
return set_meta(VERSIONING_KEY, set([str(i) for i in _version]))

ellar/core/modules/builder.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,15 @@ def exception_config(self, exception_dict: t.Dict) -> None:
4646
func = CallableExceptionHandler(
4747
self._cls, callable_exception_handler=v, exc_class_or_status_code=k
4848
)
49-
reflect.define_metadata(
50-
EXCEPTION_HANDLERS_KEY, func, self._cls, default_value=[]
51-
)
49+
reflect.define_metadata(EXCEPTION_HANDLERS_KEY, [func], self._cls)
5250

5351
@t.no_type_check
5452
def middleware_config(self, middleware: "MiddlewareSchema") -> None:
5553
middleware.dispatch = module_callable_factory(middleware.dispatch, self._cls)
5654
reflect.define_metadata(
5755
MIDDLEWARE_HANDLERS_KEY,
58-
middleware.create_middleware(),
56+
[middleware.create_middleware()],
5957
self._cls,
60-
default_value=[],
6158
)
6259

6360
def on_request_shut_down_config(self, on_shutdown_event: EventHandler) -> None:
@@ -66,9 +63,8 @@ def on_request_shut_down_config(self, on_shutdown_event: EventHandler) -> None:
6663
)
6764
reflect.define_metadata(
6865
ON_REQUEST_SHUTDOWN_KEY,
69-
on_shutdown_event,
66+
[on_shutdown_event],
7067
self._cls,
71-
default_value=[],
7268
)
7369

7470
def on_request_startup_config(self, on_startup_event: EventHandler) -> None:
@@ -77,9 +73,8 @@ def on_request_startup_config(self, on_startup_event: EventHandler) -> None:
7773
)
7874
reflect.define_metadata(
7975
ON_REQUEST_STARTUP_KEY,
80-
on_startup_event,
76+
[on_startup_event],
8177
self._cls,
82-
default_value=[],
8378
)
8479

8580
def template_filter_config(self, template_filter: "TemplateFunctionData") -> None:
@@ -91,7 +86,6 @@ def template_filter_config(self, template_filter: "TemplateFunctionData") -> Non
9186
)
9287
},
9388
self._cls,
94-
default_value={},
9589
)
9690

9791
def template_global_config(self, template_filter: "TemplateFunctionData") -> None:
@@ -103,7 +97,6 @@ def template_global_config(self, template_filter: "TemplateFunctionData") -> Non
10397
)
10498
},
10599
self._cls,
106-
default_value={},
107100
)
108101

109102
def build(self, namespace: t.Dict) -> None:

0 commit comments

Comments
 (0)