code refactor: rename ellar.common.logger to ellar.common.logging

eadwinCode · eadwinCode · commit 24729076857a · 2023-12-10T12:39:09.000+01:00
diff --git a/ellar/app/context.py b/ellar/app/context.py
@@ -4,7 +4,7 @@
 from types import TracebackType
 
 from ellar.common.constants import ELLAR_CONFIG_MODULE
-from ellar.common.logger import logger
+from ellar.common.logging import logger
 from ellar.common.utils.functional import SimpleLazyObject, empty
 from ellar.core import Config
 from ellar.di import EllarInjector
diff --git a/ellar/app/lifespan.py b/ellar/app/lifespan.py
@@ -3,7 +3,7 @@
 
 from anyio import create_task_group
 from ellar.common import IApplicationShutdown, IApplicationStartup
-from ellar.common.logger import logger
+from ellar.common.logging import logger
 
 if t.TYPE_CHECKING:
     from ellar.app import App
diff --git a/ellar/common/decorators/controller.py b/ellar/common/decorators/controller.py
@@ -13,7 +13,7 @@
     ROUTE_OPERATION_PARAMETERS,
 )
 from ellar.common.exceptions import ImproperConfiguration
-from ellar.common.logger import logger
+from ellar.common.logging import logger
 from ellar.common.models import ControllerBase, ControllerType
 from ellar.di import RequestORTransientScope, injectable
 from ellar.reflect import REFLECT_TYPE, reflect
diff --git a/ellar/common/logging.py b/ellar/common/logging.py
diff --git a/ellar/common/params/args/request_model.py b/ellar/common/params/args/request_model.py
@@ -2,7 +2,7 @@
 
 from ellar.common.constants import MULTI_RESOLVER_KEY
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import logger
+from ellar.common.logging import logger
 from ellar.pydantic import (
     BaseModel,
     ModelField,
diff --git a/ellar/common/params/resolvers/bulk_parameter.py b/ellar/common/params/resolvers/bulk_parameter.py
@@ -1,7 +1,7 @@
 import typing as t
 
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.pydantic import ErrorWrapper, ModelField
 
 from .base import BaseRouteParameterResolver
diff --git a/ellar/common/params/resolvers/parameter.py b/ellar/common/params/resolvers/parameter.py
@@ -11,7 +11,7 @@
 )
 from ellar.common.exceptions import RequestValidationError
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.pydantic import (
     is_sequence_field,
     lenient_issubclass,
diff --git a/ellar/common/responses/models/base.py b/ellar/common/responses/models/base.py
@@ -5,7 +5,7 @@
 from ellar.common.constants import SERIALIZER_FILTER_KEY
 from ellar.common.exceptions import RequestValidationError
 from ellar.common.interfaces import IExecutionContext, IResponseModel
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.serializer import BaseSerializer, SerializerFilter
 from ellar.pydantic import ModelField, create_model_field
 from ellar.reflect import reflect
diff --git a/ellar/common/responses/models/file.py b/ellar/common/responses/models/file.py
@@ -2,7 +2,7 @@
 from enum import Enum
 
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.serializer import Serializer, SerializerFilter
 
 from ..response_types import FileResponse, Response, StreamingResponse
diff --git a/ellar/common/responses/models/html.py b/ellar/common/responses/models/html.py
@@ -1,7 +1,7 @@
 import typing as t
 
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.templating import (
     Environment,
     TemplateResponse,
diff --git a/ellar/common/responses/models/json.py b/ellar/common/responses/models/json.py
@@ -2,7 +2,7 @@
 
 from ellar.common.constants import SERIALIZER_FILTER_KEY
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.serializer import SerializerFilter, serialize_object
 from ellar.pydantic import as_pydantic_validator, create_model_field
 from ellar.reflect import reflect
diff --git a/ellar/common/responses/models/route.py b/ellar/common/responses/models/route.py
@@ -2,7 +2,7 @@
 
 from ellar.common.constants import SCOPE_RESPONSE_STARTED
 from ellar.common.interfaces import IExecutionContext, IResponseModel
-from ellar.common.logger import logger, request_logger
+from ellar.common.logging import logger, request_logger
 from ellar.pydantic import BaseModel
 
 from ..response_types import Response
diff --git a/ellar/common/routing/base.py b/ellar/common/routing/base.py
@@ -13,7 +13,7 @@
     IGuardsConsumer,
     IInterceptorsConsumer,
 )
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.types import TReceive, TScope, TSend
 from ellar.reflect import reflect
 from starlette.routing import Match
diff --git a/ellar/common/routing/controller/base.py b/ellar/common/routing/controller/base.py
@@ -1,7 +1,7 @@
 import typing as t
 
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.models import ControllerBase
 
 
diff --git a/ellar/common/routing/controller/route.py b/ellar/common/routing/controller/route.py
@@ -1,7 +1,7 @@
 import typing as t
 
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.routing.route import RouteOperation
 from starlette.concurrency import run_in_threadpool
 
diff --git a/ellar/common/routing/controller/websocket/handler.py b/ellar/common/routing/controller/websocket/handler.py
@@ -1,7 +1,7 @@
 import typing as t
 
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.models import ControllerBase
 
 from ...websocket import WebSocketExtraHandler
diff --git a/ellar/common/routing/controller/websocket/route.py b/ellar/common/routing/controller/websocket/route.py
@@ -1,7 +1,7 @@
 import typing as t
 
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 
 from ...websocket import WebsocketRouteOperation
 from ..base import ControllerRouteOperationBase
diff --git a/ellar/common/routing/mount.py b/ellar/common/routing/mount.py
@@ -2,7 +2,7 @@
 import uuid
 
 from ellar.common.constants import CONTROLLER_CLASS_KEY, GUARDS_KEY, VERSIONING_KEY
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.models import GuardCanActivate
 from ellar.common.types import TReceive, TScope, TSend
 from ellar.common.utils import get_unique_control_type
diff --git a/ellar/common/routing/route.py b/ellar/common/routing/route.py
@@ -9,7 +9,7 @@
 )
 from ellar.common.exceptions import ImproperConfiguration, RequestValidationError
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.params import ExtraEndpointArg, RequestEndpointArgsModel
 from ellar.common.responses.models import RouteResponseModel
 from ellar.common.utils import generate_operation_unique_id, get_name
