Skip to content

Commit 646aca7

Browse files
eadwinCodeeadwinCode
authored
Merge pull request #157 from python-ellar/common_logger_refactor
code refactoring
2 parents 6957bd3 + 2472907 commit 646aca7

File tree

30 files changed

+31
-34
lines changed

30 files changed

+31
-34
lines changed

‎ellar/app/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from types import TracebackType
55

66
from ellar.common.constants import ELLAR_CONFIG_MODULE
7-
from ellar.common.logger import logger
7+
from ellar.common.logging import logger
88
from ellar.common.utils.functional import SimpleLazyObject, empty
99
from ellar.core import Config
1010
from ellar.di import EllarInjector

‎ellar/app/lifespan.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from anyio import create_task_group
55
from ellar.common import IApplicationShutdown, IApplicationStartup
6-
from ellar.common.logger import logger
6+
from ellar.common.logging import logger
77

88
if t.TYPE_CHECKING:
99
from ellar.app import App

‎ellar/common/decorators/controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
ROUTE_OPERATION_PARAMETERS,
1414
)
1515
from ellar.common.exceptions import ImproperConfiguration
16-
from ellar.common.logger import logger
16+
from ellar.common.logging import logger
1717
from ellar.common.models import ControllerBase, ControllerType
1818
from ellar.di import RequestORTransientScope, injectable
1919
from ellar.reflect import REFLECT_TYPE, reflect

‎ellar/common/logger.py renamed to ‎ellar/common/logging.py

File renamed without changes.

