Merge pull request #144 from python-ellar/test_coverage_fix

eadwinCode · web-flow · commit 7dc9f25e6891 · 2023-11-17T15:45:05.000+01:00
Test coverage fix
diff --git a/ellar/__init__.py b/ellar/__init__.py
@@ -1,3 +1,3 @@
 """Ellar - Python ASGI web framework for building fast, efficient, and scalable RESTful APIs and server-side applications."""
 
-__version__ = "0.5.6"
+__version__ = "0.5.7"
diff --git a/ellar/cache/backends/local_cache.py b/ellar/cache/backends/local_cache.py
@@ -5,7 +5,7 @@
 from collections import OrderedDict
 
 from anyio import Lock
-from ellar.common.helper.event_loop import get_or_create_eventloop
+from ellar.common.utils.event_loop import get_or_create_eventloop
 
 from ..interface import IBaseCacheBackendAsync
 from ..make_key_decorator import make_key_decorator, make_key_decorator_and_validate
diff --git a/ellar/cache/backends/redis/backend.py b/ellar/cache/backends/redis/backend.py
@@ -2,7 +2,7 @@
 import typing as t
 from abc import ABC
 
-from ellar.common.helper.event_loop import get_or_create_eventloop
+from ellar.common.utils.event_loop import get_or_create_eventloop
 
 try:
     from redis.asyncio import Redis
diff --git a/ellar/cache/make_key_decorator.py b/ellar/cache/make_key_decorator.py
@@ -1,7 +1,7 @@
 import functools
 import typing as t
 
-from ellar.common.helper import is_async_callable
+from ellar.common.utils import is_async_callable
 
 if t.TYPE_CHECKING:  # pragma: no cover
     from .model import BaseCacheBackend
diff --git a/ellar/common/decorators/html.py b/ellar/common/decorators/html.py
@@ -10,11 +10,11 @@
     TEMPLATE_GLOBAL_KEY,
 )
 from ellar.common.exceptions import ImproperConfiguration
-from ellar.common.helper import class_base_function_regex, get_name
 from ellar.common.responses.models import HTMLResponseModel
 from ellar.common.shortcuts import fail_silently
 from ellar.common.templating import TemplateFunctionData
 from ellar.common.types import TemplateFilterCallable, TemplateGlobalCallable
+from ellar.common.utils import class_base_function_regex, get_name
 
 from .base import set_metadata as set_meta
 
diff --git a/ellar/common/exceptions/callable_exceptions.py b/ellar/common/exceptions/callable_exceptions.py
@@ -1,7 +1,7 @@
 import typing as t
 
-from ellar.common.helper import is_async_callable
 from ellar.common.interfaces import IExceptionHandler, IHostContext
+from ellar.common.utils import is_async_callable
 from starlette.concurrency import run_in_threadpool
 from starlette.responses import Response
 
diff --git a/ellar/common/interfaces/controller_factory.py b/ellar/common/interfaces/controller_factory.py
diff --git a/ellar/common/params/args/factory.py b/ellar/common/params/args/factory.py
@@ -1,7 +1,7 @@
 import inspect
 import typing as t
 
-from ellar.common.helper.modelfield import create_model_field
+from ellar.common.utils.modelfield import create_model_field
 from pydantic.fields import FieldInfo, ModelField, Required
 from pydantic.schema import get_annotation_from_field_info
 
diff --git a/ellar/common/params/args/request_model.py b/ellar/common/params/args/request_model.py
@@ -1,9 +1,9 @@
 import typing as t
 
 from ellar.common.constants import MULTI_RESOLVER_KEY
-from ellar.common.helper.modelfield import create_model_field
 from ellar.common.interfaces import IExecutionContext
 from ellar.common.logger import logger
+from ellar.common.utils.modelfield import create_model_field
 from pydantic import BaseModel, create_model
 from pydantic.fields import ModelField
 from starlette.convertors import Convertor
diff --git a/ellar/common/params/params.py b/ellar/common/params/params.py
@@ -1,6 +1,3 @@
-import copy
-import re
-import sys
 import typing as t
 from enum import Enum
 
@@ -22,13 +19,6 @@
     WsBodyParameterResolver,
 )
 
-if sys.version_info >= (3, 6):
-
-    def copier(x: t.Any, memo: t.Dict) -> t.Any:
-        return x
-
-    copy._deepcopy_dispatch[type(re.compile(""))] = copier  # type: ignore
-
 
 class ParamTypes(Enum):
     query = "query"
diff --git a/ellar/common/responses/models/base.py b/ellar/common/responses/models/base.py
@@ -3,10 +3,10 @@
 
 from ellar.common.constants import SERIALIZER_FILTER_KEY
 from ellar.common.exceptions import RequestValidationError