diff --git a/ellar/common/routing/route_collections.py b/ellar/common/routing/route_collections.py
@@ -2,7 +2,7 @@
 import uuid
 from collections import OrderedDict
 
-from ellar.common.logger import logger
+from ellar.common.logging import logger
 from ellar.common.utils import generate_controller_operation_unique_id
 from starlette.routing import BaseRoute, Host, Mount
 
diff --git a/ellar/common/routing/websocket/handler.py b/ellar/common/routing/websocket/handler.py
@@ -3,7 +3,7 @@
 
 from ellar.common.exceptions import WebSocketRequestValidationError
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.params import WebsocketEndpointArgsModel
 from starlette import status
 from starlette.exceptions import WebSocketException
diff --git a/ellar/common/routing/websocket/route.py b/ellar/common/routing/websocket/route.py
@@ -10,7 +10,7 @@
     WebSocketRequestValidationError,
 )
 from ellar.common.interfaces import IExecutionContext
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.common.params import ExtraEndpointArg, WebsocketEndpointArgsModel
 from ellar.common.utils import get_name
 from ellar.reflect import reflect
diff --git a/ellar/common/shortcuts.py b/ellar/common/shortcuts.py
@@ -1,6 +1,6 @@
 from typing import Any, Callable, Optional, no_type_check
 
-from .logger import logger
+from .logging import logger
 
 
 @no_type_check
diff --git a/ellar/core/interceptors/consumer.py b/ellar/core/interceptors/consumer.py
@@ -3,7 +3,7 @@
 
 from ellar.common import EllarInterceptor, IExecutionContext, IInterceptorsConsumer
 from ellar.common.constants import ROUTE_INTERCEPTORS, SCOPE_RESPONSE_STARTED
-from ellar.common.logger import request_logger
+from ellar.common.logging import request_logger
 from ellar.di import injectable
 
 if t.TYPE_CHECKING:  # pragma: no cover
diff --git a/ellar/core/routing/builder.py b/ellar/core/routing/builder.py
@@ -1,7 +1,7 @@
 import typing as t
 from abc import abstractmethod
 