‎ellar/common/params/args/request_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from ellar.common.constants import MULTI_RESOLVER_KEY
44
from ellar.common.interfaces import IExecutionContext
5-
from ellar.common.logger import logger
5+
from ellar.common.logging import logger
66
from ellar.pydantic import (
77
BaseModel,
88
ModelField,

‎ellar/common/params/resolvers/bulk_parameter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22

33
from ellar.common.interfaces import IExecutionContext
4-
from ellar.common.logger import request_logger
4+
from ellar.common.logging import request_logger
55
from ellar.pydantic import ErrorWrapper, ModelField
66

77
from .base import BaseRouteParameterResolver

‎ellar/common/params/resolvers/parameter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
)
1212
from ellar.common.exceptions import RequestValidationError
1313
from ellar.common.interfaces import IExecutionContext
14-
from ellar.common.logger import request_logger
14+
from ellar.common.logging import request_logger
1515
from ellar.pydantic import (
1616
is_sequence_field,
1717
lenient_issubclass,

‎ellar/common/responses/models/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from ellar.common.constants import SERIALIZER_FILTER_KEY
66
from ellar.common.exceptions import RequestValidationError
77
from ellar.common.interfaces import IExecutionContext, IResponseModel
8-
from ellar.common.logger import request_logger
8+
from ellar.common.logging import request_logger
99
from ellar.common.serializer import BaseSerializer, SerializerFilter
1010
from ellar.pydantic import ModelField, create_model_field
1111
from ellar.reflect import reflect

‎ellar/common/responses/models/file.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from enum import Enum
33

44
from ellar.common.interfaces import IExecutionContext
5-
from ellar.common.logger import request_logger
5+
from ellar.common.logging import request_logger
66
from ellar.common.serializer import Serializer, SerializerFilter
77

88
from ..response_types import FileResponse, Response, StreamingResponse

‎ellar/common/responses/models/html.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22

33
from ellar.common.interfaces import IExecutionContext
4-
from ellar.common.logger import request_logger
4+
from ellar.common.logging import request_logger
55
from ellar.common.templating import (
66
Environment,
77
TemplateResponse,

‎ellar/common/responses/models/json.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from ellar.common.constants import SERIALIZER_FILTER_KEY
44
from ellar.common.interfaces import IExecutionContext
5-
from ellar.common.logger import request_logger
5+
from ellar.common.logging import request_logger
66
from ellar.common.serializer import SerializerFilter, serialize_object
77
from ellar.pydantic import as_pydantic_validator, create_model_field
88
from ellar.reflect import reflect

‎ellar/common/responses/models/route.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from ellar.common.constants import SCOPE_RESPONSE_STARTED
44
from ellar.common.interfaces import IExecutionContext, IResponseModel
5-
from ellar.common.logger import logger, request_logger
5+
from ellar.common.logging import logger, request_logger
66
from ellar.pydantic import BaseModel
77

88
from ..response_types import Response

‎ellar/common/routing/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
IGuardsConsumer,
1414
IInterceptorsConsumer,
1515
)
16-
from ellar.common.logger import request_logger
16+
from ellar.common.logging import request_logger
1717
from ellar.common.types import TReceive, TScope, TSend
1818
from ellar.reflect import reflect
1919
from starlette.routing import Match

‎ellar/common/routing/controller/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22

33
from ellar.common.interfaces import IExecutionContext
4-
from ellar.common.logger import request_logger
4+
from ellar.common.logging import request_logger
55
from ellar.common.models import ControllerBase
66

77

‎ellar/common/routing/controller/route.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22

33
from ellar.common.interfaces import IExecutionContext
4-
from ellar.common.logger import request_logger
4+
from ellar.common.logging import request_logger
55
from ellar.common.routing.route import RouteOperation
66
from starlette.concurrency import run_in_threadpool
77

‎ellar/common/routing/controller/websocket/handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22

33
from ellar.common.interfaces import IExecutionContext
4-
from ellar.common.logger import request_logger
4+
from ellar.common.logging import request_logger
55
from ellar.common.models import ControllerBase
66

77
from ...websocket import WebSocketExtraHandler

‎ellar/common/routing/controller/websocket/route.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22

33
from ellar.common.interfaces import IExecutionContext
4-
from ellar.common.logger import request_logger
4+
from ellar.common.logging import request_logger
55

66
from ...websocket import WebsocketRouteOperation
77
from ..base import ControllerRouteOperationBase

‎ellar/common/routing/mount.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import uuid
33

44
from ellar.common.constants import CONTROLLER_CLASS_KEY, GUARDS_KEY, VERSIONING_KEY
5-
from ellar.common.logger import request_logger
5+
from ellar.common.logging import request_logger
66
from ellar.common.models import GuardCanActivate
77
from ellar.common.types import TReceive, TScope, TSend
88
from ellar.common.utils import get_unique_control_type

‎ellar/common/routing/route.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
)
1010
from ellar.common.exceptions import ImproperConfiguration, RequestValidationError
1111
from ellar.common.interfaces import IExecutionContext
12-
from ellar.common.logger import request_logger
12+
from ellar.common.logging import request_logger
1313
from ellar.common.params import ExtraEndpointArg, RequestEndpointArgsModel
1414
from ellar.common.responses.models import RouteResponseModel
1515
from ellar.common.utils import generate_operation_unique_id, get_name

‎ellar/common/routing/route_collections.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import uuid
33
from collections import OrderedDict
44

5-
from ellar.common.logger import logger
5+
from ellar.common.logging import logger
66
from ellar.common.utils import generate_controller_operation_unique_id
77
from starlette.routing import BaseRoute, Host, Mount
88

‎ellar/common/routing/websocket/handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from ellar.common.exceptions import WebSocketRequestValidationError
55
from ellar.common.interfaces import IExecutionContext
6-
from ellar.common.logger import request_logger
6+
from ellar.common.logging import request_logger
77
from ellar.common.params import WebsocketEndpointArgsModel
88
from starlette import status
99
from starlette.exceptions import WebSocketException

‎ellar/common/routing/websocket/route.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
WebSocketRequestValidationError,
1111
)
1212
from ellar.common.interfaces import IExecutionContext
13-
from ellar.common.logger import request_logger
13+
from ellar.common.logging import request_logger
1414
from ellar.common.params import ExtraEndpointArg, WebsocketEndpointArgsModel
1515
from ellar.common.utils import get_name
1616
from ellar.reflect import reflect

