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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.43.2
+Version: 0.43.4
 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.2 → brilliance_admin-0.43.4}/brilliance_admin/integrations/sqlalchemy/fields_schema.py

@@ -54,9 +54,6 @@ class SQLAlchemyFieldsSchema(schema.FieldsSchema):
                 and not col.primary_key
             )
 
-            if "choices" in info:
-                field_data["choices"] = [(c[0], c[1]) for c in info["choices"]]
-
             col_type = col.type
             try:
                 py_t = col_type.python_type
@@ -64,12 +61,16 @@ class SQLAlchemyFieldsSchema(schema.FieldsSchema):
                 py_t = None
 
             impl = getattr(attr, 'impl', None)
-            is_mutable = isinstance(impl, Mutable)
+            is_impl_mutable = isinstance(impl, Mutable)
 
             # Foreign key column
             if col.foreign_keys:
                 continue
 
+            elif "choices" in info:
+                field_data["choices"] = info['choices']
+                field_class = schema.ChoiceField
+
             elif isinstance(col_type, (sqltypes.BigInteger, sqltypes.Integer)) or py_t is int:
                 field_class = schema.IntegerField
 
@@ -97,7 +98,7 @@ class SQLAlchemyFieldsSchema(schema.FieldsSchema):
             elif isinstance(col_type, ARRAY):
                 field_class = schema.ArrayField
                 field_data["array_type"] = type(col_type.item_type).__name__.lower()
-                field_data["read_only"] = not is_mutable
+                field_data["read_only"] = is_impl_mutable or isinstance(col_type, Mutable)
 
             elif isinstance(col_type, sqltypes.NullType):
                 continue
@@ -239,15 +240,17 @@ class SQLAlchemyFieldsSchema(schema.FieldsSchema):
         return stmt
 
     async def serialize(self, record, extra: dict, *args, **kwargs) -> dict:
-        # pylint: disable=import-outside-toplevel
-        from sqlalchemy import inspect
 
         # Convert model values to dict
-        record_data = {
-            attr.key: getattr(record, attr.key, None)
-            for attr in inspect(record).mapper.column_attrs
-            if self.get_field(attr.key)
-        }
+        record_data = {}
+
+        for slug, field in self.get_fields().items():
+            # pylint: disable=protected-access
+            if field._type == 'related':
+                record_data[slug] = record
+            else:
+                record_data[slug] = getattr(record, slug, None)
+
         return await super().serialize(record_data, extra, *args, **kwargs)
 
     def validate_incoming_data(self, data):

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/brilliance_admin/integrations/sqlalchemy/table/base.py

@@ -123,11 +123,11 @@ class SQLAlchemyAdminBase(SQLAlchemyAdminAutocompleteMixin, CategoryTable):
             # pylint: disable=protected-access
             if field._type == "related":
 
-                # pylint: disable=import-outside-toplevel
-                from sqlalchemy import inspect
-
-                model_attrs = [attr.key for attr in inspect(self.model).mapper.attrs]
                 if not hasattr(self.model, field.rel_name):