-from ellar.common.helper.modelfield import create_model_field
 from ellar.common.interfaces import IExecutionContext, IResponseModel
 from ellar.common.logger import request_logger
 from ellar.common.serializer import SerializerFilter, serialize_object
+from ellar.common.utils.modelfield import create_model_field
 from ellar.reflect import reflect
 from pydantic import BaseModel
 from pydantic.fields import ModelField
diff --git a/ellar/common/responses/models/json.py b/ellar/common/responses/models/json.py
@@ -1,10 +1,10 @@
 import typing as t
 
 from ellar.common.constants import SERIALIZER_FILTER_KEY
-from ellar.common.helper.modelfield import create_model_field
 from ellar.common.interfaces import IExecutionContext
 from ellar.common.logger import request_logger
 from ellar.common.serializer import SerializerFilter, serialize_object
+from ellar.common.utils.modelfield import create_model_field
 from ellar.reflect import reflect
 
 from ..response_types import JSONResponse, Response
diff --git a/ellar/common/routing/mount.py b/ellar/common/routing/mount.py
@@ -2,10 +2,10 @@
 import uuid
 
 from ellar.common.constants import CONTROLLER_CLASS_KEY, GUARDS_KEY, VERSIONING_KEY
-from ellar.common.helper import get_unique_control_type
 from ellar.common.logger 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
 from ellar.reflect import reflect
 from starlette.routing import BaseRoute, Match, Route, Router
 from starlette.routing import Mount as StarletteMount
diff --git a/ellar/common/routing/route.py b/ellar/common/routing/route.py
@@ -8,11 +8,11 @@
     RESPONSE_OVERRIDE_KEY,
 )
 from ellar.common.exceptions import ImproperConfiguration, RequestValidationError
-from ellar.common.helper import generate_operation_unique_id, get_name
 from ellar.common.interfaces import IExecutionContext
 from ellar.common.logger 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
 from ellar.reflect import reflect
 from starlette.concurrency import run_in_threadpool
 from starlette.responses import Response
diff --git a/ellar/common/routing/route_collections.py b/ellar/common/routing/route_collections.py
@@ -2,8 +2,8 @@
 import uuid
 from collections import OrderedDict
 
-from ellar.common.helper import generate_controller_operation_unique_id
 from ellar.common.logger 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/route.py b/ellar/common/routing/websocket/route.py
@@ -9,10 +9,10 @@
     ImproperConfiguration,
     WebSocketRequestValidationError,
 )
-from ellar.common.helper import get_name
 from ellar.common.interfaces import IExecutionContext
 from ellar.common.logger import request_logger
 from ellar.common.params import ExtraEndpointArg, WebsocketEndpointArgsModel
+from ellar.common.utils import get_name
 from ellar.reflect import reflect
 from starlette.routing import WebSocketRoute as StarletteWebSocketRoute
 from starlette.routing import compile_path
diff --git a/ellar/common/utils/__init__.py b/ellar/common/utils/__init__.py
diff --git a/ellar/common/utils/crypto.py b/ellar/common/utils/crypto.py
@@ -0,0 +1,25 @@
+import math
+import secrets
+
+RANDOM_STRING_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+
+
+def must_update_salt(salt: str, expected_entropy: int) -> bool:
+    # Each character in the salt provides log_2(len(alphabet)) bits of entropy.
+    return len(salt) * math.log2(len(RANDOM_STRING_CHARS)) < expected_entropy
+
+
+def get_random_string(length: int, allowed_chars: str = RANDOM_STRING_CHARS) -> str:
+    """
+    Return a securely generated random string.
+
+    The bit length of the returned value can be calculated with the formula:
+        log_2(len(allowed_chars)^length)
+
+    For example, with default `allowed_chars` (26+26+10), this gives:
+      * length: 12, bit length =~ 71 bits
+      * length: 22, bit length =~ 131 bits
+    """
+    return "".join(
+        secrets.choice(allowed_chars) for _ in range(length)
+    )  # pragma no cover
diff --git a/ellar/common/utils/enums.py b/ellar/common/utils/enums.py
diff --git a/ellar/common/utils/event_loop.py b/ellar/common/utils/event_loop.py
diff --git a/ellar/common/utils/importer.py b/ellar/common/utils/importer.py
diff --git a/ellar/common/utils/modelfield.py b/ellar/common/utils/modelfield.py
diff --git a/ellar/common/utils/module_loading.py b/ellar/common/utils/module_loading.py
diff --git a/ellar/core/conf/config.py b/ellar/core/conf/config.py
@@ -2,8 +2,8 @@
 
 from ellar.common.compatible.dict import AttributeDictAccessMixin
 from ellar.common.constants import ELLAR_CONFIG_MODULE
-from ellar.common.helper.importer import import_from_string
 from ellar.common.types import VT
