Added saving target class name
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
bafd6be131
commit
62ea95cfe4
@ -5,12 +5,16 @@ from sqlalchemy.dialects.postgresql import UUID
|
|||||||
import uuid
|
import uuid
|
||||||
import enum
|
import enum
|
||||||
|
|
||||||
|
|
||||||
class AIModelType(enum.Enum):
|
class AIModelType(enum.Enum):
|
||||||
SVM = 1
|
SVM = 1
|
||||||
CNN = 2
|
CNN = 2
|
||||||
|
|
||||||
|
|
||||||
class AIModel(db.Model):
|
class AIModel(db.Model):
|
||||||
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=True, nullable=False)
|
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())
|
timestamp = db.Column(db.TIMESTAMP, nullable=False, server_default=func.now())
|
||||||
|
|
||||||
type = db.Column(db.Enum(AIModelType), nullable=False)
|
type = db.Column(db.Enum(AIModelType), nullable=False)
|
||||||
|
|
||||||
|
target_class_name = db.Column(db.String(50), nullable=False)
|
||||||
|
@ -8,6 +8,7 @@ import uuid
|
|||||||
|
|
||||||
class InfoSchema(Schema):
|
class InfoSchema(Schema):
|
||||||
id = fields.UUID(default=uuid.uuid4, missing=uuid.uuid4)
|
id = fields.UUID(default=uuid.uuid4, missing=uuid.uuid4)
|
||||||
|
target_class_name = fields.String()
|
||||||
|
|
||||||
@classmethod # This threats none values as missing
|
@classmethod # This threats none values as missing
|
||||||
def get_attribute(cls, attr, obj, default):
|
def get_attribute(cls, attr, obj, default):
|
||||||
|
@ -48,10 +48,7 @@ class CNNView(FlaskView):
|
|||||||
ensure_buckets()
|
ensure_buckets()
|
||||||
|
|
||||||
# Create the entry in the db
|
# Create the entry in the db
|
||||||
if info['id']:
|
m = AIModel(id=info['id'], type=AIModelType.CNN, target_class_name=info['target_class_name'])
|
||||||
m = AIModel(id=info['id'], type=AIModelType.CNN)
|
|
||||||
else:
|
|
||||||
m = AIModel(type=AIModelType.CNN)
|
|
||||||
|
|
||||||
# Put files into MinIO
|
# Put files into MinIO
|
||||||
storage.connection.put_object(current_app.config['MINIO_CNN_BUCKET_NAME'], "model/" + str(m.id), model_file,
|
storage.connection.put_object(current_app.config['MINIO_CNN_BUCKET_NAME'], "model/" + str(m.id), model_file,
|
||||||
|
@ -81,7 +81,7 @@ class SVMView(FlaskView):
|
|||||||
os.remove(temp_model_filename)
|
os.remove(temp_model_filename)
|
||||||
os.remove(temp_means_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(
|
d = SVMDetails(
|
||||||
aimodel=m,
|
aimodel=m,
|
||||||
|
Loading…
Reference in New Issue
Block a user