bump to fixed FAB

pyproject.toml

@@ -45,7 +45,7 @@ dependencies = [
  "cryptography>=42.0.4, <43.0.0",
  "deprecation>=2.1.0, <2.2.0",
  "flask>=2.2.5, <3.0.0",
- "flask-appbuilder==5.0.0a1",
+ "flask-appbuilder==5.0.0a2",
  "flask-caching>=2.1.0, <3",
  "flask-compress>=1.13, <2.0",
  "flask-talisman>=1.0.0, <2.0",

requirements/base.txt

@@ -105,7 +105,7 @@ flask==2.3.3
  # flask-session
  # flask-sqlalchemy
  # flask-wtf
-flask-appbuilder==5.0.0a1
+flask-appbuilder==5.0.0a2
  # via apache-superset
 flask-babel==2.0.0
  # via flask-appbuilder

superset/daos/base.py

@@ -65,7 +65,7 @@ def find_by_id(
  """
  query = db.session.query(cls.model_cls)
  if cls.base_filter and not skip_base_filter:
- data_model = SQLAInterface(cls.model_cls, db.session)
+ data_model = SQLAInterface(cls.model_cls)
  query = cls.base_filter( # pylint: disable=not-callable
  cls.id_column_name, data_model
  ).apply(query, None)
@@ -90,7 +90,7 @@ def find_by_ids(
  return []
  query = db.session.query(cls.model_cls).filter(id_col.in_(model_ids))
  if cls.base_filter and not skip_base_filter:
- data_model = SQLAInterface(cls.model_cls, db.session)
+ data_model = SQLAInterface(cls.model_cls)
  query = cls.base_filter( # pylint: disable=not-callable
  cls.id_column_name, data_model
  ).apply(query, None)
@@ -103,7 +103,7 @@ def find_all(cls) -> list[T]:
  """
  query = db.session.query(cls.model_cls)
  if cls.base_filter:
- data_model = SQLAInterface(cls.model_cls, db.session)
+ data_model = SQLAInterface(cls.model_cls)
  query = cls.base_filter( # pylint: disable=not-callable
  cls.id_column_name, data_model
  ).apply(query, None)
@@ -116,7 +116,7 @@ def find_one_or_none(cls, **filter_by: Any) -> T | None:
  """
  query = db.session.query(cls.model_cls)
  if cls.base_filter:
- data_model = SQLAInterface(cls.model_cls, db.session)
+ data_model = SQLAInterface(cls.model_cls)
  query = cls.base_filter( # pylint: disable=not-callable
  cls.id_column_name, data_model
  ).apply(query, None)

superset/daos/dashboard.py

@@ -60,7 +60,7 @@ def get_by_id_or_slug(cls, id_or_slug: int | str) -> Dashboard:
  .outerjoin(Dashboard.roles)
  )
  # Apply dashboard base filters
- query = cls.base_filter("id", SQLAInterface(Dashboard, db.session)).apply(
+ query = cls.base_filter("id", SQLAInterface(Dashboard)).apply(
  query, None
  )
  dashboard = query.one_or_none()

superset/reports/models.py

@@ -114,7 +114,7 @@ class ReportSchedule(AuditMixinNullable, ExtraJSONMixin, Model):
  """
  Report Schedules, supports alerts and reports
  """
-
+ __allow_unmapped__ = True
  __tablename__ = "report_schedule"
  __table_args__ = (UniqueConstraint("name", "type"),)
 
@@ -171,7 +171,7 @@ class ReportSchedule(AuditMixinNullable, ExtraJSONMixin, Model):
  custom_width = Column(Integer, nullable=True)
  custom_height = Column(Integer, nullable=True)
 
- extra: Mapped[ReportScheduleExtra] = Column(Text, default="{}") # type: ignore
+ extra: ReportScheduleExtra
 
  email_subject = Column(String(255))