-from ellar.common.logger import logger
+from ellar.common.logging import logger
 from starlette.routing import Host, Mount
 
 if t.TYPE_CHECKING:  # pragma: no cover
diff --git a/ellar/core/routing/helper.py b/ellar/core/routing/helper.py
@@ -6,7 +6,7 @@
     CONTROLLER_OPERATION_HANDLER_KEY,
     ROUTE_OPERATION_PARAMETERS,
 )
-from ellar.common.logger import logger
+from ellar.common.logging import logger
 from ellar.common.routing import (
     RouteOperation,
     RouteOperationBase,
diff --git a/ellar/pydantic/emails.py b/ellar/pydantic/emails.py
@@ -8,7 +8,7 @@
     assert email_validator
     from pydantic import EmailStr
 except ImportError:  # pragma: no cover
-    from ellar.common.logger import logger
+    from ellar.common.logging import logger
 
     @as_pydantic_validator(
         "__validate_input", schema={"type": "string", "format": "email"}
diff --git a/examples/03-auth-with-guards/auth_project/auth/guards.py b/examples/03-auth-with-guards/auth_project/auth/guards.py
@@ -6,7 +6,7 @@
     GuardCanActivate,
     IExecutionContext,
     constants,
-    logger,
+    logging,
     set_metadata,
 )
 from ellar.common.serializer.guard import (
@@ -39,5 +39,5 @@ async def authentication_handler(
             data = await self.jwt_service.decode_async(credentials.credentials)
             return UserIdentity(auth_type="bearer", **data)
         except Exception as ex:
-            logger.logger.error(f"[AuthGuard] Exception: {ex}")
+            logging.logger.error(f"[AuthGuard] Exception: {ex}")
             self.raise_exception()
diff --git a/examples/03-auth-with-guards/auth_project/auth/guards_case_2.py b/examples/03-auth-with-guards/auth_project/auth/guards_case_2.py
@@ -2,7 +2,7 @@
 
 from ellar.auth import UserIdentity
 from ellar.auth.guards import GuardHttpBearerAuth
-from ellar.common import IExecutionContext, logger, set_metadata
+from ellar.common import IExecutionContext, logging, set_metadata
 from ellar.common.serializer.guard import (
     HTTPAuthorizationCredentials,
 )
@@ -39,5 +39,5 @@ async def authentication_handler(
             data = await self.jwt_service.decode_async(credentials.credentials)
             return UserIdentity(auth_type=self.scheme, **data)
         except Exception as ex:
-            logger.logger.error(f"[AuthGuard] Exception: {ex}")
+            logging.logger.error(f"[AuthGuard] Exception: {ex}")
             self.raise_exception()
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -22,13 +22,10 @@ def test_client_factory(anyio_backend_name, anyio_backend_options):
     name="model_with_path", params=[PurePath, PurePosixPath, PureWindowsPath]
 )
 def fixture_model_with_path(request):
-    class Config:
-        arbitrary_types_allowed = True
-
     model_with_path = create_model(
         "ModelWithPath",
         path=(request.param, ...),
-        __config__=Config,  # type: ignore
+        __config__={"arbitrary_types_allowed": True},  # type: ignore
     )
     return model_with_path(path=request.param("/foo", "bar"))
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`ROUTE_OPERATION_PARAMETERS,`
`14`	`14`	`)`
`15`	`15`	`from ellar.common.exceptions import ImproperConfiguration`
`16`		`-from ellar.common.logger import logger`
	`16`	`+from ellar.common.logging import logger`
`17`	`17`	`from ellar.common.models import ControllerBase, ControllerType`
`18`	`18`	`from ellar.di import RequestORTransientScope, injectable`
`19`	`19`	`from ellar.reflect import REFLECT_TYPE, reflect`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`)`
`12`	`12`	`from ellar.common.exceptions import RequestValidationError`
`13`	`13`	`from ellar.common.interfaces import IExecutionContext`
`14`		`-from ellar.common.logger import request_logger`
	`14`	`+from ellar.common.logging import request_logger`
`15`	`15`	`from ellar.pydantic import (`
`16`	`16`	`is_sequence_field,`
`17`	`17`	`lenient_issubclass,`