brilliance-admin 0.43.4__py3-none-any.whl → 0.43.6__py3-none-any.whl

brilliance_admin/integrations/sqlalchemy/auth.py

@@ -54,7 +54,7 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
             logger.exception(
                 'SQLAlchemy %s login db error: %s', type(self).__name__, e,
             )
-            msg = _('connection_refused_error') % {'error': str(e)}
+            msg = _('errors.connection_refused_error') % {'error': str(e)}
             raise AdminAPIException(
                 APIError(message=msg, code='connection_refused_error'),
                 status_code=500,
@@ -127,7 +127,7 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
             logger.exception(
                 'SQLAlchemy %s authenticate db error: %s', type(self).__name__, e,
             )
-            msg = _('connection_refused_error') % {'error': str(e)}
+            msg = _('errors.connection_refused_error') % {'error': str(e)}
             raise AdminAPIException(
                 APIError(message=msg, code='connection_refused_error'),
                 status_code=500,

brilliance_admin/integrations/sqlalchemy/fields.py

@@ -146,16 +146,15 @@ class SQLAlchemyRelatedField(TableField):
         if record is None:
             raise FieldError(f'Missing record in serialize context in value: {value}')
 
+        related = getattr(record, self.rel_name, None)
+
         if self.many:
-            related = getattr(record, self.rel_name, None)
             if related is None:
-                raise FieldError(f'Related field "{self.rel_name}" is missing on record "{record}" (many=True)')
-
+                raise FieldError(f'Many Related field "{self.rel_name}" is missing on record "{record}"')
             return [{'key': get_pk(obj), 'title': str(obj)} for obj in related]
 
-        related = getattr(record, self.rel_name, None)
         if related is None:
-            raise FieldError(f'Related field "{self.rel_name}" is missing on record "{record}" (many=False)')
+            return None
 
         return {'key': get_pk(related), 'title': str(related)}
 

brilliance_admin/integrations/sqlalchemy/table/create.py

@@ -18,7 +18,7 @@ class SQLAlchemyAdminCreate:
             language_context: LanguageContext,
     ) -> schema.CreateResult:
         if not self.has_create:
-            raise AdminAPIException(APIError(message=_('method_not_allowed')), status_code=500)
+            raise AdminAPIException(APIError(message=_('errors.method_not_allowed')), status_code=500)
 
         # pylint: disable=import-outside-toplevel
         from sqlalchemy.exc import IntegrityError
@@ -37,7 +37,7 @@ class SQLAlchemyAdminCreate:
                 type(self).__name__, self.table_schema.model.__name__, e,
                 extra={'data': data},
             )
-            msg = _('connection_refused_error') % {'error': str(e)}
+            msg = _('errors.connection_refused_error') % {'error': str(e)}
             raise AdminAPIException(
                 APIError(message=msg, code='connection_refused_error'),
                 status_code=500,
@@ -62,7 +62,7 @@ class SQLAlchemyAdminCreate:
                 extra={'data': data},
             )
             raise AdminAPIException(
-                APIError(message=_('db_error_create'), code='db_error_create'), status_code=500,
+                APIError(message=_('errors.db_error_create'), code='db_error_create'), status_code=500,
             ) from e
 
         logger.info(

brilliance_admin/integrations/sqlalchemy/table/delete.py

@@ -14,5 +14,5 @@ class SQLAlchemyDeleteAction:
     )
     async def delete(self, action_data: ActionData):
         if not self.has_delete:
-            raise AdminAPIException(APIError(message=_('method_not_allowed')), status_code=500)
+            raise AdminAPIException(APIError(message=_('errors.method_not_allowed')), status_code=500)
         return ActionResult(message=ActionMessage(_('deleted_successfully')))

brilliance_admin/integrations/sqlalchemy/table/list.py

@@ -109,7 +109,7 @@ class SQLAlchemyAdminListMixin:
                     'list_data': list_data,
                 }
             )
