diff --git a/.gitignore b/.gitignore index 15f192a..2734261 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,4 @@ example_data/preprocessed # Dev notebooks notebooks/tmp +/tmp diff --git a/src/batdetect2/core/registries.py b/src/batdetect2/core/registries.py index 80852ac..3cfc817 100644 --- a/src/batdetect2/core/registries.py +++ b/src/batdetect2/core/registries.py @@ -1,13 +1,14 @@ -import sys -from typing import Callable, Dict, Generic, Tuple, Type, TypeVar +from typing import ( + Callable, + Concatenate, + Generic, + ParamSpec, + Type, + TypeVar, +) from pydantic import BaseModel -if sys.version_info >= (3, 10): - from typing import Concatenate, ParamSpec -else: - from typing_extensions import Concatenate, ParamSpec - __all__ = [ "Registry", "SimpleRegistry", @@ -45,10 +46,10 @@ class Registry(Generic[T_Type, P_Type]): def __init__(self, name: str): self._name = name - self._registry: Dict[ + self._registry: dict[ str, Callable[Concatenate[..., P_Type], T_Type] ] = {} - self._config_types: Dict[str, Type[BaseModel]] = {} + self._config_types: dict[str, Type[BaseModel]] = {} def register( self, @@ -74,7 +75,7 @@ class Registry(Generic[T_Type, P_Type]): return decorator - def get_config_types(self) -> Tuple[Type[BaseModel], ...]: + def get_config_types(self) -> tuple[Type[BaseModel], ...]: return tuple(self._config_types.values()) def get_config_type(self, name: str) -> Type[BaseModel]: diff --git a/src/batdetect2/evaluate/config.py b/src/batdetect2/evaluate/config.py index f41edef..5d58779 100644 --- a/src/batdetect2/evaluate/config.py +++ b/src/batdetect2/evaluate/config.py @@ -4,9 +4,7 @@ from pydantic import Field from soundevent import data from batdetect2.core.configs import BaseConfig, load_config -from batdetect2.evaluate.tasks import ( - TaskConfig, -) +from batdetect2.evaluate.tasks import TaskConfig from batdetect2.evaluate.tasks.classification import ClassificationTaskConfig from batdetect2.evaluate.tasks.detection import DetectionTaskConfig from batdetect2.logging import CSVLoggerConfig, LoggerConfig