brilliance-admin 0.44.16__py3-none-any.whl → 0.44.18__py3-none-any.whl

brilliance_admin/integrations/sqlalchemy/auth.py

@@ -1,3 +1,4 @@
+import inspect
 from typing import Callable
 
 from brilliance_admin.auth import AdminAuthentication, AuthData, AuthResult, UserABC, UserResult
@@ -14,7 +15,7 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
     user_model = None
     pk_name = None
 
-    password_validator: Callable[[UserABC, str], bool] | None = None
+    password_validator = None
 
     def __init__(self, secret: str, db_async_session, user_model, pk_name='id', password_validator=None):
         self.pk_name = pk_name
@@ -76,14 +77,19 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
 
         try:
             if self.password_validator:
-                if not self.password_validator(user, data.password):
+                if inspect.iscoroutinefunction(self.password_validator):
+                    valid_password = await self.password_validator(user, data.password)
+                else:
+                    valid_password = self.password_validator(user, data.password)
+
+                if not valid_password:
                     raise AdminAPIException(APIError(code="user_not_found"), status_code=401)
 
         except AdminAPIException as e:
             raise e
         except Exception as e:
             msg = _('errors.password_exception') % {
-                'error_type': str(e) if schema.debug else type(e).__name__,
+                'error_type': str(e) if debug else type(e).__name__,
             }
             raise AdminAPIException(APIError(message=msg, code="password_exception"), status_code=500) from e
 

brilliance_admin/locales/en.yml

@@ -15,7 +15,6 @@ errors:
   filters_exception: 'An unknown technical error occurred while filtering data: %(error_type)s'
   method_not_allowed: 'Error, method not allowed. This action is not permitted.'
   filter_error: 'An error occurred during filtering: {error}'
-  bad_type_error: 'Invalid data type: %(type)s but %(expected)s expected'
 
 serialize_error:
   field_error: 'Field %(field_slug)s serialize error: %(error)s'
@@ -30,3 +29,16 @@ sqlalchemy_search_help: |
   <b>""</b> - quotes for exact match
   <b>%%</b> - any sequence of characters
   <b>_</b> - any single character
+
+password:
+  new_password: 'New password'
+  change_password: 'Change password'
+  password_changed: 'Password successfully updated'
+
+validation:
+  bad_type_error: 'Invalid data type: %(type)s but %(expected)s expected'
+  min_value_error: 'Value must be at least %(min)s'
+  max_value_error: 'Value must be at most %(max)s'
+  min_length_error: 'Length must be at least %(min)s characters'
+  max_length_error: 'Length must be at most %(max)s characters'
+

brilliance_admin/locales/ru.yml

@@ -11,13 +11,12 @@ errors:
   db_error_retrieve: 'Ошибка получения записи из базы данных: %(error_type)s'
   db_error_list: 'Ошибка получения данных таблицы из базы данных: %(error_type)s'
 
-  password_exception: 'Произошла неизвестная ошибка при проверке пароля: %(error_type)s'
-
   connection_refused_error: 'Ошибка подключения к базе данных: %(error)s'
   filters_exception: 'Произошла неизвестная техническая ошибка при фильтрации данных: %(error_type)s'
   method_not_allowed: 'Ошибка, данный метод недоступен.'
   filter_error: 'Проишла ошибка при фильтрации: %(error)s'
-  bad_type_error: 'Некорректный тип данных: %(type)s; ожидается %(expected)s'
+
+  password_exception: 'Произошла неизвестная ошибка при проверке пароля: %(error_type)s'
 
 serialize_error:
   field_error: 'ошибка чтения поля %(field_slug)s: %(error)s'
@@ -32,3 +31,15 @@ sqlalchemy_search_help: |
   <b>""</b> - кавычки для точного совпадения
   <b>%%</b> - любая последовательность символов
   <b>_</b> - один любой символ
