|
@@ -3,7 +3,7 @@
|
|
|
# github https://github.com/runhey
|
|
# github https://github.com/runhey
|
|
|
from typing import Any
|
|
from typing import Any
|
|
|
from collections.abc import Callable, Generator
|
|
from collections.abc import Callable, Generator
|
|
|
-from datetime import timedelta, time
|
|
|
|
|
|
|
+from datetime import timedelta, time, datetime
|
|
|
|
|
|
|
|
from pydantic import BaseModel, datetime_parse
|
|
from pydantic import BaseModel, datetime_parse
|
|
|
from pydantic.fields import ModelField
|
|
from pydantic.fields import ModelField
|
|
@@ -16,6 +16,23 @@ def format_timedelta(tdelta: timedelta):
|
|
|
minutes, seconds = divmod(rem, 60)
|
|
minutes, seconds = divmod(rem, 60)
|
|
|
return f"{days:02d} {hours:02d}:{minutes:02d}:{seconds:02d}"
|
|
return f"{days:02d} {hours:02d}:{minutes:02d}:{seconds:02d}"
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+class MultiLine(str):
|
|
|
|
|
+ # @classmethod
|
|
|
|
|
+ # def __get_validators__(cls) -> Generator[Callable, None, None]:
|
|
|
|
|
+ # yield cls.validate
|
|
|
|
|
+ #
|
|
|
|
|
+ # @classmethod
|
|
|
|
|
+ # def validate(cls, value: str, field: ModelField):
|
|
|
|
|
+ # return cls(value)
|
|
|
|
|
+
|
|
|
|
|
+ @classmethod
|
|
|
|
|
+ def __modify_schema__(
|
|
|
|
|
+ cls, field_schema: dict[str, Any], field: ModelField | None
|
|
|
|
|
+ ):
|
|
|
|
|
+ if field:
|
|
|
|
|
+ field_schema['type'] = 'multi_line'
|
|
|
|
|
+
|
|
|
class TimeDelta(timedelta):
|
|
class TimeDelta(timedelta):
|
|
|
def __str__(self):
|
|
def __str__(self):
|
|
|
return format_timedelta(self)
|
|
return format_timedelta(self)
|
|
@@ -30,30 +47,14 @@ class TimeDelta(timedelta):
|
|
|
if field:
|
|
if field:
|
|
|
field_schema['type'] = 'time_delta'
|
|
field_schema['type'] = 'time_delta'
|
|
|
|
|
|
|
|
-class ConfigBase(BaseModel):
|
|
|
|
|
- # 这个是导出json时候的配置,但是新的是导出dict,所以的无效
|
|
|
|
|
- class Config:
|
|
|
|
|
- json_encoders = {
|
|
|
|
|
- TimeDelta: format_timedelta
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-class MultiLine(str):
|
|
|
|
|
- # @classmethod
|
|
|
|
|
- # def __get_validators__(cls) -> Generator[Callable, None, None]:
|
|
|
|
|
- # yield cls.validate
|
|
|
|
|
- #
|
|
|
|
|
- # @classmethod
|
|
|
|
|
- # def validate(cls, value: str, field: ModelField):
|
|
|
|
|
- # return cls(value)
|
|
|
|
|
-
|
|
|
|
|
|
|
+class DateTime(datetime):
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def __modify_schema__(
|
|
def __modify_schema__(
|
|
|
- cls, field_schema: dict[str, Any], field: ModelField | None
|
|
|
|
|
|
|
+ cls, field_schema: dict[str, Any], field: ModelField | None
|
|
|
):
|
|
):
|
|
|
if field:
|
|
if field:
|
|
|
- field_schema['type'] = 'multi_line'
|
|
|
|
|
|
|
+ field_schema['type'] = 'date_time'
|
|
|
|
|
+
|
|
|
|
|
|
|
|
class Time(time):
|
|
class Time(time):
|
|
|
"""
|
|
"""
|
|
@@ -74,9 +75,17 @@ class Time(time):
|
|
|
else:
|
|
else:
|
|
|
raise ValueError("Invalid time format")
|
|
raise ValueError("Invalid time format")
|
|
|
|
|
|
|
|
- # @classmethod
|
|
|
|
|
- # def __modify_schema__(
|
|
|
|
|
- # cls, field_schema: dict[str, Any], field: ModelField | None
|
|
|
|
|
- # ):
|
|
|
|
|
- # if field:
|
|
|
|
|
- # field_schema['type'] = 'time'
|
|
|
|
|
|
|
+ @classmethod
|
|
|
|
|
+ def __modify_schema__(
|
|
|
|
|
+ cls, field_schema: dict[str, Any], field: ModelField | None
|
|
|
|
|
+ ):
|
|
|
|
|
+ if field:
|
|
|
|
|
+ field_schema['type'] = 'time'
|
|
|
|
|
+
|
|
|
|
|
+# ---------------------------------------------------------------------------------------------------------------------
|
|
|
|
|
+class ConfigBase(BaseModel):
|
|
|
|
|
+ # 这个是导出json时候的配置,但是新的是导出dict,所以的无效
|
|
|
|
|
+ class Config:
|
|
|
|
|
+ json_encoders = {
|
|
|
|
|
+ TimeDelta: format_timedelta
|
|
|
|
|
+ }
|