diff --git a/hiddifypanel/panel/commercial/restapi/v2/admin/schema.py b/hiddifypanel/panel/commercial/restapi/v2/admin/schema.py index 67bcbea0..e6f9685e 100644 --- a/hiddifypanel/panel/commercial/restapi/v2/admin/schema.py +++ b/hiddifypanel/panel/commercial/restapi/v2/admin/schema.py @@ -1,6 +1,6 @@ import uuid -from apiflask.fields import String, Float, Enum, Date, Integer, Boolean, DateTime -from apiflask import Schema, fields +from apiflask.fields import String, Float, Enum, Date, Integer, Boolean, Field +from apiflask import Schema from typing import Any, Mapping from marshmallow import ValidationError @@ -11,7 +11,7 @@ # region user api -class FriendlyDateTime(fields.Field): +class FriendlyDateTime(Field): def _serialize(self, value: Any, attr: str | None, obj: Any, **kwargs): return hutils.convert.time_to_json(value) @@ -19,7 +19,7 @@ def _deserialize(self, value: Any, attr: str | None, data: Mapping[str, Any] | N return hutils.convert.json_to_time(value) -class FriendlyUUID(fields.Field): +class FriendlyUUID(Field): def _serialize(self, value: Any, attr: str | None, obj: Any, **kwargs): if value is None or not hutils.auth.is_uuid_valid(value): @@ -32,7 +32,7 @@ def _deserialize(self, value: Any, attr: str | None, data: Mapping[str, Any] | N try: return str(uuid.UUID(value)) except ValueError: - self.fail('Invalid uuid') + return self.fail('Invalid uuid') def _validated(self, value): if not hutils.auth.is_uuid_valid(value):