Added saving target class name
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Pünkösd Marcell 2020-10-01 19:38:34 +02:00
parent bafd6be131
commit 62ea95cfe4
4 changed files with 7 additions and 5 deletions

View File

@ -5,12 +5,16 @@ from sqlalchemy.dialects.postgresql import UUID
import uuid
import enum
class AIModelType(enum.Enum):
SVM = 1
CNN = 2
class AIModel(db.Model):
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
timestamp = db.Column(db.TIMESTAMP, nullable=False, server_default=func.now())
type = db.Column(db.Enum(AIModelType), nullable=False)
target_class_name = db.Column(db.String(50), nullable=False)

View File

@ -8,6 +8,7 @@ import uuid
class InfoSchema(Schema):
id = fields.UUID(default=uuid.uuid4, missing=uuid.uuid4)
target_class_name = fields.String()
@classmethod # This threats none values as missing
def get_attribute(cls, attr, obj, default):

View File

@ -48,10 +48,7 @@ class CNNView(FlaskView):
ensure_buckets()
# Create the entry in the db
if info['id']:
m = AIModel(id=info['id'], type=AIModelType.CNN)
else:
m = AIModel(type=AIModelType.CNN)
m = AIModel(id=info['id'], type=AIModelType.CNN, target_class_name=info['target_class_name'])
# Put files into MinIO
storage.connection.put_object(current_app.config['MINIO_CNN_BUCKET_NAME'], "model/" + str(m.id), model_file,

View File

@ -81,7 +81,7 @@ class SVMView(FlaskView):
os.remove(temp_model_filename)
os.remove(temp_means_filename)
m = AIModel(id=info['id'], type=AIModelType.SVM)
m = AIModel(id=info['id'], type=AIModelType.SVM, target_class_name=info['target_class_name'])
d = SVMDetails(
aimodel=m,