Provide dataset org from frontend for run Inference job

scalableminds · Nov 13, 2024 · 5815fab · 5815fab
1 parent ff0d6d1
commit 5815fab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/app/controllers/AiModelController.scala b/app/controllers/AiModelController.scala
@@ -1,5 +1,6 @@
 package controllers
 
+import com.scalableminds.util.accesscontext.GlobalAccessContext
 import com.scalableminds.util.geometry.{BoundingBox, Vec3Int}
 import com.scalableminds.util.tools.{Fox, FoxImplicits}
 import models.aimodels.{AiInference, AiInferenceDAO, AiInferenceService, AiModel, AiModelDAO, AiModelService}
@@ -42,6 +43,7 @@ object RunTrainingParameters {
 case class RunInferenceParameters(annotationId: Option[ObjectId],
                                   aiModelId: ObjectId,
                                   datasetName: String,
+                                  organizationId: String,
                                   colorLayerName: String,
                                   boundingBox: String,
                                   newDatasetName: String,
@@ -174,7 +176,10 @@ class AiModelController @Inject()(
     sil.SecuredAction.async(validateJson[RunInferenceParameters]) { implicit request =>
       for {
         _ <- userService.assertIsSuperUser(request.identity)
-        organization <- organizationDAO.findOne(request.identity._organization)
+        organization <- organizationDAO.findOne(request.body.organizationId)(GlobalAccessContext) ?~> Messages(
+          "organization.notFound",
+          request.body.organizationId)
+        _ <- bool2Fox(request.identity._organization == organization._id) ?~> "job.runInference.notAllowed.organization" ~> FORBIDDEN
         dataset <- datasetDAO.findOneByNameAndOrganization(request.body.datasetName, organization._id) ?~> Messages(
           "dataset.notFound",
           request.body.datasetName)

diff --git a/conf/messages b/conf/messages
@@ -332,9 +332,9 @@ job.noWorkerForDatastoreAndJob = No webknossos-worker supporting the requested j
 job.emailNotifactionsDisabled = Email notifications are not enabled for this job type.
 job.renderAnimation.notAllowed.organization = Rendering animations is only allowed for datasets of your own organization.
 job.alignSections.notAllowed.organization = Aligning sections is only allowed for datasets of your own organization.
-job.alignSections.notAllowed.onlySuperUsers = For now, aligning sections is only allowed for super users.
 job.additionalCoordinates.invalid = The passed additional coordinates are invalid.
 job.trainModel.notAllowed.organization = Training AI models is only allowed for datasets of your own organization.
+job.runInference.notAllowed.organization = Running inference is only allowed for datasets of your own organization.
 
 voxelytics.disabled = Voxelytics workflow reporting and logging are not enabled for this WEBKNOSSOS instance.
 voxelytics.runNotFound = Workflow runs not found

diff --git a/frontend/javascripts/admin/api/jobs.ts b/frontend/javascripts/admin/api/jobs.ts
@@ -348,6 +348,7 @@ type RunInferenceParameters = {
   annotationId?: string;
   aiModelId: string;
   datasetName: string;
+  organizationId: string;
   colorLayerName: string;
   boundingBox: Vector6;
   newDatasetName: string;

diff --git a/frontend/javascripts/oxalis/view/action-bar/starting_job_modals.tsx b/frontend/javascripts/oxalis/view/action-bar/starting_job_modals.tsx
@@ -829,6 +829,7 @@ function CustomAiModelInferenceForm() {
           aiModelId: form.getFieldValue("aiModel"),
           workflowYaml: useCustomWorkflow ? form.getFieldValue("workflowYaml") : undefined,
           datasetName: dataset.name,
+          organizationId: dataset.owningOrganization,
           colorLayerName: colorLayer.name,
           boundingBox,
           newDatasetName: newDatasetName,