brilliance-admin 0.43.4__tar.gz → 0.43.6__tar.gz

{brilliance_admin-0.43.4 → brilliance_admin-0.43.6}/PKG-INFO

@@ -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 → brilliance_admin-0.43.6}/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-0.43.4 → brilliance_admin-0.43.6}/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-0.43.4 → brilliance_admin-0.43.6}/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-0.43.4 → brilliance_admin-0.43.6}/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-0.43.4 → brilliance_admin-0.43.6}/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-0.43.4 → brilliance_admin-0.43.6}/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-0.43.4 → brilliance_admin-0.43.6}/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-0.43.6/brilliance_admin/locales/en.yml

@@ -0,0 +1,25 @@
+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.'
+
+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>
+  %(fields)s
+
+  <b>Available operators:</b>
+  <b>""</b> - quotes for exact match
+  <b>%%</b> - any sequence of characters
+  <b>_</b> - any single character

brilliance_admin-0.43.6/brilliance_admin/locales/ru.yml

@@ -0,0 +1,26 @@
+delete: 'Удалить'
+delete_confirmation_text: "Вы уверены, что хотите удалить данные записи?\nДанное действие нельзя отменить."
+deleted_successfully: 'Записи успешно удалены.'
+
+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>
+  %(fields)s
+
+  <b>Доступные операторы:</b>
+  <b>""</b> - кавычки для точного совпадения
+  <b>%%</b> - любая последовательность символов
+  <b>_</b> - один любой символ

{brilliance_admin-0.43.4 → brilliance_admin-0.43.6}/brilliance_admin.egg-info/PKG-INFO

@@ -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 → brilliance_admin-0.43.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brilliance-admin"
-version = "0.43.4"
+version = "0.43.6"
 description = 'Simple and lightweight admin panel framework powered by FastAPI and Vue3 Vuetify together.. Some call it heavenly in its brilliance.'
 readme = "README.md"
 requires-python = ">=3.10"

{brilliance_admin-0.43.4 → brilliance_admin-0.43.6}/tests/test_sqlalcmeny_crud.py

@@ -74,6 +74,7 @@ async def test_retrieve(sqlite_sessionmaker, language_context):
             'key': currency.id,
             'title': mock.ANY,
         },
+        'fee_id': None,
         'status': {
             'title': TranslateText('statuses.process'),
             'value': 'process',
@@ -169,6 +170,7 @@ async def test_list(sqlite_sessionmaker, language_context):
                 'title': TranslateText('statuses.process'),
                 'value': 'process',
             },
+            'fee_id': None,
             'description': 'description',
             'id': 1,
             'is_h2h': False,

{brilliance_admin-0.43.4 → brilliance_admin-0.43.6}/tests/test_sqlalcmeny_schema.py

@@ -136,10 +136,21 @@ category_schema_data = {
                     'type': 'choice',
                     'variant': 'elevated',
                 },
+                'fee_id': {
+                    'dual_list': False,
+                    'header': {},
+                    'label': 'Fee',
+                    'many': False,
+                    'read_only': False,
+                    'rel_name': 'fee',
+                    'required': False,
+                    'type': 'related',
+                },
             },
             'list_display': [
                 'id',
                 'title',
+                'fee_id',
                 'status',
                 'description',
                 'secret_key',
@@ -158,6 +169,7 @@ category_schema_data = {
 FIELDS = [
     'id',
     'title',
+    'fee_id',
     'status',
     'description',
     'secret_key',

{brilliance_admin-0.43.4 → brilliance_admin-0.43.6}/uv.lock

@@ -65,7 +65,7 @@ wheels = [
 
 [[package]]
 name = "brilliance-admin"
-version = "0.43.4"
+version = "0.43.6"
 source = { editable = "." }
 dependencies = [
     { name = "asgiref" },

brilliance_admin-0.43.4/brilliance_admin/locales/en.yml

@@ -1,22 +0,0 @@
-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'
-search_help: 'Available search fields: %(fields)s'
-sqlalchemy_search_help: |
-  <b>Available search fields:</b>
-  %(fields)s
-
-  <b>Available operators:</b>
-  <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-0.43.4/brilliance_admin/locales/ru.yml

@@ -1,22 +0,0 @@
-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'
-search_help: 'Доступные поля для поиска: %(fields)s'
-sqlalchemy_search_help: |
-  <b>Доступные поля для поиска:</b>
-  %(fields)s
-
-  <b>Доступные операторы:</b>
-  <b>""</b> - кавычки для точного совпадения
-  <b>%%</b> - любая последовательность символов
-  <b>_</b> - один любой символ
-filters_exception: 'Произошла неизвестная техническая ошибка при фильтрации данных.'
-method_not_allowed: 'Ошибка, данный метод недоступен.'
-filter_error: 'Проишла ошибка при фильтрации: {error}'