diff --git a/model_service/schemas/__init__.py b/model_service/schemas/__init__.py index e01f94f..0ed7d74 100644 --- a/model_service/schemas/__init__.py +++ b/model_service/schemas/__init__.py @@ -1,4 +1,4 @@ #!/usr/bin/env python3 from .default_schema import DefaultSchema from .aimodel_schema import AIModelSchema -from .info_schema import InfoSchema \ No newline at end of file +from .info_schema import InfoSchema diff --git a/model_service/schemas/aimodel_schema.py b/model_service/schemas/aimodel_schema.py index b1b1bbd..7b84b7a 100644 --- a/model_service/schemas/aimodel_schema.py +++ b/model_service/schemas/aimodel_schema.py @@ -1,14 +1,14 @@ #!/usr/bin/env python3 from typing import Optional from marshmallow import fields -from marshmallow_sqlalchemy import ModelSchema +from marshmallow_sqlalchemy import SQLAlchemyAutoSchema from marshmallow_enum import EnumField from model import AIModel, AIModelType from .svmdetails_schema import SVMDetailsSchema -class AIModelSchema(ModelSchema): +class AIModelSchema(SQLAlchemyAutoSchema): _svm_details_schema = SVMDetailsSchema(many=False, exclude=["aimodel"]) @@ -29,3 +29,6 @@ class AIModelSchema(ModelSchema): class Meta: model = AIModel + include_relationships = True + load_instance = True + include_fk = True diff --git a/model_service/schemas/svmdetails_schema.py b/model_service/schemas/svmdetails_schema.py index 6bec962..21215ea 100644 --- a/model_service/schemas/svmdetails_schema.py +++ b/model_service/schemas/svmdetails_schema.py @@ -1,10 +1,13 @@ #!/usr/bin/env python3 from marshmallow import fields -from marshmallow_sqlalchemy import ModelSchema +from marshmallow_sqlalchemy import SQLAlchemyAutoSchema from model import SVMDetails -class SVMDetailsSchema(ModelSchema): +class SVMDetailsSchema(SQLAlchemyAutoSchema): class Meta: model = SVMDetails + include_relationships = True + load_instance = True + include_fk = True diff --git a/requirements.txt b/requirements.txt index c0f21a1..343feff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ Flask-Classful Flask-SQLAlchemy SQLAlchemy-Utils SQLAlchemy -marshmallow-sqlalchemy +marshmallow-sqlalchemy~=0.26.1 marshmallow-enum psycopg2-binary minio~=6.0.0