brilliance-admin 0.44.0__py3-none-any.whl → 0.44.2__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/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/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