-            msg = _('filter_error') % {'error': e.message}
+            msg = _('errors.filter_error') % {'error': e.message}
             raise AdminAPIException(APIError(message=msg, code='filters_exception'), status_code=500) from e
 
         except Exception as e:
@@ -120,7 +120,7 @@ class SQLAlchemyAdminListMixin:
                     'list_data': list_data,
                 }
             )
-            raise AdminAPIException(APIError(message=_('filters_exception'), code='filters_exception'), status_code=500) from e
+            raise AdminAPIException(APIError(message=_('errors.filters_exception'), code='filters_exception'), status_code=500) from e
 
         data = []
 
@@ -143,7 +143,7 @@ class SQLAlchemyAdminListMixin:
                     'list_data': list_data,
                 }
             )
-            msg = _('connection_refused_error') % {'error': str(e)}
+            msg = _('errors.connection_refused_error') % {'error': str(e)}
             raise AdminAPIException(
                 APIError(message=msg, code='connection_refused_error'),
                 status_code=500,
@@ -172,7 +172,7 @@ class SQLAlchemyAdminListMixin:
                 }
             )
             raise AdminAPIException(
-                APIError(message=_('db_error_list'), code='db_error_list'), status_code=500,
+                APIError(message=_('errors.db_error_list'), code='db_error_list'), status_code=500,
             ) from e
 
         return schema.TableListResult(data=data, total_count=int(total_count or 0))

brilliance_admin/integrations/sqlalchemy/table/retrieve.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 from brilliance_admin import auth, schema
-from brilliance_admin.exceptions import AdminAPIException, APIError
+from brilliance_admin.exceptions import AdminAPIException, APIError, FieldError
 from brilliance_admin.integrations.sqlalchemy.fields_schema import SQLAlchemyFieldsSchema
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.translations import TranslateText as _
@@ -22,7 +22,7 @@ class SQLAlchemyAdminRetrieveMixin:
             language_context: LanguageContext,
     ) -> schema.RetrieveResult:
         if not self.has_delete:
-            raise AdminAPIException(APIError(message=_('method_not_allowed')), status_code=500)
+            raise AdminAPIException(APIError(message=_('errors.method_not_allowed')), status_code=500)
 
         # pylint: disable=import-outside-toplevel
         from sqlalchemy import inspect
@@ -41,16 +41,25 @@ class SQLAlchemyAdminRetrieveMixin:
                     extra={"record": record, "user": user},
                 )
 
+        except FieldError as e:
+            logger.exception(
+                'SQLAlchemy %s retrieve %s #%s field error: %s',
+                type(self).__name__, self.model.__name__, pk, e,
+            )
+            msg = _('errors.serialize_field_error') % {'error': e.message}
+            raise AdminAPIException(APIError(message=msg, code='filters_exception'), status_code=500) from e
+
         except Exception as e:
             logger.exception(
-                'SQLAlchemy %s retrieve db error: %s', type(self).__name__, e,
+                'SQLAlchemy %s retrieve %s #%s db error: %s',
+                type(self).__name__, self.model.__name__, pk, e,
             )
             raise AdminAPIException(
-                APIError(message=_('db_error_retrieve'), code='db_error_retrieve'), status_code=500,
+                APIError(message=_('errors.db_error_retrieve'), code='db_error_retrieve'), status_code=500,
             ) from e
 
         if record is None:
-            msg = _('record_not_found') % {'pk_name': self.pk_name, 'pk': pk}
+            msg = _('errors.record_not_found') % {'pk_name': self.pk_name, 'pk': pk}
             raise AdminAPIException(
                 APIError(message=msg, code='record_not_found'),
                 status_code=400,

brilliance_admin/integrations/sqlalchemy/table/update.py

@@ -21,7 +21,7 @@ class SQLAlchemyAdminUpdate:
             language_context: LanguageContext,
     ) -> schema.UpdateResult:
         if not self.has_update:
