Merge remote-tracking branch 'origin/master' into s3-upload

Author: frcroth

app/controllers/AiModelController.scala

@@ -235,7 +235,7 @@ class AiModelController @Inject()(
         _ <- Fox.fromBool(request.identity._organization == organization._id) ?~> "job.runInference.notAllowed.organization" ~> FORBIDDEN
         dataset <- datasetDAO.findOneByDirectoryNameAndOrganization(request.body.datasetDirectoryName, organization._id)
         dataStore <- dataStoreDAO.findOneByName(dataset._dataStore) ?~> "dataStore.notFound"
-        _ <- aiModelDAO.findOne(request.body.aiModelId) ?~> "aiModel.notFound"
+        aiModel <- aiModelDAO.findOne(request.body.aiModelId) ?~> "aiModel.notFound"
         _ <- datasetService.assertValidDatasetName(request.body.newDatasetName)
         jobCommand = JobCommand.infer_instances
         boundingBox <- BoundingBox.fromLiteral(request.body.boundingBox).toFox
@@ -246,6 +246,7 @@ class AiModelController @Inject()(
           "layer_name" -> request.body.colorLayerName,
           "bbox" -> boundingBox.toLiteral,
           "model_id" -> request.body.aiModelId,
+          "model_organization_id" -> aiModel._organization,
           "dataset_directory_name" -> request.body.datasetDirectoryName,
           "new_dataset_name" -> request.body.newDatasetName,
           "custom_workflow_provided_by_user" -> request.body.workflowYaml,
@@ -278,7 +279,7 @@ class AiModelController @Inject()(
         _ <- Fox.fromBool(request.identity._organization == organization._id) ?~> "job.runInference.notAllowed.organization" ~> FORBIDDEN
         dataset <- datasetDAO.findOneByDirectoryNameAndOrganization(request.body.datasetDirectoryName, organization._id)
         dataStore <- dataStoreDAO.findOneByName(dataset._dataStore) ?~> "dataStore.notFound"
-        _ <- aiModelDAO.findOne(request.body.aiModelId) ?~> "aiModel.notFound"
+        aiModel <- aiModelDAO.findOne(request.body.aiModelId) ?~> "aiModel.notFound"
         _ <- datasetService.assertValidDatasetName(request.body.newDatasetName)
         jobCommand = JobCommand.infer_neurons
         boundingBox <- BoundingBox.fromLiteral(request.body.boundingBox).toFox
@@ -289,6 +290,7 @@ class AiModelController @Inject()(
           "layer_name" -> request.body.colorLayerName,
           "bbox" -> boundingBox.toLiteral,
           "model_id" -> request.body.aiModelId,
+          "model_organization_id" -> aiModel._organization,
           "dataset_directory_name" -> request.body.datasetDirectoryName,
           "new_dataset_name" -> request.body.newDatasetName,
           "custom_workflow_provided_by_user" -> request.body.workflowYaml,

unreleased_changes/8926.md

@@ -0,0 +1,2 @@
+### Fixed
+- Fixed running custom-model worker inferences with models shared from other wk organizations. [#4283](https://github.com/scalableminds/voxelytics/pull/4283)

unreleased_changes/8927.md

@@ -0,0 +1,2 @@
+### Fixed
+- Fixed a bug in reading zarr3-format connectome files caused by a wrong metadata key

webknossos-datastore/app/com/scalableminds/webknossos/datastore/services/connectome/ConnectomeFileUtils.scala

@@ -14,7 +14,8 @@ trait ConnectomeFileUtils {
   protected val keySynapseToSrcAgglomerate = "synapse_to_src_agglomerate"
   protected val keySynapseToDstAgglomerate = "synapse_to_dst_agglomerate"
 
-  protected val attrKeyMetadataMappingName = "metadata/mapping_name"
+  protected val attrKeyMetadataMappingName = "metadata/mapping_name" // Used for legacy (hdf5) only
+  protected val attrKeyMappingName = "mapping_name"
   protected val attrKeySynapseTypeNames = "synapse_type_names"
 
   protected def synapticPartnerKey(direction: SynapticPartnerDirection): String =

webknossos-datastore/app/com/scalableminds/webknossos/datastore/services/connectome/ZarrConnectomeFileService.scala

@@ -29,7 +29,7 @@ object ConnectomeFileAttributes extends VoxelyticsZarrArtifactUtils with Connect
       val connectomeFileAttrs = lookUpArtifactAttributes(json)
       for {
         formatVersion <- readArtifactSchemaVersion(json)
-        mappingName <- (connectomeFileAttrs \ attrKeyMetadataMappingName).validate[String]
+        mappingName <- (connectomeFileAttrs \ attrKeyMappingName).validate[String]
         synapseTypeNames <- (connectomeFileAttrs \ attrKeySynapseTypeNames).validate[Seq[String]]
       } yield
         ConnectomeFileAttributes(