Skip to content

Commit 8d0d776

Browse files
committed
Remove ZarrStreamingService
1 parent 612ea36 commit 8d0d776

File tree

7 files changed

+345
-601
lines changed

7 files changed

+345
-601
lines changed

app/controllers/WKRemoteDataStoreController.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,18 @@ class WKRemoteDataStoreController @Inject()(
253253
}
254254
}
255255

256+
def findDatasetId(name: String, key: String, datasetDirectoryName: String, organizationId: String): Action[AnyContent] =
257+
Action.async { implicit request =>
258+
dataStoreService.validateAccess(name, key) { _ =>
259+
for {
260+
organization <- organizationDAO.findOne(organizationId)(GlobalAccessContext) ?~> Messages(
261+
"organization.notFound",
262+
organizationId) ~> NOT_FOUND
263+
dataset <- datasetDAO.findOneByNameAndOrganization(datasetDirectoryName, organization._id)(GlobalAccessContext)
264+
} yield Ok(Json.toJson(dataset._id))
265+
}
266+
}
267+
256268
def getPaths(name: String, key: String, datasetId: ObjectId): Action[AnyContent] =
257269
Action.async { implicit request =>
258270
dataStoreService.validateAccess(name, key) { _ =>

conf/webknossos.latest.routes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ GET /datastores/:name/getUnfinishedUploadsForUser
119119
POST /datastores/:name/reportDatasetUpload controllers.WKRemoteDataStoreController.reportDatasetUpload(name: String, key: String, token: String, datasetDirectoryName: String, datasetSizeBytes: Long, needsConversion: Boolean, viaAddRoute: Boolean)
120120
POST /datastores/:name/deleteDataset controllers.WKRemoteDataStoreController.deleteDataset(name: String, key: String)
121121
POST /datastores/:name/deleteVirtualDataset controllers.WKRemoteDataStoreController.deleteVirtualDataset(name: String, key: String)
122+
GET /datastores/:name/findDatasetId controllers.WKRemoteDataStoreController.findDatasetId(name: String, key: String, datasetDirectoryName: String, organizationId: String)
122123
GET /datastores/:name/jobExportProperties controllers.WKRemoteDataStoreController.jobExportProperties(name: String, key: String, jobId: ObjectId)
123124
GET /datastores/:name/findCredential controllers.WKRemoteDataStoreController.findCredential(name: String, key: String, credentialId: ObjectId)
124125
POST /datastores/:name/validateUserAccess controllers.UserTokenController.validateAccessViaDatastore(name: String, key: String, token: Option[String])

webknossos-datastore/app/com/scalableminds/webknossos/datastore/DataStoreModule.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,5 @@ class DataStoreModule extends AbstractModule {
6464
bind(classOf[RemoteSourceDescriptorService]).asEagerSingleton()
6565
bind(classOf[ChunkCacheService]).asEagerSingleton()
6666
bind(classOf[DatasetCache]).asEagerSingleton()
67-
bind(classOf[ZarrStreamingService]).asEagerSingleton()
6867
}
6968
}

webknossos-datastore/app/com/scalableminds/webknossos/datastore/controllers/LegacyController.scala

Lines changed: 136 additions & 253 deletions
Large diffs are not rendered by default.

webknossos-datastore/app/com/scalableminds/webknossos/datastore/controllers/ZarrStreamingController.scala

Lines changed: 189 additions & 123 deletions
Large diffs are not rendered by default.

webknossos-datastore/app/com/scalableminds/webknossos/datastore/services/DSRemoteWebknossosClient.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,11 @@ class DSRemoteWebknossosClient @Inject()(
227227
rpc(s"$webknossosUri/api/datastores/$dataStoreName/datasources/$datasetId")
228228
.addQueryString("key" -> dataStoreKey)
229229
.getWithJsonResponse[GenericDataSource[DataLayer]] ?~> "Failed to get data source from remote webknossos"
230+
231+
def getDatasetId(organizationId: String, datasetDirectoryName: String): Fox[ObjectId] =
232+
rpc(s"$webknossosUri/api/datastores/$dataStoreName/findDatasetId")
233+
.addQueryString("key" -> dataStoreKey)
234+
.addQueryString("organizationId" -> organizationId)
235+
.addQueryString("datasetDirectoryName" -> datasetDirectoryName)
236+
.getWithJsonResponse[ObjectId] ?~> "Failed to get dataset id from remote webknossos"
230237
}

webknossos-datastore/app/com/scalableminds/webknossos/datastore/services/ZarrStreamingService.scala

Lines changed: 0 additions & 224 deletions
This file was deleted.

0 commit comments

Comments
 (0)