-            raise AdminAPIException(APIError(message=_('method_not_allowed')), status_code=500)
+            raise AdminAPIException(APIError(message=_('errors.method_not_allowed')), status_code=500)
 
         # pylint: disable=import-outside-toplevel
         from sqlalchemy import inspect
@@ -29,7 +29,7 @@ class SQLAlchemyAdminUpdate:
 
         if pk is None:
             raise AdminAPIException(
-                APIError(message=_('pk_not_found') % {'pk_name': self.pk_name}, code='pk_not_found'),
+                APIError(message=_('errors.pk_not_found') % {'pk_name': self.pk_name}, code='pk_not_found'),
                 status_code=400,
             )
 
@@ -42,7 +42,7 @@ class SQLAlchemyAdminUpdate:
             async with self.db_async_session() as session:
                 record = (await session.execute(stmt)).scalars().first()
                 if record is None:
-                    msg = _('record_not_found') % {'pk_name': self.pk_name, 'pk': pk}
+                    msg = _('errors.record_not_found') % {'pk_name': self.pk_name, 'pk': pk}
                     raise AdminAPIException(
                         APIError(message=msg, code='record_not_found'),
                         status_code=400,
@@ -59,7 +59,7 @@ class SQLAlchemyAdminUpdate:
                 type(self).__name__, self.table_schema.model.__name__, pk, e,
                 extra={'data': data},
             )
-            msg = _('connection_refused_error') % {'error': str(e)}
+            msg = _('errors.connection_refused_error') % {'error': str(e)}
             raise AdminAPIException(
                 APIError(message=msg, code='connection_refused_error'),
                 status_code=400,
@@ -84,7 +84,7 @@ class SQLAlchemyAdminUpdate:
                 extra={'data': data}
             )
             raise AdminAPIException(
-                APIError(message=_('db_error_update'), code='db_error_update'), status_code=500,
+                APIError(message=_('errors.db_error_update'), code='db_error_update'), status_code=500,
             ) from e
 
         logger.info(

brilliance_admin/locales/en.yml

@@ -1,13 +1,19 @@
 delete: 'Delete'
 delete_confirmation_text: "Are you sure you want to delete those records?\nThis action cannot be undone."
 deleted_successfully: 'The entries were successfully deleted.'
-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.'
-connection_refused_error: 'Database connection error: %(error)s'
+
+errors:
+  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}'
+
 search_help: 'Available search fields: %(fields)s'
 sqlalchemy_search_help: |
   <b>Available search fields:</b>
@@ -17,6 +23,3 @@ sqlalchemy_search_help: |
   <b>""</b> - quotes for exact match
   <b>%%</b> - any sequence of characters
   <b>_</b> - any single character
-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}'

brilliance_admin/locales/ru.yml

@@ -1,13 +1,20 @@
 delete: 'Удалить'
 delete_confirmation_text: "Вы уверены, что хотите удалить данные записи?\nДанное действие нельзя отменить."
 deleted_successfully: 'Записи успешно удалены.'
-pk_not_found: 'Поле "%(pk_name)s" не найдено среди переданных данных.'
-record_not_found: 'Запись по ключу %(pk_name)s=%(pk)s не найдена.'
-db_error_create: 'Ошибка создания записи в базе данных.'
-db_error_update: 'Ошибка обновления записи в базе данных.'
-db_error_retrieve: 'Ошибка получения записи из базы данных.'
-db_error_list: 'Ошибка получения данных таблицы из базы данных.'
-connection_refused_error: 'Ошибка подключения к базе данных: %(error)s'
+
+errors:
+  pk_not_found: 'Поле "%(pk_name)s" не найдено среди переданных данных.'
+  record_not_found: 'Запись по ключу %(pk_name)s=%(pk)s не найдена.'
+  db_error_create: 'Ошибка создания записи в базе данных.'
+  db_error_update: 'Ошибка обновления записи в базе данных.'
+  db_error_retrieve: 'Ошибка получения записи из базы данных.'
+  db_error_list: 'Ошибка получения данных таблицы из базы данных.'
+  connection_refused_error: 'Ошибка подключения к базе данных: %(error)s'
+  filters_exception: 'Произошла неизвестная техническая ошибка при фильтрации данных.'
+  method_not_allowed: 'Ошибка, данный метод недоступен.'
+  filter_error: 'Проишла ошибка при фильтрации: %(error)s'
+  serialize_field_error: 'Ошибка чтения данных: %(error)s'
+
 search_help: 'Доступные поля для поиска: %(fields)s'
 sqlalchemy_search_help: |
   <b>Доступные поля для поиска:</b>
