fix: simplify pydantic version checks and improve model validation

Author: bybatkhuu

src/beans_logging/_base.py

@@ -9,12 +9,7 @@
 import yaml
 from loguru import logger
 from loguru._logger import Logger
-import pydantic
-
-if "2.0.0" <= pydantic.__version__:
-    from pydantic import validate_call
-else:
-    from pydantic import validate_arguments as validate_call
+from pydantic import validate_call
 
 # Internal modules
 from ._utils import create_dir, deep_merge
@@ -171,11 +166,7 @@ def update_config(self, config: LoggerConfigPM | dict[str, Any]):
         """
 
         if isinstance(config, dict):
-            if "2.0.0" <= pydantic.__version__:
-                _config_dict = self.config.model_dump()
-            else:
-                _config_dict = self.config.dict()
-
+            _config_dict = self.config.model_dump()
             _merged_dict = deep_merge(_config_dict, config)
             try:
                 self.config = LoggerConfigPM(**_merged_dict)
@@ -224,10 +215,7 @@ def _load_config_file(self):
                             return
 
                         _new_config_dict = _new_config_dict["logger"]
-                        if "2.0.0" <= pydantic.__version__:
-                            _config_dict = self.config.model_dump()
-                        else:
-                            _config_dict = self.config.dict()
+                        _config_dict = self.config.model_dump()
 
                         _merged_dict = deep_merge(_config_dict, _new_config_dict)
                         self.config = LoggerConfigPM(**_merged_dict)
@@ -247,10 +235,7 @@ def _load_config_file(self):
                             return
 
                         _new_config_dict = _new_config_dict["logger"]
-                        if "2.0.0" <= pydantic.__version__:
-                            _config_dict = self.config.model_dump()
-                        else:
-                            _config_dict = self.config.dict()
+                        _config_dict = self.config.model_dump()
 
                         _merged_dict = deep_merge(_config_dict, _new_config_dict)
                         self.config = LoggerConfigPM(**_merged_dict)
@@ -274,10 +259,7 @@ def _load_config_file(self):
             #                 return
 
             #             _new_config_dict = _new_config_dict["logger"]
-            #             if "2.0.0" <= pydantic.__version__:
-            #                 _config_dict = self.config.model_dump()
-            #             else:
-            #                 _config_dict = self.config.dict()
+            #             _config_dict = self.config.model_dump()
 
             #             _merged_dict = deep_merge(_config_dict, _new_config_dict)
             #             self.config = LoggerConfigPM(**_merged_dict)

src/beans_logging/_utils.py

@@ -4,12 +4,7 @@
 import errno
 
 from loguru import logger
-import pydantic
-
-if "2.0.0" <= pydantic.__version__:
-    from pydantic import validate_call
-else:
-    from pydantic import validate_arguments as validate_call
+from pydantic import validate_call
 
 from ._consts import WarnEnum
 

src/beans_logging/schemas.py

@@ -1,26 +1,20 @@
 import datetime
 
-
-import pydantic
-from pydantic import BaseModel, constr, Field
-
-if "2.0.0" <= pydantic.__version__:
-    from pydantic import field_validator, model_validator, ConfigDict
-else:
-    from pydantic import validator, root_validator
-
+from pydantic import (
+    BaseModel,
+    constr,
+    Field,
+    field_validator,
+    model_validator,
+    ConfigDict,
+)
 
 from ._consts import LogLevelEnum
 from ._utils import get_default_logs_dir, get_app_name
 
 
 class ExtraBaseModel(BaseModel):
-    if "2.0.0" <= pydantic.__version__:
-        model_config = ConfigDict(extra="allow")
-    else:
-
-        class Config:
-            extra = "allow"
+    model_config = ConfigDict(extra="allow")
 
 
 class StdHandlerPM(ExtraBaseModel):
@@ -55,26 +49,13 @@ class LogHandlersPM(ExtraBaseModel):
         default="{app_name}.std.err.log", min_length=4, max_length=1023
     )
 
-    if "2.0.0" <= pydantic.__version__:
-
-        @model_validator(mode="after")
-        def _check_log_path(self) -> "LogHandlersPM":
-            if self.log_path == self.err_path:
-                raise ValueError(
-                    f"`log_path` and `err_path` attributes are same: '{self.log_path}', must be different!"
-                )
-            return self
-
-    else:
-
-        @root_validator
-        def _check_log_path(cls, values):
-            _log_path, _err_path = values.get("log_path"), values.get("err_path")
-            if _log_path == _err_path:
-                raise ValueError(
-                    f"`log_path` and `err_path` attributes are same: '{_log_path}', must be different!"
-                )
-            return values
+    @model_validator(mode="after")
+    def _check_log_path(self) -> "LogHandlersPM":
+        if self.log_path == self.err_path:
+            raise ValueError(
+                f"`log_path` and `err_path` attributes are same: '{self.log_path}', must be different!"
+            )
+        return self
 
 
 class JsonHandlersPM(ExtraBaseModel):
@@ -87,26 +68,13 @@ class JsonHandlersPM(ExtraBaseModel):
         default="{app_name}.json.err.log", min_length=4, max_length=1023
     )
 
-    if "2.0.0" <= pydantic.__version__:
-
-        @model_validator(mode="after")
-        def _check_log_path(self) -> "JsonHandlersPM":
-            if self.log_path == self.err_path:
-                raise ValueError(
-                    f"`log_path` and `err_path` attributes are same: '{self.log_path}', must be different!"
-                )
-            return self
-
-    else:
-
-        @root_validator
-        def _check_log_path(cls, values):
-            _log_path, _err_path = values.get("log_path"), values.get("err_path")
-            if _log_path == _err_path:
-                raise ValueError(
-                    f"`log_path` and `err_path` attributes are same: '{_log_path}', must be different!"
-                )
-            return values
+    @model_validator(mode="after")
+    def _check_log_path(self) -> "JsonHandlersPM":
+        if self.log_path == self.err_path:
+            raise ValueError(
+                f"`log_path` and `err_path` attributes are same: '{self.log_path}', must be different!"
+            )
+        return self
 
 
 class FilePM(ExtraBaseModel):
@@ -124,22 +92,12 @@ class FilePM(ExtraBaseModel):
     log_handlers: LogHandlersPM = Field(default_factory=LogHandlersPM)
     json_handlers: JsonHandlersPM = Field(default_factory=JsonHandlersPM)
 
-    if "2.0.0" <= pydantic.__version__:
-
-        @field_validator("rotate_time", mode="before")
-        @classmethod
-        def _check_rotate_time(cls, val):
-            if isinstance(val, str):
-                val = datetime.time.fromisoformat(val)
-            return val
-
-    else:
-
-        @validator("rotate_time", pre=True, always=True)
-        def _check_rotate_time(cls, val):
-            if val and isinstance(val, str):
-                val = datetime.time.fromisoformat(val)
-            return val
+    @field_validator("rotate_time", mode="before")
+    @classmethod
+    def _check_rotate_time(cls, val):
+        if isinstance(val, str):
+            val = datetime.time.fromisoformat(val)
+        return val
 
 
 class AutoLoadPM(ExtraBaseModel):