+
+password:
+  new_password: 'Новый пароль'
+  change_password: 'Изменить пароль'
+  password_changed: 'Пароль успешно обновлен'
+
+validation:
+  bad_type_error: 'Некорректный тип данных: %(type)s; ожидается %(expected)s'
+  min_value_error: 'Значение должно быть не меньше %(min)s'
+  max_value_error: 'Значение должно быть не больше %(max)s'
+  min_length_error: 'Длина должна быть не меньше %(min)s символов'
+  max_length_error: 'Длина должна быть не больше %(max)s символов'

brilliance_admin/schema/category.py

@@ -30,6 +30,7 @@ class FieldSchemaData(DataclassBase):
 
     max_length: int | None = None
     min_length: int | None = None
+    password: bool | None = None
 
     choices: List[dict] | None = None
 

brilliance_admin/schema/table/fields/base.py

@@ -81,7 +81,18 @@ 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(_('errors.bad_type_error') % {'type': type(value), 'expected': 'init'})
+            raise FieldError(_('validation.bad_type_error') % {'type': type(value), 'expected': 'init'})
+
+        if value is None:
+            if self.min_value is not None:
+                raise FieldError(_('validation.min_value_error') % {'min': self.min_value})
+            return
+
+        if self.min_value is not None and value < self.min_value:
+            raise FieldError(_('validation.min_value_error') % {'min': self.min_value})
+
+        if self.max_value is not None and value > self.max_value:
+            raise FieldError(_('validation.max_value_error') % {'max': self.max_value})
 
         return value
 
@@ -96,6 +107,7 @@ class StringField(TableField):
 
     min_length: int | None = None
     max_length: int | None = None
+    password: bool | None = False
 
     choices: Any | None = None
 
@@ -105,6 +117,7 @@ class StringField(TableField):
         schema.multilined = self.multilined
         schema.ckeditor = self.ckeditor
         schema.tinymce = self.tinymce
+        schema.password = self.password
 
         if self.min_length is not None:
             schema.min_length = self.min_length
@@ -117,7 +130,18 @@ 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(_('errors.bad_type_error') % {'type': type(value), 'expected': 'string'})
+            raise FieldError(_('validation.bad_type_error') % {'type': type(value), 'expected': 'string'})
+
+        if value is None:
+            if self.min_length is not None and self.min_length > 0:
+                raise FieldError(_('validation.min_length_error') % {'min': self.min_length})
+            return
+
+        if self.min_length is not None and len(value) < self.min_length:
+            raise FieldError(_('validation.min_length_error') % {'min': self.min_length})
+
+        if self.max_length is not None and len(value) > self.max_length:
+            raise FieldError(_('validation.max_length_error') % {'max': self.max_length})
 
         return value
 
@@ -164,7 +188,7 @@ class DateTimeField(TableField):
             return
 
         if value and not isinstance(value, (str, dict)):
-            raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'datetime'})
+            raise FieldError(_('validation.bad_type_error') % {'type': type(value), 'expected': 'datetime'})
 
         if isinstance(value, str):
             return _parse_iso(value)
@@ -180,7 +204,7 @@ class DateTimeField(TableField):
                 'to': _parse_iso(value['to']),
             }
 
-        raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'datetime'})
+        raise FieldError(_('validation.bad_type_error') % {'type': type(value), 'expected': 'datetime'})
 
 
 @dataclass
@@ -194,7 +218,7 @@ class JSONField(TableField):
             return
 
         if not isinstance(value, (dict, list)):
-            raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'JSON'})
+            raise FieldError(_('validation.bad_type_error') % {'type': type(value), 'expected': 'JSON'})
 
         return value
 
@@ -219,7 +243,7 @@ class ArrayField(TableField):
             return
 
         if not isinstance(value, list):
-            raise FieldError(_('errors.bad_type_error') % {'type': type(value), 'expected': 'Array'})
+            raise FieldError(_('validation.bad_type_error') % {'type': type(value), 'expected': 'Array'})
 
         return value
 

