solidui requirement

dlimeng · dlimeng · commit a91e5fae7d05 · 2024-01-13T04:10:53.000+08:00
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -85,7 +85,7 @@ marshmallow==3.19.0
     # via
     #   flask-appbuilder
     #   marshmallow-sqlalchemy
-marshmallow-sqlalchemy==0.23.1
+marshmallow-sqlalchemy==0.26.1
     # via flask-appbuilder
 packaging==23.1
     # via
diff --git a/solidui/config.py b/solidui/config.py
@@ -43,8 +43,6 @@
 
 # SQLALCHEMY_DATABASE_URI = 'mysql://username:password@host:port/dbname'
 
-
-
 # SQLALCHEMY_CUSTOM_PASSWORD_STORE = lookup_password
 SQLALCHEMY_CUSTOM_PASSWORD_STORE = None
 
diff --git a/solidui/views/datasource/schemas.py b/solidui/views/datasource/schemas.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import annotations
-from marshmallow_sqlalchemy import SQLAlchemyAutoSchema
+from marshmallow_sqlalchemy import SQLAlchemyAutoSchema as MSSchema
 
 from solidui.entity.core import DataSourceType, DataSource
 from marshmallow_sqlalchemy.schema import Schema
@@ -34,13 +34,13 @@ def __init__(self, id=None, dataSourceName=None, dataSourceDesc=None, dataSource
         self.expire = expire
 
 
-class DataSourceTypeSchema(SQLAlchemyAutoSchema):
+class DataSourceTypeSchema(MSSchema):
     class Meta:
         model = DataSourceType
         load_instance = True  # Optional: if you also want to use it for deserialization
 
 
-class DataSourceSchema(SQLAlchemyAutoSchema):
+class DataSourceSchema(MSSchema):
     class Meta:
         model = DataSource
         load_instance = True  # Optional: if you also want to use it for deserialization
diff --git a/solidui/views/job_page/schemas.py b/solidui/views/job_page/schemas.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from marshmallow_sqlalchemy import SQLAlchemyAutoSchema
+from marshmallow_sqlalchemy import SQLAlchemyAutoSchema as MSSchema
 
 from solidui.entity.core import JobPage
 
@@ -26,7 +26,7 @@ def __init__(self, id=None, projectId=None, name=None, parentId=None, layout=Non
         self.orders = orders
 
 
-class JobPageSchema(SQLAlchemyAutoSchema):
+class JobPageSchema(MSSchema):
     class Meta:
         model = JobPage
         load_instance = True  # Optional: if you also want to use it for deserialization
diff --git a/solidui/views/model/schemas.py b/solidui/views/model/schemas.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 from dataclasses import dataclass
 
-from marshmallow_sqlalchemy import SQLAlchemyAutoSchema
+from marshmallow_sqlalchemy import SQLAlchemyAutoSchema as MSSchema
 
 from solidui.entity.core import ModelType
 from marshmallow_sqlalchemy.schema import Schema
@@ -27,7 +27,7 @@ def __init__(self, id, name, type_name):
         self.type_name = type_name
 
 
-class ModelTypeSchema(SQLAlchemyAutoSchema):
+class ModelTypeSchema(MSSchema):
     class Meta:
         model = ModelType
         load_instance = True  # Optional: if you also want to use it for deserialization
@@ -44,7 +44,6 @@ class ModelTypeVO:
     code: str = None
 
 
-
 class ModelTypePageInfoSchema(Schema):
     current_page = fields.Int()
     page_size = fields.Int()
diff --git a/solidui/views/project/schemas.py b/solidui/views/project/schemas.py
@@ -14,9 +14,10 @@
 from marshmallow_sqlalchemy.schema import Schema
 from solidui.entity.core import Project
 from marshmallow_sqlalchemy.fields import fields
-from marshmallow_sqlalchemy import SQLAlchemyAutoSchema
+from marshmallow_sqlalchemy import SQLAlchemyAutoSchema as MSSchema
 
-class ProjectSchema(SQLAlchemyAutoSchema):
+
+class ProjectSchema(MSSchema):
     class Meta:
         model = Project
         load_instance = True  # Optional: if you also want to use it for deserialization