+                    # pylint: disable=import-outside-toplevel
+                    from sqlalchemy import inspect
+                    model_attrs = [attr.key for attr in inspect(self.model).mapper.attrs]
+
                     msg = EXCEPTION_REL_NAME.format(
                         slug=slug,
                         model_name=self.model.__name__,

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/brilliance_admin/integrations/sqlalchemy/table/retrieve.py

@@ -2,6 +2,7 @@ from typing import Any
 
 from brilliance_admin import auth, schema
 from brilliance_admin.exceptions import AdminAPIException, APIError
+from brilliance_admin.integrations.sqlalchemy.fields_schema import SQLAlchemyFieldsSchema
 from brilliance_admin.translations import LanguageContext
 from brilliance_admin.translations import TranslateText as _
 from brilliance_admin.utils import get_logger
@@ -12,6 +13,8 @@ logger = get_logger()
 class SQLAlchemyAdminRetrieveMixin:
     has_retrieve: bool = True
 
+    table_schema: SQLAlchemyFieldsSchema
+
     async def retrieve(
             self,
             pk: Any,

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/brilliance_admin/schema/category.py

@@ -30,7 +30,6 @@ class FieldSchemaData(DataclassBase):
 
     choices: List[dict] | None = None
 
-    tag_colors: dict | None = None
     variant: str | None = None
     size: str | None = None
 

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/brilliance_admin/schema/table/fields/base.py

@@ -1,6 +1,7 @@
 import abc
 import datetime
-from typing import Any, ClassVar, List, Tuple
+from enum import Enum
+from typing import Any, ClassVar
 
 from pydantic.dataclasses import dataclass
 
@@ -52,6 +53,8 @@ class TableField(abc.ABC, FieldSchemaData):
 class IntegerField(TableField):
     _type = 'integer'
 
+    choices: Any | None = None
+
     max_value: int | None = None
     min_value: int | None = None
 
@@ -62,8 +65,6 @@ class IntegerField(TableField):
     def generate_schema(self, user, field_slug, language_context: LanguageContext) -> FieldSchemaData:
         schema = super().generate_schema(user, field_slug, language_context)
 
-        schema.choices = self.choices
-
         if self.max_value is not None:
             schema.max_value = self.max_value
 
@@ -95,13 +96,12 @@ class StringField(TableField):
     min_length: int | None = None
     max_length: int | None = None
 
-    choices: List[Tuple[str, str]] | None = None
+    choices: Any | None = None
 
     def generate_schema(self, user, field_slug, language_context: LanguageContext) -> FieldSchemaData:
         schema = super().generate_schema(user, field_slug, language_context)
 
         schema.multilined = self.multilined
-        schema.choices = self.choices
         schema.ckeditor = self.ckeditor
         schema.tinymce = self.tinymce
 
@@ -227,23 +227,52 @@ class ImageField(TableField):
 class ChoiceField(TableField):
     _type = 'choice'
 
+    # Tag color available:
     # https://vuetifyjs.com/en/styles/colors/#classes
-    tag_colors: dict | None = None
+    choices: Any | None = None
 
     # https://vuetifyjs.com/en/components/chips/#color-and-variants
     variant: str = 'elevated'
     size: str = 'default'
 
+    def __post_init__(self):
+        self.choices = self.generate_choices()
+
+    def generate_choices(self):
+        if not self.choices:
+            return None
+
+        if issubclass(self.choices, Enum):
+            return [
+                {'value': c.value, 'title': c.label, 'tag_color': getattr(c, 'tag_color', None)}
+                for c in self.choices
+            ]
+
+        msg = f'Field choices is not suppored: {self.choices}'
+        raise NotImplementedError(msg)
+
+    def find_choice(self, value):
+        if not self.choices:
+            return None
+
+        return next((c for c in self.choices if c.get('value') == value), None)
+
     def generate_schema(self, user, field_slug, language_context: LanguageContext) -> FieldSchemaData:
         schema = super().generate_schema(user, field_slug, language_context)
 
         schema.choices = self.choices
 
-        schema.tag_colors = self.tag_colors
         schema.size = self.size
         schema.variant = self.variant
 
         return schema
 
     async def serialize(self, value, extra: dict, *args, **kwargs) -> Any:
-        return {'value': value, 'title': value.capitalize() if value else value}
+        if not value:
+            return
+
+        choice = self.find_choice(value)
+        return {
+            'value': value,
+            'title': choice.get('title') or value if choice else value.capitalize(),
+        }

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/brilliance_admin/schema/table/fields_schema.py

@@ -148,9 +148,10 @@ class FieldsSchema:
             list_display=self.list_display,
         )
 
+        context = {'language_context': language_context}
         for field_slug, field in self.get_fields().items():
             field_schema: FieldSchemaData = field.generate_schema(user, field_slug, language_context)
-            fields_schema.fields[field_slug] = field_schema.to_dict(keep_none=False)
+            fields_schema.fields[field_slug] = field_schema.to_dict(keep_none=False, context=context)
 
         return fields_schema
 

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/brilliance_admin/translations.py

@@ -63,14 +63,14 @@ class LanguageManager(abc.ABC):
 
         builtin_locales_dir = resources.files("brilliance_admin").joinpath("locales")
         self.phrases.load_folder(builtin_locales_dir)
-        logger.info('Language manager builtin dir loaded: %s', builtin_locales_dir)
+        logger.debug('Language manager builtin dir loaded: %s', builtin_locales_dir)
 
         if locales_dir:
             self.phrases.load_folder(locales_dir)
-            logger.info('Language manager locales_dir loaded: %s', locales_dir)
+            logger.debug('Language manager locales_dir loaded: %s', locales_dir)
 
         langs = ', '.join(self.phrases.data.keys())
-        logger.info('Language manager setup completed; languages: %s', langs)
+        logger.debug('Language manager setup completed; languages: %s', langs)
 
     def get_text(self, text, language) -> str:
         if not isinstance(text, TranslateText):

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/brilliance_admin/utils.py

@@ -42,8 +42,8 @@ class DataclassBase:
         adapter = TypeAdapter(type(self))
         return adapter.dump_python(self, *args, **kwargs)
 
-    def to_dict(self, keep_none=True) -> dict:
-        data = self.model_dump()
+    def to_dict(self, *args, keep_none=True, **kwargs) -> dict:
+        data = self.model_dump(*args, **kwargs)
         return {
             k: v for k, v in data.items()
             if v is not None and not keep_none
@@ -150,4 +150,4 @@ class YamlI18n:
             if isinstance(node, str):
                 return node
 
-        raise KeyError(f'translation key not found: {slug}')
+        return slug

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.43.2
+Version: 0.43.4
 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.2 → brilliance_admin-0.43.4}/example/locales/en.yml

@@ -50,3 +50,8 @@ whitelist_ips: 'Whitelist IPs'
 users: 'Users'
 field_not_found_in_schema: 'The field "{field_slug}" was not found among the available fields: {available}'
 related_not_found: 'Error updating related field {field_slug}: {model} record with pk={pk} was not found. The record may no longer be available.'
+
+statuses:
+  process: 'Process'
+  success: 'Success'
+  error: 'Error'

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/example/locales/ru.yml

@@ -49,3 +49,8 @@ whitelist_ips: 'Белый список IP'
 users: 'Пользователи'
 field_not_found_in_schema: 'Поле "{field_slug}" не найдено среди доступных: {available}'
 related_not_found: 'Ошибка при обновлении связей поля {field_slug}: запись {model} с ключем pk={pk} не найдена. Возможно запись более недоступна.'
+
+statuses:
+  process: 'В процессе'
+  success: 'Успех'
+  error: 'Ошибка'

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/example/sections/models.py

@@ -1,5 +1,7 @@
+import random
 import uuid
 from datetime import datetime
+from enum import Enum
 
 import factory
 from sqlalchemy import BigInteger, Boolean, DateTime, ForeignKey, Integer, SmallInteger, String, func
@@ -131,7 +133,7 @@ class Fee(BaseIDModel):
 
 class FeeFactory(SQLAlchemyFactoryBase):
     class Meta:
-        model = Merchant
+        model = Fee
         sqlalchemy_session_factory = async_sessionmaker_
         sqlalchemy_session_persistence = "commit"
 
@@ -141,6 +143,30 @@ class FeeFactory(SQLAlchemyFactoryBase):
         return self.title
 
 
+class TerminalStatuses(Enum):
+    PROCESS = 'process'
+    SUCCESS = 'success'
+    ERROR = 'error'
+
+    @property
+    def label(self):
+        labels = {
+            self.PROCESS: _('statuses.process'),
+            self.SUCCESS: _('statuses.success'),
+            self.ERROR: _('statuses.error'),
+        }
+        return labels[self]
+
+    @property
+    def tag_color(self):
+        colors = {
+            self.PROCESS: 'grey-lighten-1',
+            self.SUCCESS: 'green-darken-1',
+            self.ERROR: 'red-lighten-2',
+        }
+        return colors[self]
+
+
 class Terminal(BaseIDModel):
     __tablename__ = "terminal"
 
@@ -156,6 +182,12 @@ class Terminal(BaseIDModel):
         default=lambda: str(uuid.uuid4()),
     )
 
