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

brilliance_admin/integrations/sqlalchemy/auth.py

@@ -122,6 +122,7 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
         try:
             async with self.db_async_session() as session:
                 result = await session.execute(stmt)
+                user = result.scalar_one_or_none()
 
         except ConnectionRefusedError as e:
             logger.exception(
@@ -133,8 +134,6 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
                 status_code=500,
             ) from e
 
-        user = result.scalar_one_or_none()
-
         if not user:
             raise AdminAPIException(
                 APIError(message="User not found", code="user_not_found"),

brilliance_admin/integrations/sqlalchemy/fields.py

@@ -6,7 +6,7 @@ from brilliance_admin.auth import UserABC
 from brilliance_admin.exceptions import AdminAPIException, APIError, FieldError
 from brilliance_admin.schema.category import FieldSchemaData
 from brilliance_admin.schema.table.fields.base import TableField
-from brilliance_admin.schema.table.table_models import Record
+from brilliance_admin.schema.table.table_models import AutocompleteData, Record
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.translations import TranslateText as _
 from brilliance_admin.utils import DeserializeAction
@@ -96,10 +96,9 @@ class SQLAlchemyRelatedField(TableField):
         msg = f'Cannot resolve target model for FK "{field_slug}"'
         raise AttributeError(msg)
 
-    async def autocomplete(self, model, data, user, *, extra: dict | None = None) -> List[Record]:
+    async def autocomplete(self, model, data: AutocompleteData, user, *, extra: dict | None = None) -> List[Record]:
         # pylint: disable=import-outside-toplevel
         from sqlalchemy import select
-        from sqlalchemy.sql import expression
 
         if extra is None or extra.get('db_async_session') is None:
             msg = f'SQLAlchemyRelatedField.autocomplete {type(self).__name__} requires extra["db_async_session"] (AsyncSession)'
@@ -113,23 +112,37 @@ class SQLAlchemyRelatedField(TableField):
         limit = min(150, data.limit)
         stmt = select(target_model).limit(limit)
 
+        pk = get_pk(target_model)
+        python_pk_type = pk.property.columns[0].type.python_type
+
         if data.search_string:
-            if hasattr(target_model, 'id'):
-                stmt = stmt.where(getattr(target_model, 'id') == data.search_string)
+            try:
+                value = python_pk_type(data.search_string)
+            except (ValueError, TypeError):
+                # Search string cannot be cast to primary key type, skip id filter
+                value = None
+
+            stmt = stmt.where(pk == value)
 
         # Add already selected choices
-        existed_choices = []
         if data.existed_choices:
             existed_choices = [i['key'] for i in data.existed_choices if 'key' in i]
 
-        if existed_choices and hasattr(target_model, 'id'):
-            stmt = stmt.where(getattr(target_model, 'id').in_(existed_choices) | expression.true())
+            values = []
+            for value in existed_choices:
+                try:
+                    values.append(python_pk_type(value))
+                except (ValueError, TypeError) as e:
+                    msg = f'Invalid existed_choices value "{value}" for pk {pk} python_pk_type:{python_pk_type.__name__}'
+                    raise AdminAPIException(APIError(message=msg), status_code=500) from e
+
+            stmt = stmt.where(pk.in_(values))
 
         async with db_async_session() as session:
             records = (await session.execute(stmt)).scalars().all()
 
         for record in records:
-            results.append(Record(key=getattr(record, 'id'), title=str(record)))
+            results.append(Record(key=getattr(record, pk.key), title=str(record)))
 
         return results
 

{brilliance_admin-0.44.1.dist-info → brilliance_admin-0.44.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.44.1
+Version: 0.44.2
 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
@@ -18,6 +18,7 @@ Requires-Dist: structlog>=25.5.0; extra == "example"
 Requires-Dist: rich>=14.2.0; extra == "example"
 Requires-Dist: asyncpg>=0.31.0; extra == "example"
 Requires-Dist: pydantic-settings>=2.12.0; extra == "example"
+Requires-Dist: twine; extra == "example"
 Provides-Extra: tests
 Requires-Dist: pytest>=8.4.2; extra == "tests"
 Requires-Dist: pytest-asyncio>=1.2.0; extra == "tests"

{brilliance_admin-0.44.1.dist-info → brilliance_admin-0.44.2.dist-info}/RECORD

@@ -17,9 +17,9 @@ brilliance_admin/api/views/settings.py,sha256=2A9suZQONEtW9LkFban29Fe5ipQaaGT0Cz
 brilliance_admin/api/views/table.py,sha256=ZCckiEaBVAF7Px-oDWkFkL4F3KmFJi-70LSqFXomovk,5939
 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=NvOLKeeSJuNTzFhisNO9R3sEmGRS8IQrCwghPrtuzaw,4924
+brilliance_admin/integrations/sqlalchemy/auth.py,sha256=N9CjFfnXmKeNbJBxHMDlbPaTQPmYWlYTz_73PYBkaNk,4931
 brilliance_admin/integrations/sqlalchemy/autocomplete.py,sha256=Q2BDwPL3d7FErqYkO-s6Q6pDg2PTZ1RUUAWc9tbllT8,1436
-brilliance_admin/integrations/sqlalchemy/fields.py,sha256=piLGzX24GwCuWEBo7Jy0_8pMeiWc8tl9nj6Qt6ehYaY,9390
+brilliance_admin/integrations/sqlalchemy/fields.py,sha256=7D0E4-12rqraqHek2yNuHzRdO7hhxjp0edhJu-mTnWQ,9897
 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
@@ -28,8 +28,6 @@ brilliance_admin/integrations/sqlalchemy/table/delete.py,sha256=toH9at-MAWO46K_4
 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=o57Bhh5Z8zC2A1Y2h-iw4t6h9vjhAFQS0mw9J8t2nio,1287
-brilliance_admin/locales/ru.yml,sha256=qquuAGkViLrNtgO0REWXZXlz1Ri2avFS1VmtAeTYwK0,1878
 brilliance_admin/schema/__init__.py,sha256=tZIRTSKFsNOmDqjoAgtYthYrT8ljPvLnYRzfupBLT00,290
 brilliance_admin/schema/admin_schema.py,sha256=9w88GuogRjdphFuDdx7On553qHTwGoJVCyKpooFSKQ8,6723
 brilliance_admin/schema/category.py,sha256=D2aIpDyL-2CibkpenNu8uyh4AzOdQ2ArTDltVYS7xZQ,6592
@@ -66,8 +64,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=JK7a-EQtaRweQJ1KoXc3L82M4d7GSCXJEe85cxuvWaQ,1294
-brilliance_admin-0.44.1.dist-info/licenses/LICENSE,sha256=rgWE5Cxk53W0PhTOVmcQedABEWN1QMG-PRz3fz531sE,1074
-brilliance_admin-0.44.1.dist-info/METADATA,sha256=KB9guzLv6WvBDCLv4c93VsKUZ3x6byNXBu3wjw00ZVg,6910
-brilliance_admin-0.44.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-brilliance_admin-0.44.1.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
-brilliance_admin-0.44.1.dist-info/RECORD,,
+brilliance_admin-0.44.2.dist-info/licenses/LICENSE,sha256=rgWE5Cxk53W0PhTOVmcQedABEWN1QMG-PRz3fz531sE,1074
+brilliance_admin-0.44.2.dist-info/METADATA,sha256=2XEOEkHyDGd1r6fz3neNPvp6oQAfS8ZocAERObr20pY,6951
+brilliance_admin-0.44.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+brilliance_admin-0.44.2.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
+brilliance_admin-0.44.2.dist-info/RECORD,,

brilliance_admin/locales/en.yml

@@ -1,27 +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.'
-
-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.'
-  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: |
-  <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/locales/ru.yml

@@ -1,27 +0,0 @@
-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'
-  bad_type_error: 'Некорректный тип данных: %(type)s; ожидается %(expected)s'
-
-search_help: 'Доступные поля для поиска: %(fields)s'
-sqlalchemy_search_help: |
-  <b>Доступные поля для поиска:</b>
-  %(fields)s
-
-  <b>Доступные операторы:</b>
-  <b>""</b> - кавычки для точного совпадения
-  <b>%%</b> - любая последовательность символов
-  <b>_</b> - один любой символ