+from ellar.common.utils.importer import import_from_string
 from starlette.config import environ
 
 from .app_settings_models import ConfigValidationSchema
diff --git a/ellar/core/middleware/middleware.py b/ellar/core/middleware/middleware.py
@@ -1,8 +1,8 @@
 import typing as t
 
-from ellar.common.helper import build_init_kwargs
 from ellar.common.interfaces import IEllarMiddleware
 from ellar.common.types import ASGIApp
+from ellar.common.utils import build_init_kwargs
 from ellar.di import EllarInjector, injectable
 from starlette.middleware import Middleware
 
diff --git a/ellar/core/modules/ref.py b/ellar/core/modules/ref.py
@@ -10,10 +10,10 @@
     TEMPLATE_FILTER_KEY,
     TEMPLATE_GLOBAL_KEY,
 )
-from ellar.common.helper import build_init_kwargs
 from ellar.common.models import ControllerBase
 from ellar.common.routing import ModuleMount
 from ellar.common.templating import ModuleTemplating
+from ellar.common.utils import build_init_kwargs
 from ellar.di import (
     MODULE_REF_TYPES,
     Container,
diff --git a/ellar/core/routing/helper.py b/ellar/core/routing/helper.py
@@ -6,14 +6,14 @@
     CONTROLLER_OPERATION_HANDLER_KEY,
     ROUTE_OPERATION_PARAMETERS,
 )
-from ellar.common.helper import get_unique_control_type
 from ellar.common.logger import logger
 from ellar.common.routing import (
     RouteOperation,
     RouteOperationBase,
     WebsocketRouteOperation,
 )
 from ellar.common.routing.schema import RouteParameters, WsRouteParameters
+from ellar.common.utils import get_unique_control_type
 from ellar.reflect import reflect
 
 
diff --git a/ellar/core/security/constants.py b/ellar/core/security/constants.py
diff --git a/ellar/core/security/hashers/__init__.py b/ellar/core/security/hashers/__init__.py
@@ -1,7 +1,9 @@
 import typing as t
 
+from ellar.common.utils.crypto import get_random_string
+
 from .argon2 import Argon2Hasher
-from .base import BaseHasher, EncodingType, get_random_string, must_update_salt
+from .base import BaseHasher, EncodingType
 from .bcrypt import BCryptHasher, BCryptSHA256Hasher
 from .md5 import MD5Hasher
 from .pbkdf import PBKDF2Hasher, PBKDF2SHA1Hasher
