tanishqgandhi1908 commented on code in PR #7937:
URL: https://github.com/apache/texera/pull/7937#discussion_r3865797091
##########
file-service/src/main/scala/org/apache/texera/service/resource/ModelResource.scala:
##########
@@ -339,6 +359,54 @@ class ModelResource extends LazyLogging {
}
}
+ @POST
+ @Consumes(Array(MediaType.APPLICATION_JSON))
+ @Produces(Array(MediaType.APPLICATION_JSON))
+ @RolesAllowed(Array("REGULAR", "ADMIN"))
+ @Path("/update/framework")
+ def updateModelFramework(
+ modificator: ModelFrameworkModification,
+ @Auth sessionUser: SessionUser
+ ): Response = {
+ withTransaction(context) { ctx =>
+ val modelDao = new ModelDao(ctx.configuration())
+ val model = getModelByID(ctx, modificator.mid)
+ if (!userHasWriteAccess(ctx, modificator.mid, sessionUser.getUid)) {
+ throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_MODEL_MESSAGE)
+ }
+
+ validateLabel("framework", modificator.framework, SUPPORTED_FRAMEWORKS)
+
+ model.setFramework(modificator.framework)
+ modelDao.update(model)
+ Response.ok().build()
+ }
+ }
+
+ @POST
+ @Consumes(Array(MediaType.APPLICATION_JSON))
+ @Produces(Array(MediaType.APPLICATION_JSON))
+ @RolesAllowed(Array("REGULAR", "ADMIN"))
+ @Path("/update/format")
+ def updateModelFormat(
+ modificator: ModelFormatModification,
+ @Auth sessionUser: SessionUser
+ ): Response = {
+ withTransaction(context) { ctx =>
+ val modelDao = new ModelDao(ctx.configuration())
+ val model = getModelByID(ctx, modificator.mid)
+ if (!userHasWriteAccess(ctx, modificator.mid, sessionUser.getUid)) {
+ throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_MODEL_MESSAGE)
+ }
+
+ validateLabel("format", modificator.format, SUPPORTED_FORMATS)
Review Comment:
Agreed, and the unreachable unset state was the real problem. Blank/null now
stores null, so a model wrongly tagged pickle can be cleared. Same
normalizeLabel handles the trim.
##########
file-service/src/main/scala/org/apache/texera/service/resource/ModelResource.scala:
##########
@@ -339,6 +359,54 @@ class ModelResource extends LazyLogging {
}
}
+ @POST
+ @Consumes(Array(MediaType.APPLICATION_JSON))
+ @Produces(Array(MediaType.APPLICATION_JSON))
+ @RolesAllowed(Array("REGULAR", "ADMIN"))
+ @Path("/update/framework")
+ def updateModelFramework(
+ modificator: ModelFrameworkModification,
+ @Auth sessionUser: SessionUser
+ ): Response = {
+ withTransaction(context) { ctx =>
+ val modelDao = new ModelDao(ctx.configuration())
+ val model = getModelByID(ctx, modificator.mid)
+ if (!userHasWriteAccess(ctx, modificator.mid, sessionUser.getUid)) {
+ throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_MODEL_MESSAGE)
+ }
+
+ validateLabel("framework", modificator.framework, SUPPORTED_FRAMEWORKS)
Review Comment:
Right on both counts — Set[String].contains(null) is false rather than an
NPE, so it really does render Unsupported framework 'null' into the toast, and
"onnx " was accepted at create and rejected on update.
Pulled create's normalization into a shared normalizeLabel and routed both
paths through it, so there's one code path instead of two that agreed by
accident. Blank now resets to DEFAULT_FRAMEWORK, matching create.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