+    status: Mapped[str] = mapped_column(
+        String(255),
+        nullable=False,
+        info={"choices": TerminalStatuses},
+    )
+
     return_url: Mapped[str] = mapped_column(String(500), nullable=True)
     callback_url: Mapped[str] = mapped_column(String(500), nullable=True)
 
@@ -204,6 +236,8 @@ class TerminalFactory(SQLAlchemyFactoryBase):
     title = factory.Faker("company")
     description = factory.Faker("sentence", nb_words=6)
 
+    status = factory.LazyFunction(lambda: random.choice(list(TerminalStatuses)).value)
+
     secret_key = factory.LazyFunction(lambda: str(uuid.uuid4()))
     public_id = factory.LazyFunction(lambda: str(uuid.uuid4()))
 

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/example/sections/payments.py

@@ -25,13 +25,6 @@ class PaymentFiltersSchema(schema.FieldsSchema):
     ]
 
 
-STATUS_COLORS = {
-    'process': 'grey-lighten-1',
-    'success': 'green-darken-1',
-    'error': 'red-lighten-2',
-}
-
-
 class PaymentFieldsSchema(schema.FieldsSchema):
     id = schema.IntegerField(label='ID', read_only=True)
     amount = schema.IntegerField(label=_('amount'))
@@ -39,11 +32,6 @@ class PaymentFieldsSchema(schema.FieldsSchema):
     description = schema.StringField(label=_('description'))
     other_field = schema.StringField(read_only=True)
     whitelist_ips = schema.ArrayField(label=_('whitelist_ips'))