‎ellar/common/shortcuts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any, Callable, Optional, no_type_check
22

3-
from .logger import logger
3+
from .logging import logger
44

55

66
@no_type_check

‎ellar/core/interceptors/consumer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from ellar.common import EllarInterceptor, IExecutionContext, IInterceptorsConsumer
55
from ellar.common.constants import ROUTE_INTERCEPTORS, SCOPE_RESPONSE_STARTED
6-
from ellar.common.logger import request_logger
6+
from ellar.common.logging import request_logger
77
from ellar.di import injectable
88

99
if t.TYPE_CHECKING: # pragma: no cover

‎ellar/core/routing/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22
from abc import abstractmethod
33

4-
from ellar.common.logger import logger
4+
from ellar.common.logging import logger
55
from starlette.routing import Host, Mount
66

77
if t.TYPE_CHECKING: # pragma: no cover

‎ellar/core/routing/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
CONTROLLER_OPERATION_HANDLER_KEY,
77
ROUTE_OPERATION_PARAMETERS,
88
)
9-
from ellar.common.logger import logger
9+
from ellar.common.logging import logger
1010
from ellar.common.routing import (
1111
RouteOperation,
1212
RouteOperationBase,

‎ellar/pydantic/emails.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
assert email_validator
99
from pydantic import EmailStr
1010
except ImportError: # pragma: no cover
11-
from ellar.common.logger import logger
11+
from ellar.common.logging import logger
1212

1313
@as_pydantic_validator(
1414
"__validate_input", schema={"type": "string", "format": "email"}

‎examples/03-auth-with-guards/auth_project/auth/guards.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
GuardCanActivate,
77
IExecutionContext,
88
constants,
9-
logger,
9+
logging,
1010
set_metadata,
1111
)
1212
from ellar.common.serializer.guard import (
@@ -39,5 +39,5 @@ async def authentication_handler(
3939
data = await self.jwt_service.decode_async(credentials.credentials)
4040
return UserIdentity(auth_type="bearer", **data)
4141
except Exception as ex:
42-
logger.logger.error(f"[AuthGuard] Exception: {ex}")
42+
logging.logger.error(f"[AuthGuard] Exception: {ex}")
4343
self.raise_exception()

‎examples/03-auth-with-guards/auth_project/auth/guards_case_2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from ellar.auth import UserIdentity
44
from ellar.auth.guards import GuardHttpBearerAuth
5-
from ellar.common import IExecutionContext, logger, set_metadata
5+
from ellar.common import IExecutionContext, logging, set_metadata
66
from ellar.common.serializer.guard import (
77
HTTPAuthorizationCredentials,
88
)
@@ -39,5 +39,5 @@ async def authentication_handler(
3939
data = await self.jwt_service.decode_async(credentials.credentials)
4040
return UserIdentity(auth_type=self.scheme, **data)
4141
except Exception as ex:
42-
logger.logger.error(f"[AuthGuard] Exception: {ex}")
42+
logging.logger.error(f"[AuthGuard] Exception: {ex}")
4343
self.raise_exception()

‎tests/conftest.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@ def test_client_factory(anyio_backend_name, anyio_backend_options):
2222
name="model_with_path", params=[PurePath, PurePosixPath, PureWindowsPath]
2323
)
2424
def fixture_model_with_path(request):
25-
class Config:
26-
arbitrary_types_allowed = True
27-
2825
model_with_path = create_model(
2926
"ModelWithPath",
3027
path=(request.param, ...),
31-
__config__=Config, # type: ignore
28+
__config__={"arbitrary_types_allowed": True}, # type: ignore
3229
)
3330
return model_with_path(path=request.param("/foo", "bar"))
3431

0 commit comments

Comments
 (0)