@@ -125,7 +127,6 @@ def check_password(
     "BCryptHasher",
     "ScryptHasher",
     "MD5Hasher",
-    "must_update_salt",
     "make_password",
     "check_password",
     "is_password_usable",
diff --git a/ellar/core/security/hashers/argon2.py b/ellar/core/security/hashers/argon2.py
@@ -1,8 +1,9 @@
 import typing as t
 
+from ellar.common.utils.crypto import must_update_salt
 from passlib.hash import argon2
 
-from .base import BaseHasher, EncodingSalt, EncodingType, must_update_salt
+from .base import BaseHasher, EncodingSalt, EncodingType
 
 
 class Argon2Hasher(BaseHasher):
diff --git a/ellar/core/security/hashers/base.py b/ellar/core/security/hashers/base.py
@@ -1,44 +1,21 @@
 import math
-import secrets
 import typing as t
 from abc import ABC, abstractmethod
 
 import passlib.utils.handlers as uh
+from ellar.common.utils.crypto import RANDOM_STRING_CHARS, get_random_string
 
 # This will never be a valid encoded hash
 UNUSABLE_PASSWORD_PREFIX = "!"
 UNUSABLE_PASSWORD_SUFFIX_LENGTH = (
     40  # number of random chars to add after UNUSABLE_PASSWORD_PREFIX
 )
 
-RANDOM_STRING_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-
 __HASHERS_DICT: t.Dict[str, t.Type["BaseHasher"]] = {}
 EncodingType = t.Union[str, bytes]
 EncodingSalt = t.Optional[t.Union[str, bytes]]
 
 
-def must_update_salt(salt: str, expected_entropy: int) -> bool:
-    # Each character in the salt provides log_2(len(alphabet)) bits of entropy.
-    return len(salt) * math.log2(len(RANDOM_STRING_CHARS)) < expected_entropy
-
-
-def get_random_string(length: int, allowed_chars: str = RANDOM_STRING_CHARS) -> str:
-    """
-    Return a securely generated random string.
-
-    The bit length of the returned value can be calculated with the formula:
-        log_2(len(allowed_chars)^length)
-
-    For example, with default `allowed_chars` (26+26+10), this gives:
-      * length: 12, bit length =~ 71 bits
-      * length: 22, bit length =~ 131 bits
-    """
-    return "".join(
-        secrets.choice(allowed_chars) for _ in range(length)
-    )  # pragma no cover
-
-
 class BaseHasher(ABC):
     hasher: t.Union[t.Type[uh.GenericHandler], t.Any]
     algorithm: str
diff --git a/ellar/core/security/hashers/md5.py b/ellar/core/security/hashers/md5.py
@@ -1,8 +1,9 @@
 import typing as t
 
+from ellar.common.utils.crypto import must_update_salt
 from passlib.hash import md5_crypt
 
-from .base import BaseHasher, EncodingSalt, EncodingType, must_update_salt
+from .base import BaseHasher, EncodingSalt, EncodingType
 
 
 class MD5Hasher(BaseHasher):
diff --git a/ellar/core/security/hashers/pbkdf.py b/ellar/core/security/hashers/pbkdf.py
@@ -1,6 +1,7 @@
+from ellar.common.utils.crypto import must_update_salt
 from passlib.hash import django_pbkdf2_sha1, django_pbkdf2_sha256
 
-from .base import BaseHasher, must_update_salt
+from .base import BaseHasher
 
 
 class PBKDF2Hasher(BaseHasher):
diff --git a/ellar/openapi/builder.py b/ellar/openapi/builder.py
@@ -4,9 +4,9 @@
 from ellar.common import IIdentitySchemes
 from ellar.common.compatible import AttributeDict, cached_property
 from ellar.common.constants import GUARDS_KEY, REF_PREFIX
-from ellar.common.helper.modelfield import create_model_field
 from ellar.common.routing import ModuleMount, RouteOperation
 from ellar.common.routing.controller import ControllerRouteOperation
+from ellar.common.utils.modelfield import create_model_field
 from ellar.openapi.constants import OPENAPI_OPERATION_KEY, OPENAPI_TAG
 from pydantic import AnyUrl, BaseModel, EmailStr
 from pydantic.fields import ModelField
diff --git a/ellar/socket_io/decorators/gateway.py b/ellar/socket_io/decorators/gateway.py
@@ -5,7 +5,7 @@
 from ellar.common.compatible import AttributeDict
 from ellar.common.constants import CONTROLLER_CLASS_KEY
 from ellar.common.exceptions import ImproperConfiguration
-from ellar.common.helper import get_name
+from ellar.common.utils import get_name
 from ellar.di import RequestScope, injectable
 from ellar.reflect import REFLECT_TYPE, reflect
 from ellar.socket_io.constants import (
diff --git a/ellar/socket_io/decorators/subscribe_message.py b/ellar/socket_io/decorators/subscribe_message.py
@@ -1,6 +1,6 @@
 import typing as t
 
-from ellar.common.helper import get_name
+from ellar.common.utils import get_name
 from ellar.reflect import reflect
 from ellar.socket_io.constants import MESSAGE_MAPPING_METADATA, MESSAGE_METADATA
 
diff --git a/ellar/socket_io/gateway.py b/ellar/socket_io/gateway.py
@@ -15,8 +15,8 @@
     SCOPE_SERVICE_PROVIDER,
 )
 from ellar.common.exceptions import WebSocketRequestValidationError
-from ellar.common.helper import get_name
 from ellar.common.params import WebsocketEndpointArgsModel
+from ellar.common.utils import get_name
 from ellar.core import Config
 from ellar.di import EllarInjector
 from ellar.reflect import reflect
diff --git a/tests/test_application/test_application_functions.py b/tests/test_application/test_application_functions.py
@@ -12,8 +12,8 @@
     template_filter,
     template_global,
 )
-from ellar.common.helper.importer import get_class_import
 from ellar.common.templating import Environment
+from ellar.common.utils.importer import get_class_import
 from ellar.core import Config, ModuleBase
 from ellar.core.connection import Request
 from ellar.core.modules import ModuleTemplateRef
diff --git a/tests/test_controller/test_route_collection.py b/tests/test_controller/test_route_collection.py
diff --git a/tests/test_helper/test_enum.py b/tests/test_helper/test_enum.py
diff --git a/tests/test_helper/test_model_field.py b/tests/test_helper/test_model_field.py
diff --git a/tests/test_helper/test_module_loading.py b/tests/test_helper/test_module_loading.py
diff --git a/tests/test_modules/test_module_ref.py b/tests/test_modules/test_module_ref.py
diff --git a/tests/test_response/test_response_type_definition_converter.py b/tests/test_response/test_response_type_definition_converter.py
diff --git a/tests/test_socket_io/test_decorators/test_gateway.py b/tests/test_socket_io/test_decorators/test_gateway.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`"""Ellar - Python ASGI web framework for building fast, efficient, and scalable RESTful APIs and server-side applications."""`
`2`	`2`
`3`		`-__version__ = "0.5.6"`
	`3`	`+__version__ = "0.5.7"`