-    status = schema.ChoiceField(
-        label=_('status'),
-        tag_colors=STATUS_COLORS,
-        choices=list({'value': k, 'title': k.capitalize()} for k in STATUS_COLORS),
-    )
     # image = schema.ImageField(label=_('image'))
     created_at = schema.DateTimeField(label=_('created_at'), read_only=True)
 
@@ -51,7 +39,6 @@ class PaymentFieldsSchema(schema.FieldsSchema):
         'id',
         'amount',
         'endpoint',
-        'status',
         'description',
         'created_at',
         'get_provider_registry',

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/example/sections/terminal.py

@@ -20,6 +20,7 @@ class TerminalAdmin(sqlalchemy.SQLAlchemyAdmin):
         model=Terminal,
         list_display=[
             'id',
+            'status',
             'merchant_id',
             'public_id',
             'currency_id',

{brilliance_admin-0.43.2 → brilliance_admin-0.43.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brilliance-admin"
-version = "0.43.2"
+version = "0.43.4"
 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.2 → brilliance_admin-0.43.4}/tests/test_payments_fields_schema.py

@@ -160,34 +160,6 @@ category_schema_data = {
                     'required': False,
                     'type': 'string',
                 },
-                'status': {
-                    'choices': [
-                        {
-                            'title': 'Process',
-                            'value': 'process',
-                        },
-                        {
-                            'title': 'Success',
-                            'value': 'success',
-                        },
-                        {
-                            'title': 'Error',
-                            'value': 'error',
-                        },
-                    ],
-                    'header': {},
-                    'label': 'Статус',
-                    'read_only': False,
-                    'required': False,
-                    'size': 'default',
-                    'tag_colors': {
-                        'error': 'red-lighten-2',
-                        'process': 'grey-lighten-1',
-                        'success': 'green-darken-1',
-                    },
-                    'type': 'choice',
-                    'variant': 'elevated',
-                },
                 'whitelist_ips': {
                     'header': {},
                     'label': 'Белый список IP',
@@ -200,7 +172,6 @@ category_schema_data = {
                 'id',
                 'amount',
                 'endpoint',
-                'status',
                 'description',
                 'created_at',
                 'get_provider_registry',

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

@@ -5,7 +5,9 @@ from sqlalchemy import select
 from sqlalchemy.orm import selectinload
 
 from brilliance_admin import auth, schema, sqlalchemy
-from example.sections.models import Currency, CurrencyFactory, MerchantFactory, Terminal, TerminalFactory
+from brilliance_admin.translations import TranslateText
+from example.sections.models import (
+    Currency, CurrencyFactory, MerchantFactory, Terminal, TerminalFactory, TerminalStatuses)
 from tests.test_sqlalcmeny_schema import FIELDS
 
 
@@ -31,6 +33,7 @@ async def test_create(sqlite_sessionmaker, language_context):
     create_data = {
         'merchant_id': merchant.id,
         'currency_id': currency.id,
+        'status': 'test',
         'description': 'test',
         'title': 'test',
     }
@@ -52,6 +55,7 @@ async def test_retrieve(sqlite_sessionmaker, language_context):
     terminal = await TerminalFactory(
         title="test",
         description='test',
+        status=TerminalStatuses.PROCESS.value,
         is_h2h=False,
         registered_delay=None,
         merchant=merchant,
@@ -70,6 +74,10 @@ async def test_retrieve(sqlite_sessionmaker, language_context):
             'key': currency.id,
             'title': mock.ANY,
         },
+        'status': {
+            'title': TranslateText('statuses.process'),
+            'value': 'process',
+        },
         'title': 'test',
         'id': terminal.id,
         'is_h2h': False,
@@ -93,6 +101,10 @@ async def test_retrieve_currency(sqlite_sessionmaker, language_context):
             ],
         ),
     )
