brilliance-admin 0.43.1__tar.gz → 0.43.3__tar.gz

{brilliance_admin-0.43.1 → brilliance_admin-0.43.3}/PKG-INFO

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

@@ -139,6 +139,9 @@ class SQLAlchemyRelatedField(TableField):
         - value всегда scalar (None или int)
         - ORM-объект доступен через extra["record"]
         """
+        if not value:
+            return
+
         record = extra.get('record')
         if record is None:
             raise FieldError(f'Missing record in serialize context in value: {value}')
@@ -146,13 +149,13 @@ class SQLAlchemyRelatedField(TableField):
         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'Related field "{self.rel_name}" is missing on record "{record}" (many=True)')
 
             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 (many=False)')
+            raise FieldError(f'Related field "{self.rel_name}" is missing on record "{record}" (many=False)')
 
         return {'key': get_pk(related), 'title': str(related)}
 

{brilliance_admin-0.43.1 → brilliance_admin-0.43.3}/brilliance_admin/integrations/sqlalchemy/fields_schema.py

@@ -64,7 +64,7 @@ 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:
@@ -97,7 +97,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
@@ -126,6 +126,12 @@ class SQLAlchemyFieldsSchema(schema.FieldsSchema):
 
         # relationship-поля
         for rel in mapper.relationships:
+            # relationship, у которых есть локальные FK-колонки, не добавляем в схему,
+            # так как связь редактируется через scalar-поле (FK),
+            # а relationship используется только для ORM-навигации
+            if any(col.foreign_keys for col in rel.local_columns):
+                continue
+
             field_slug = rel.key
 
             field_data = {}

{brilliance_admin-0.43.1 → brilliance_admin-0.43.3}/brilliance_admin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.43.1
+Version: 0.43.3
 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.1 → brilliance_admin-0.43.3}/example/sections/models.py

@@ -116,6 +116,31 @@ class MerchantFactory(SQLAlchemyFactoryBase):
         return self.title
 
 
+class Fee(BaseIDModel):
+    __tablename__ = "fee"
+
+    title: Mapped[str] = mapped_column(String(255), nullable=False)
+    terminals: Mapped[list["Terminal"]] = relationship(back_populates="fee")
+
+    def __repr__(self):
+        return f"<Fee(id={self.id}, title='{self.title}')>"
+
+    def __str__(self):
+        return self.title
+
+
+class FeeFactory(SQLAlchemyFactoryBase):
+    class Meta:
+        model = Merchant
+        sqlalchemy_session_factory = async_sessionmaker_
+        sqlalchemy_session_persistence = "commit"
+
+    title = factory.Faker("word")
+
+    def __str__(self):
+        return self.title
+
+
 class Terminal(BaseIDModel):
     __tablename__ = "terminal"
 
@@ -140,6 +165,9 @@ class Terminal(BaseIDModel):
     currency_id: Mapped[int] = mapped_column(ForeignKey("currency.id"), index=True)
     currency: Mapped["Currency"] = relationship(back_populates="terminals")  # noqa F821
 
+    fee_id: Mapped[int] = mapped_column(ForeignKey("fee.id"), nullable=True)
+    fee: Mapped["Fee"] = relationship(back_populates="terminals")
+
     is_h2h: Mapped[bool] = mapped_column(Boolean, nullable=False, server_default=expression.true())
     is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, server_default=expression.true())
 

{brilliance_admin-0.43.1 → brilliance_admin-0.43.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brilliance-admin"
-version = "0.43.1"
+version = "0.43.3"
 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"