Virtual Datasets #8708
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package models.dataset | ||
|
|
||
| import com.scalableminds.util.accesscontext.DBAccessContext | ||
| import com.scalableminds.util.objectid.ObjectId | ||
| import com.scalableminds.util.tools.{Fox, FoxImplicits} | ||
| import com.scalableminds.webknossos.datastore.models.VoxelSize | ||
| import com.scalableminds.webknossos.datastore.models.datasource._ | ||
| import models.user.User | ||
| import play.api.libs.json.{Json, OFormat} | ||
|
|
||
| import javax.inject.Inject | ||
| import scala.concurrent.ExecutionContext | ||
|
|
||
| case class ComposeRequest( | ||
| newDatasetName: String, | ||
| targetFolderId: String, | ||
| organizationId: String, | ||
| voxelSize: VoxelSize, | ||
| layers: Seq[ComposeRequestLayer] | ||
| ) | ||
|
|
||
| object ComposeRequest { | ||
| implicit val composeRequestFormat: OFormat[ComposeRequest] = Json.format[ComposeRequest] | ||
| } | ||
| case class ComposeRequestLayer( | ||
| datasetId: String, | ||
| sourceName: String, | ||
| newName: String, | ||
| transformations: Seq[CoordinateTransformation] | ||
| ) | ||
fm3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| object ComposeRequestLayer { | ||
| implicit val composeLayerFormat: OFormat[ComposeRequestLayer] = Json.format[ComposeRequestLayer] | ||
| } | ||
|
|
||
| class ComposeService @Inject()(datasetDAO: DatasetDAO, dataStoreDAO: DataStoreDAO, datasetService: DatasetService)( | ||
| implicit ec: ExecutionContext) | ||
| extends FoxImplicits { | ||
|
|
||
| def composeDataset(composeRequest: ComposeRequest, user: User)( | ||
| implicit ctx: DBAccessContext): Fox[(DataSource, ObjectId)] = | ||
| for { | ||
| _ <- isComposable(composeRequest) ?~> "Datasets are not composable, they are not on the same data store" | ||
fm3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| dataSource <- createDatasource(composeRequest, composeRequest.newDatasetName, composeRequest.organizationId) | ||
| dataStore <- dataStoreDAO.findOneWithUploadsAllowed | ||
| dataset <- datasetService.createVirtualDataset(composeRequest.newDatasetName, | ||
| composeRequest.organizationId, | ||
| dataStore, | ||
| dataSource, | ||
| Some(composeRequest.targetFolderId), | ||
| user) | ||
|
|
||
| } yield (dataSource, dataset._id) | ||
|
|
||
| private def getLayerFromComposeLayer(composeLayer: ComposeRequestLayer)( | ||
| implicit ctx: DBAccessContext): Fox[DataLayer] = | ||
| for { | ||
| datasetIdValidated <- ObjectId.fromString(composeLayer.datasetId) ?~> "Invalid dataset ID" | ||
| dataset <- datasetDAO.findOne(datasetIdValidated) ?~> "Dataset not found" | ||
| ds <- datasetService.fullDataSourceFor(dataset) | ||
fm3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ds <- ds.toUsable.toFox ?~> "Dataset not usable" | ||
fm3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| layer <- ds.dataLayers.find(_.name == composeLayer.sourceName).toFox | ||
| applyCoordinateTransformations = (cOpt: Option[List[CoordinateTransformation]]) => | ||
| cOpt match { | ||
| case Some(c) => Some(c ++ composeLayer.transformations.toList) | ||
| case None => Some(composeLayer.transformations.toList) | ||
| } | ||
| editedLayer: DataLayer <- layer match { | ||
| case l: DataLayerWithMagLocators => | ||
| Fox.successful( | ||
| l.mapped(name = composeLayer.newName, | ||
| coordinateTransformations = applyCoordinateTransformations(l.coordinateTransformations))) | ||
| case _ => Fox.failure("Unsupported layer type for composition: " + layer.getClass.getSimpleName) | ||
| } | ||
| } yield editedLayer | ||
|
|
||
| private def isComposable(composeRequest: ComposeRequest)(implicit ctx: DBAccessContext): Fox[Boolean] = | ||
| // Check that all datasets are on the same data store | ||
| // Using virtual datasets, we should also be able to compose datasets using non-file paths from different data | ||
| // stores, however, the data store is only stored for each data set and not per mag. | ||
| for { | ||
| _ <- Fox.fromBool(composeRequest.layers.nonEmpty) ?~> "Cannot compose dataset with no layers" | ||
| datasetIds = composeRequest.layers.map(_.datasetId).distinct | ||
| datasetIdsValidated <- Fox.serialCombined(datasetIds.toList)(ObjectId.fromString(_)) ?~> "Invalid dataset ID" | ||
| datasets <- Fox.serialCombined(datasetIdsValidated)(datasetDAO.findOne(_)) | ||
| dataStores = datasets.map(_._dataStore) | ||
| } yield { | ||
| dataStores.distinct.size == 1 | ||
| } | ||
|
|
||
| private def createDatasource(composeRequest: ComposeRequest, datasetDirectoryName: String, organizationId: String)( | ||
| implicit ctx: DBAccessContext): Fox[DataSource] = | ||
| for { | ||
| layers <- Fox.serialCombined(composeRequest.layers.toList)(getLayerFromComposeLayer(_)) | ||
| dataSource = GenericDataSource( | ||
| DataSourceId(datasetDirectoryName, organizationId), | ||
| layers, | ||
| composeRequest.voxelSize, | ||
| None | ||
| ) | ||
|
|
||
| } yield dataSource | ||
|
|
||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can use Action[ObjectId] and validateJson[ObjectId] directly
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, it might make sense to turn around the deletion protocol so that the frontend talks to the wk side, and wk checks if isVirtual==false and if so asks the datastore to also delete on disk. But that could be a follow-up issue. What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes that would make more sense