@@ -17,6 +24,3 @@ sqlalchemy_search_help: |
   <b>""</b> - кавычки для точного совпадения
   <b>%%</b> - любая последовательность символов
   <b>_</b> - один любой символ
-filters_exception: 'Произошла неизвестная техническая ошибка при фильтрации данных.'
-method_not_allowed: 'Ошибка, данный метод недоступен.'
-filter_error: 'Проишла ошибка при фильтрации: {error}'

{brilliance_admin-0.43.4.dist-info → brilliance_admin-0.43.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.43.4
+Version: 0.43.6
 Summary: Simple and lightweight admin panel framework powered by FastAPI and Vue3 Vuetify together.. Some call it heavenly in its brilliance.
 License-Expression: AGPL-3.0
 Requires-Python: >=3.10

{brilliance_admin-0.43.4.dist-info → brilliance_admin-0.43.6.dist-info}/RECORD

@@ -17,19 +17,19 @@ brilliance_admin/api/views/settings.py,sha256=2A9suZQONEtW9LkFban29Fe5ipQaaGT0Cz
 brilliance_admin/api/views/table.py,sha256=29vLEwueHWBS8Dq6nBvujwy4CTs9v8ZcM1ErF9lYgIc,5932
 brilliance_admin/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 brilliance_admin/integrations/sqlalchemy/__init__.py,sha256=tIegMU2eIW_zA-PdblCXCjenHAY4sGBUWKuz97ns4gE,275
-brilliance_admin/integrations/sqlalchemy/auth.py,sha256=99O7zmhcKWB3cWGTbMd3OSyIJ81Vcfz7byDK6oLinm8,4910
+brilliance_admin/integrations/sqlalchemy/auth.py,sha256=NvOLKeeSJuNTzFhisNO9R3sEmGRS8IQrCwghPrtuzaw,4924
 brilliance_admin/integrations/sqlalchemy/autocomplete.py,sha256=baRroMwGg35uR5zt-aiQc2-ugX4hpwNf79R6bZH9UX0,1416
-brilliance_admin/integrations/sqlalchemy/fields.py,sha256=giVCIixwHz1iHFYHdi39_s4zo9cSZA_0CUoEAJRUGps,9467
+brilliance_admin/integrations/sqlalchemy/fields.py,sha256=YjJhJMoiAQk53J0O1ftWhrp3CFIfYwGzIRnvk7aD6lM,9315
 brilliance_admin/integrations/sqlalchemy/fields_schema.py,sha256=7WkOrt5dVvrsZppNZEZS8QaQPMSrfcWChwOaOFSRVOg,11419
 brilliance_admin/integrations/sqlalchemy/table/__init__.py,sha256=g_in2pLTi8UQnT5uNFA8mLW5mxlT84irQ7yVaP_OSS4,605
 brilliance_admin/integrations/sqlalchemy/table/base.py,sha256=-osqhTvqE7YcBxsAjqIUMWyYk1df04GIDmdvtieTXcg,4885
-brilliance_admin/integrations/sqlalchemy/table/create.py,sha256=z40PuKJYZ6goJdhsANVuEyTW1gh0PipCBdBSe5Ii5Tw,2693
-brilliance_admin/integrations/sqlalchemy/table/delete.py,sha256=Awv50IG7DQsYrHVlk4dtYBMwexmlO92xhMBgrgEDBgs,731
-brilliance_admin/integrations/sqlalchemy/table/list.py,sha256=--KVTLbuCr1fD79q0LXqlu6CuiYA3QhQj6rrdP7jR14,6692
-brilliance_admin/integrations/sqlalchemy/table/retrieve.py,sha256=ny60-YN_ndUyibVd5cwogEFKXtzguJmWas2_xoQk3vQ,2272
-brilliance_admin/integrations/sqlalchemy/table/update.py,sha256=AGEEbEsgKre784Dg4_kTKB6NfMwdAwNiMjm0ZKeg-LE,3543
-brilliance_admin/locales/en.yml,sha256=lCM58SoP4HExXFCTHpl8pYw82tH_8TvlrcCXZDXYb5c,1129
-brilliance_admin/locales/ru.yml,sha256=hXZwS71Z_aAyK9DB14pwmbtLI5xn6PvsnuLIZlEexbM,1661
+brilliance_admin/integrations/sqlalchemy/table/create.py,sha256=QY_Hbn4iu6Kq7reFsEUC-isCvcDK6vU4n5F0Bo1EOEs,2714
+brilliance_admin/integrations/sqlalchemy/table/delete.py,sha256=toH9at-MAWO46K_4YmvkOqXX2-cFANVVhAURiZ-dwWQ,738
+brilliance_admin/integrations/sqlalchemy/table/list.py,sha256=WPH4GoLrIU-TcGMrNoq46i3sJIz6vV76UaacmtG3Ytk,6720
+brilliance_admin/integrations/sqlalchemy/table/retrieve.py,sha256=O6mJ_XxfLJ59Hx_V5VdAZNxObkY6p5L7gZED8QGXfy0,2744
+brilliance_admin/integrations/sqlalchemy/table/update.py,sha256=RfIXTQHHEoZCrOtVeOxZ3ql0-is5czsgVAfO_1_gF7w,3578
+brilliance_admin/locales/en.yml,sha256=hq4ktzZZYmfbI7RVHHwvkUD9qjETMW1Fq2DQPCQAPao,1159
+brilliance_admin/locales/ru.yml,sha256=ySYstybcfNhWUgdYeTnepaddgOlPTu4cIAWKLAVYLeo,1770
 brilliance_admin/schema/__init__.py,sha256=X-izShvv84jkFU47WfpUwtvRh3NOv570iUB3NRNEIDU,248
 brilliance_admin/schema/admin_schema.py,sha256=fKVtaLkFkDF8ZkjIftackZ4rfCDcqLvci8PO6ZLycgc,6393
 brilliance_admin/schema/category.py,sha256=hkE4BJQeNbjtuloIgkNEy8Fz068lcMK98-lnZADClg4,4070
@@ -67,8 +67,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=ZLJ_TKUvBDIo_hYfbW43ov0S_bFrzBF-283XP6BKtDI,1294
-brilliance_admin-0.43.4.dist-info/licenses/LICENSE,sha256=PjeDRXGbVLtKul5Xpfco_6CyB6bYGWVVPrO0oubquuM,727
-brilliance_admin-0.43.4.dist-info/METADATA,sha256=XowThszR-MHi2j4ceq8Otv64Kq6qMFDsUAnAB9L0IO0,7459
-brilliance_admin-0.43.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-brilliance_admin-0.43.4.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
-brilliance_admin-0.43.4.dist-info/RECORD,,
+brilliance_admin-0.43.6.dist-info/licenses/LICENSE,sha256=PjeDRXGbVLtKul5Xpfco_6CyB6bYGWVVPrO0oubquuM,727
+brilliance_admin-0.43.6.dist-info/METADATA,sha256=rUACoUjEY-Zumi8JUI_EMVdzpyRix-JdKKvNQ-enI2Y,7459
+brilliance_admin-0.43.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+brilliance_admin-0.43.6.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
+brilliance_admin-0.43.6.dist-info/RECORD,,