{brilliance_admin-0.44.16.dist-info → brilliance_admin-0.44.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.44.16
+Version: 0.44.18
 Summary: Simple and lightweight data managment framework powered by FastAPI and Vue3 Vuetify all-in-one. Some call it heavenly in its brilliance.
 License-Expression: MIT
 Requires-Python: >=3.10

{brilliance_admin-0.44.16.dist-info → brilliance_admin-0.44.18.dist-info}/RECORD

@@ -17,7 +17,7 @@ brilliance_admin/api/views/settings.py,sha256=2A9suZQONEtW9LkFban29Fe5ipQaaGT0Cz
 brilliance_admin/api/views/table.py,sha256=dLo_ic9LPeAvkeelbkHZs9oC9g9ZlXPPMiQMszlwDIQ,5979
 brilliance_admin/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 brilliance_admin/integrations/sqlalchemy/__init__.py,sha256=AmQHOvegS6_uaE4xYDHzRMdA9PyHn0cCt1s1IWc9G2U,318
-brilliance_admin/integrations/sqlalchemy/auth.py,sha256=nvTZd1HW-2_vs672ohcbWLP8pA2bHDXd66tuEkD-2f0,5853
+brilliance_admin/integrations/sqlalchemy/auth.py,sha256=X8AfmGCV9bZnYk61rGJ6Gcy8NUcHyKn0vXylG2QqylE,6058
 brilliance_admin/integrations/sqlalchemy/autocomplete.py,sha256=IKZwdjb5tM_pA5PBUhwYo4n_8nEfy_WcSu8Yu4ftarI,1572
 brilliance_admin/integrations/sqlalchemy/fields.py,sha256=7D0E4-12rqraqHek2yNuHzRdO7hhxjp0edhJu-mTnWQ,9897
 brilliance_admin/integrations/sqlalchemy/fields_schema.py,sha256=7WkOrt5dVvrsZppNZEZS8QaQPMSrfcWChwOaOFSRVOg,11419
@@ -28,11 +28,11 @@ brilliance_admin/integrations/sqlalchemy/table/delete.py,sha256=kcDEM7WDNu3lFdfd
 brilliance_admin/integrations/sqlalchemy/table/list.py,sha256=Y76B5CFqQb2nfV0i0MrMrK3_kn9cyDvx10gEF8smrIA,8008
 brilliance_admin/integrations/sqlalchemy/table/retrieve.py,sha256=EKwGH8Mz3Jd-uR43WibD3hFiZVGK_ra_5Cu5XeoEf6Y,3508
 brilliance_admin/integrations/sqlalchemy/table/update.py,sha256=NxcYPqRZbm_BM-4QHzEbhgAhYSs3SXzYMMzKCalqahU,3800
-brilliance_admin/locales/en.yml,sha256=YBjkq2Tm0KjXKOMgnIM5etO42Pkm8mDdQlvmpITwsA4,1453
-brilliance_admin/locales/ru.yml,sha256=__reAnXeIo3KDqiyAxL4xp4rbsclWcYS002sK8iRAps,2185
+brilliance_admin/locales/en.yml,sha256=SQhYlcOYgzmCOvSWWSjIvvH5qXBFU2H_9eOn8iBA6Ls,1830
+brilliance_admin/locales/ru.yml,sha256=36LBcm4Y90yqyeQeU1EHMvIMRZ07zLh49k_wGsMVK88,2737
 brilliance_admin/schema/__init__.py,sha256=H5UFO5dub_k5id8WdGRVy9G8RnqZuBSjw9XgPafj1VQ,293
 brilliance_admin/schema/admin_schema.py,sha256=SGdNuYUKrwAc6SA4RYh8TgSrod5RuY7lpXKzmY1SHZ4,6812
-brilliance_admin/schema/category.py,sha256=UTnUexbCHe9vfwi3ygX34YkLAH2ixfMWqe4H6xos0fI,6604
+brilliance_admin/schema/category.py,sha256=viJ_BsP5_5NHu7KlOG4MTzhKIDPlQ1e0ByYXQ0XvKC0,6637
 brilliance_admin/schema/dashboard/__init__.py,sha256=RxE5nNs5X3iWGXBOA518hFyJMSRLEcXr0PNb8HZrjxs,50
 brilliance_admin/schema/dashboard/category_dashboard.py,sha256=rsEuWLpcfcrnzMeKIQCMFDYNF9H7LEfqEKlm63Sh7PE,2650
 brilliance_admin/schema/table/__init__.py,sha256=vuRw8HBuak2LaTZi2dNn5YOrJPalQps-O3Ht-d0AZV4,378
@@ -41,7 +41,7 @@ brilliance_admin/schema/table/category_table.py,sha256=5QQISkIxOeNU-58r9UmiszrFV
 brilliance_admin/schema/table/fields_schema.py,sha256=2D4J2FAFupOsE0YWLn1reB0LT5KJOygvJHJnajPCe6U,8475
 brilliance_admin/schema/table/table_models.py,sha256=xidraifRYbXGkiVLn6dJ96dkOhW8-22ynE-fbiOjfAU,1018
 brilliance_admin/schema/table/fields/__init__.py,sha256=RW-sIFTAaSQo4mMR6iWtnefogWPjmg6KAsDwe9mKW1k,291
-brilliance_admin/schema/table/fields/base.py,sha256=rSVTsY1ph9ix33NiPslDjPjnwWvHwNtvt90FAByE4mQ,10243
+brilliance_admin/schema/table/fields/base.py,sha256=A7zphmRtlYjzfnLg8viM780Rio1opbNvaWcxF4W_jLM,11368
 brilliance_admin/schema/table/fields/function_field.py,sha256=N9BB-4JoVfIY3tvVgLaDTw16u87Tu2rHUk-aGDYuB1U,1780
 brilliance_admin/static/index-EybvSE2q.js,sha256=_SbWHCYCzHTGnmqkXsqpMLtBIGP1KbA5hLEulqvJb9A,3210050
 brilliance_admin/static/index-wIukkQjw.css,sha256=u0BgR_BRor31z8igNlSBRxStdSCV1FgEZY1_ytCz23E,984450
@@ -66,8 +66,8 @@ brilliance_admin/static/tinymce/plugins/codesample/css/prism.css,sha256=exAdMtHb
 brilliance_admin/static/tinymce/plugins/customLink/plugin.js,sha256=illBNpnHDkBsLG6wo_jDPF6z7CGnO1MQWUoDwZKy6vQ,5589
 brilliance_admin/static/tinymce/plugins/customLink/css/link.css,sha256=gh5nvY8Z92hJfCEBPnIm4jIPCcKKbJnab-30oIfX7Hc,56
 brilliance_admin/templates/index.html,sha256=RKvUZ386hjV5EV09vneHhFY3BrwmMsTsm9wUpPV7D08,1294
-brilliance_admin-0.44.16.dist-info/licenses/LICENSE,sha256=rgWE5Cxk53W0PhTOVmcQedABEWN1QMG-PRz3fz531sE,1074
-brilliance_admin-0.44.16.dist-info/METADATA,sha256=dEpRtxx5sqZksbv5YHyZlyTL2SI5Xg9ShTzNK29MvRE,7449
-brilliance_admin-0.44.16.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-brilliance_admin-0.44.16.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
-brilliance_admin-0.44.16.dist-info/RECORD,,
+brilliance_admin-0.44.18.dist-info/licenses/LICENSE,sha256=rgWE5Cxk53W0PhTOVmcQedABEWN1QMG-PRz3fz531sE,1074
+brilliance_admin-0.44.18.dist-info/METADATA,sha256=NXVoddBfffAAhcstivaSpmcfv-Vom0sy9UAHYbPh9XY,7449
+brilliance_admin-0.44.18.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+brilliance_admin-0.44.18.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
+brilliance_admin-0.44.18.dist-info/RECORD,,