Revised API endpoints

model_service/views/cnn_view.py

@@ -5,21 +5,16 @@ from model import db, Default, AIModel, AIModelType
 from minio.error import NoSuchKey
 from schemas import AIModelSchema, DefaultSchema, InfoSchema
 from marshmallow.exceptions import ValidationError
-from utils import json_required, storage, ensure_buckets
+from utils import multipart_required, storage, ensure_buckets
 
 
 class CNNView(FlaskView):
     route_base = 'cnn'
 
     aimodel_schema = AIModelSchema(many=False)
-    aimodels_schema = AIModelSchema(many=True, exclude=['timestamp', 'details'])
-    default_schema = DefaultSchema(many=False)
     info_schema = InfoSchema(many=False)
 
-    def index(self):
-        models = AIModel.query.filter_by(type=AIModelType.CNN).all()
-        return jsonify(self.aimodels_schema.dump(models)), 200
-
+    @multipart_required
     def post(self):
 
         # get important data from the request
@@ -48,7 +43,7 @@ class CNNView(FlaskView):
         ensure_buckets()
 
         # Create the entry in the db
-        m = AIModel(id=info['id'], type=AIModelType.CNN, target_class_name=info['target_class_name'])
+        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,
@@ -62,14 +57,30 @@ class CNNView(FlaskView):
 
         return jsonify(self.aimodel_schema.dump(m)), 200
 
-    def get(self, _id: str):
+    def delete(self, _id: str):
 
         if _id == "$default":
-            # TODO: Kitalálni, hogy inkább a latestestest-el térjen-e vissza
-            default = Default.query.filter_by(type=AIModelType.CNN).first_or_404()
+            default = Default.query.filter_by(type=AIModelType.cnn).first_or_404()
             m = default.aimodel
         else:
-            m = AIModel.query.filter_by(type=AIModelType.CNN, id=_id).first_or_404()
+            m = AIModel.query.filter_by(type=AIModelType.cnn, id=_id).first_or_404()
+
+        storage.connection.remove_object(current_app.config['MINIO_CNN_BUCKET_NAME'], "weights/" + str(m.id))
+        storage.connection.remove_object(current_app.config['MINIO_CNN_BUCKET_NAME'], "model/" + str(m.id))
+
+        db.session.delete(m)
+        db.session.commit()
+
+        return '', 204
+
+    @route('<_id>/file')
+    def get_file(self, _id: str):
+
+        if _id == "$default":
+            default = Default.query.filter_by(type=AIModelType.cnn).first_or_404()
+            m = default.aimodel
+        else:
+            m = AIModel.query.filter_by(type=AIModelType.cnn, id=_id).first_or_404()
 
         if "weights" in request.args:
             path = "weights/" + str(m.id)
@@ -82,50 +93,3 @@ class CNNView(FlaskView):
             abort(500, "The ID is stored in the database but not int the Object Store")
 
         return Response(data.stream(), mimetype=data.headers['Content-type'])
-
-    @route('<_id>/details')
-    def get_details(self, _id: str):
-
-        if _id == "$default":
-            # TODO: Kitalálni, hogy inkább a latestestest-el térjen-e vissza
-            default = Default.query.filter_by(type=AIModelType.CNN).first_or_404()
-            m = default.aimodel
-        else:
-            m = AIModel.query.filter_by(type=AIModelType.CNN, id=_id).first_or_404()
-
-        return jsonify(self.aimodel_schema.dump(m))
-
-    def delete(self, _id: str):
-
-        if _id == "$default":
-            # TODO: Kitalálni, hogy inkább a latestestest-el térjen-e vissza
-            default = Default.query.filter_by(type=AIModelType.CNN).first_or_404()
-            m = default.aimodel
-        else:
-            m = AIModel.query.filter_by(type=AIModelType.CNN, id=_id).first_or_404()
-
-        storage.connection.remove_object(current_app.config['MINIO_CNN_BUCKET_NAME'], "weights/" + str(m.id))
-        storage.connection.remove_object(current_app.config['MINIO_CNN_BUCKET_NAME'], "model/" + str(m.id))
-
-        db.session.delete(m)
-        db.session.commit()
-
-        return '', 204
-
-    @json_required
-    @route('$default', methods=['PUT'])
-    def put_default(self):
-
-        try:
-            req = self.default_schema.load(request.json)
-        except ValidationError as e:
-            abort(400, str(e))
-
-        m = AIModel.query.filter_by(type=AIModelType.CNN, id=req['id']).first_or_404()
-
-        Default.query.filter_by(type=AIModelType.CNN).delete()
-        new_default = Default(type=AIModelType.CNN, aimodel=m)
-        db.session.add(new_default)
-        db.session.commit()
-
-        return '', 204