+    terminals_field = category.table_schema.get_field('terminals')
+    assert terminals_field._type == "related"
+    assert terminals_field.rel_name == "terminals"
+    assert terminals_field.many is True
 
     user = auth.UserABC(username="test")
     merchant = await MerchantFactory()
@@ -132,6 +144,7 @@ async def test_list(sqlite_sessionmaker, language_context):
         registered_delay=None,
         title='Test terminal',
         description="description",
+        status=TerminalStatuses.PROCESS.value,
         merchant=await MerchantFactory(title="Test merch"),
         currency=await CurrencyFactory(),
     )
@@ -152,6 +165,10 @@ async def test_list(sqlite_sessionmaker, language_context):
                 'key': 1,
                 'title': mock.ANY,
             },
+            'status': {
+                'title': TranslateText('statuses.process'),
+                'value': 'process',
+            },
             'description': 'description',
             'id': 1,
             'is_h2h': False,

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

@@ -110,10 +110,37 @@ category_schema_data = {
                     'required': True,
                     'type': 'string',
                 },
+                'status': {
+                    'choices': [
+                        {
+                            'tag_color': 'grey-lighten-1',
+                            'title': 'В процессе',
+                            'value': 'process',
+                        },
+                        {
+                            'tag_color': 'green-darken-1',
+                            'title': 'Успех',
+                            'value': 'success',
+                        },
+                        {
+                            'tag_color': 'red-lighten-2',
+                            'title': 'Ошибка',
+                            'value': 'error',
+                        },
+                    ],
+                    'header': {},
+                    'label': 'Status',
+                    'read_only': False,
+                    'required': True,
+                    'size': 'default',
+                    'type': 'choice',
+                    'variant': 'elevated',
+                },
             },
             'list_display': [
                 'id',
                 'title',
+                'status',
                 'description',
                 'secret_key',
                 'currency_id',
@@ -131,6 +158,7 @@ category_schema_data = {
 FIELDS = [
     'id',
     'title',
+    'status',
     'description',
     'secret_key',
     'currency_id',

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

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