brilliance-admin 0.44.0__py3-none-any.whl → 0.44.1__py3-none-any.whl

brilliance_admin/api/views/table.py

@@ -8,7 +8,8 @@ from brilliance_admin.exceptions import AdminAPIException, APIError
 from brilliance_admin.schema import AdminSchema
 from brilliance_admin.schema.table.admin_action import ActionData, ActionResult
 from brilliance_admin.schema.table.category_table import CategoryTable
-from brilliance_admin.schema.table.table_models import CreateResult, ListData, RetrieveResult, TableListResult, UpdateResult
+from brilliance_admin.schema.table.table_models import (
+    CreateResult, ListData, RetrieveResult, TableListResult, UpdateResult)
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.utils import get_logger
 

brilliance_admin/locales/en.yml

@@ -3,16 +3,18 @@ delete_confirmation_text: "Are you sure you want to delete those records?\nThis
 deleted_successfully: 'The entries were successfully deleted.'
 
 errors:
+  pk_not_found: 'The "%(pk_name)s" field was not found in the submitted data.'
+  record_not_found: 'No record found for %(pk_name)s=%(pk)s.'
   db_error_create: 'Error creating a record in the database.'
   db_error_update: 'Error updating the record in the database.'
   db_error_retrieve: 'Error retrieving the record from the database.'
   db_error_list: 'Failed to retrieve table data from the database.'
-  pk_not_found: 'The "%(pk_name)s" field was not found in the submitted data.'
-  record_not_found: 'No record found for %(pk_name)s=%(pk)s.'
   connection_refused_error: 'Database connection error: %(error)s'
   filters_exception: 'An unknown technical error occurred while filtering data.'
   method_not_allowed: 'Error, method not allowed. This action is not permitted.'
   filter_error: 'An error occurred during filtering: {error}'
+  serialize_field_error: 'Serialize error: %(error)s'
+  bad_type_error: 'Invalid data type: %(type)s but %(expected)s expected'
 
 search_help: 'Available search fields: %(fields)s'
 sqlalchemy_search_help: |

brilliance_admin/locales/ru.yml

@@ -14,6 +14,7 @@ errors:
   method_not_allowed: 'Ошибка, данный метод недоступен.'
   filter_error: 'Проишла ошибка при фильтрации: %(error)s'
   serialize_field_error: 'Ошибка чтения данных: %(error)s'
+  bad_type_error: 'Некорректный тип данных: %(type)s; ожидается %(expected)s'
 
 search_help: 'Доступные поля для поиска: %(fields)s'
 sqlalchemy_search_help: |

brilliance_admin/schema/table/fields/base.py

@@ -8,6 +8,7 @@ from pydantic.dataclasses import dataclass
 from brilliance_admin.exceptions import FieldError
 from brilliance_admin.schema.category import FieldSchemaData
 from brilliance_admin.translations import LanguageContext
+from brilliance_admin.translations import TranslateText as _
 from brilliance_admin.utils import DeserializeAction, SupportsStr, humanize_field_name
 
 
@@ -80,7 +81,7 @@ class IntegerField(TableField):
     async def deserialize(self, value, action: DeserializeAction, extra: dict, *args, **kwargs) -> Any:
         value = await super().deserialize(value, action, extra, *args, **kwargs)
         if value and not isinstance(value, int):
-            raise FieldError(f'bad int type: {type(value)}')
+            raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'init'})
 
         return value
 
@@ -116,7 +117,7 @@ class StringField(TableField):
     async def deserialize(self, value, action: DeserializeAction, extra: dict, *args, **kwargs) -> Any:
         value = await super().deserialize(value, action, extra, *args, **kwargs)
         if value and not isinstance(value, str):
-            raise FieldError(f'bad string type: {type(value)}')
+            raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'string'})
 
         return value
 
@@ -151,7 +152,7 @@ class DateTimeField(TableField):
             return
 
         if value and not isinstance(value, (str, dict)):
-            raise FieldError(f'bad datetime type: {type(value)}')
+            raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'datetime'})
 
         if isinstance(value, str):
             return datetime.datetime.strptime(value, self.format)
@@ -166,13 +167,24 @@ class DateTimeField(TableField):
                 'to': datetime.datetime.strptime(value.get('to'), self.format),
             }
 
-        raise NotImplementedError(f'Value "{value}" is not supporetd for datetime')
+        raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'datetime'})
 
 
 @dataclass
 class JSONField(TableField):
     _type = 'json'
 
+    async def deserialize(self, value, action: DeserializeAction, extra: dict, *args, **kwargs) -> Any:
+        value = await super().deserialize(value, action, extra, *args, **kwargs)
+
+        if value is None:
+            return
+
+        if not isinstance(value, (dict, list)):
+            raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'JSON'})
+
+        return value
+
 
 @dataclass
 class ArrayField(TableField):
@@ -190,8 +202,11 @@ class ArrayField(TableField):
     async def deserialize(self, value, action: DeserializeAction, extra: dict, *args, **kwargs) -> Any:
         value = await super().deserialize(value, action, extra, *args, **kwargs)
 
-        if value and not isinstance(value, list):
-            raise FieldError(f'bad array type: {type(value)}')
+        if value is None:
+            return
+
+        if not isinstance(value, list):
+            raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'Array'})
 
         return value