@@ -313,37 +313,37 @@ def handle_program_status():
313313 prog = app .prog
314314 return json .dumps ({'name' : prog .name , "running" : prog .is_running (), "log" : app .prog_engine .get_log ()})
315315
316- # @app.route("/cnnmodels", methods=["GET"])
317- # def handle_cnn_models_list():
318- # logging.info("cnn_models_list")
319- # return json.dumps(cnn.get_models())
320-
321- # @app.route("/cnnmodels", methods=["POST"])
322- # def handle_cnn_models_new():
323- # logging.info("cnn_models_new")
324- # data = json.loads(request.get_data(as_text=True))
325- # cnn.train_new_model(model_name=data["model_name"],
326- # architecture=data["architecture"],
327- # image_tags=data["image_tags"],
328- # photos_meta=cam.get_photo_list(),
329- # training_steps=data["training_steps"],
330- # learning_rate=data["learning_rate"])
331- #
332- # return json.dumps({"name": data["model_name"], "status": 0})
333-
334- # @app.route("/cnnmodels/<model_name>", methods=["GET"])
335- # def handle_cnn_models_status(model_name):
336- # logging.info("cnn_models_status")
337- # model_status = cnn.get_models().get(model_name)
338- #
339- # return json.dumps(model_status)
340-
341- # @app.route("/cnnmodels/<model_name>", methods=["DELETE"])
342- # def handle_cnn_models_delete(model_name):
343- # logging.info("cnn_models_delete")
344- # model_status = cnn.delete_model(model_name=model_name)
345-
346- # return json.dumps(model_status)
316+ @app .route ("/cnnmodels" , methods = ["GET" ])
317+ def handle_cnn_models_list ():
318+ logging .info ("cnn_models_list" )
319+ return json .dumps (cnn .get_models ())
320+
321+ @app .route ("/cnnmodels" , methods = ["POST" ])
322+ def handle_cnn_models_new ():
323+ logging .info ("cnn_models_new" )
324+ data = json .loads (request .get_data (as_text = True ))
325+ cnn .train_new_model (model_name = data ["model_name" ],
326+ architecture = data ["architecture" ],
327+ image_tags = data ["image_tags" ],
328+ photos_meta = cam .get_photo_list (),
329+ training_steps = data ["training_steps" ],
330+ learning_rate = data ["learning_rate" ])
331+
332+ return json .dumps ({"name" : data ["model_name" ], "status" : 0 })
333+
334+ @app .route ("/cnnmodels/<model_name>" , methods = ["GET" ])
335+ def handle_cnn_models_status (model_name ):
336+ logging .info ("cnn_models_status" )
337+ model_status = cnn .get_models ().get (model_name )
338+
339+ return json .dumps (model_status )
340+
341+ @app .route ("/cnnmodels/<model_name>" , methods = ["DELETE" ])
342+ def handle_cnn_models_delete (model_name ):
343+ logging .info ("cnn_models_delete" )
344+ model_status = cnn .delete_model (model_name = model_name )
345+
346+ return json .dumps (model_status )
347347
348348
349349def execute (command ):
0 commit comments