@radicalimaging/static-wado-creator 0.6.4 → 1.1.0

package/CHANGELOG.md

@@ -0,0 +1,67 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.6.4](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.6.3...@radicalimaging/static-wado-creator@0.6.4) (2022-04-04)
+
+**Note:** Version bump only for package @radicalimaging/static-wado-creator
+
+
+
+
+
+## [0.6.3](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.6.2...@radicalimaging/static-wado-creator@0.6.3) (2022-03-14)
+
+**Note:** Version bump only for package @radicalimaging/static-wado-creator
+
+
+
+
+
+## [0.6.2](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.6.1...@radicalimaging/static-wado-creator@0.6.2) (2022-03-04)
+
+**Note:** Version bump only for package @radicalimaging/static-wado-creator
+
+
+
+
+
+## [0.6.1](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.6.0...@radicalimaging/static-wado-creator@0.6.1) (2022-03-04)
+
+**Note:** Version bump only for package @radicalimaging/static-wado-creator
+
+
+
+
+
+# [0.6.0](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.5.1...@radicalimaging/static-wado-creator@0.6.0) (2022-03-03)
+
+
+### Bug Fixes
+
+* **static-wado:** make the various constructors use a straight configuration without using the program data ([1997d9f](https://github.com/OHIF/static-wado/commit/1997d9f0fe2e0a084d31edeb475494bcec78fd77))
+
+
+### Features
+
+* **static-wado:** qido series fallback to retrieve from proxyAe ([#8](https://github.com/OHIF/static-wado/issues/8)) ([47b5550](https://github.com/OHIF/static-wado/commit/47b55503732e25be08b215bdc201593f64de52e6))
+
+
+
+
+
+## 0.5.1 (2022-02-16)
+
+
+### Bug Fixes
+
+* **pencil:** add more files to lint, increase test config and README ([89b667c](https://github.com/OHIF/static-wado/commit/89b667c83d324ab9fa540cda0c037af8fe088f72))
+* **pencil:** adding must package and minor test changes ([9194f3f](https://github.com/OHIF/static-wado/commit/9194f3f1bb52da57e20bb8bb9f07262bcebdffbf))
+* **pencil:** code review.lint ([fa1a58a](https://github.com/OHIF/static-wado/commit/fa1a58a0c62015503575fbeb172b71810c6833de))
+* **pencil:** fix format ([68fbc9b](https://github.com/OHIF/static-wado/commit/68fbc9bf5a3e9bf85e3fbcddfb3e0759e79b769d))
+* **pencil:** fix lint and add pre-commit restr ([deec345](https://github.com/OHIF/static-wado/commit/deec34524531d5a8595a775bac414f63f60e9f23))
+* **pencil:** lint/prettier ([d6ecbc6](https://github.com/OHIF/static-wado/commit/d6ecbc6b5961e03e8a557f4fcc78af53549132cd))
+* **pencil:** moving from wado-js to wado repo ([5916aec](https://github.com/OHIF/static-wado/commit/5916aecd7c77dbc4882681877e2b51210976427f))
+* **pencil:** readme link name ([40408ab](https://github.com/OHIF/static-wado/commit/40408ab6b4e97c8656e30b1dd2c30b92440b9f90))
+* **pencil:** unit tests migration ([d9d56dd](https://github.com/OHIF/static-wado/commit/d9d56dd619fb1f41ed1d5ad85f7f804e013c6527))

package/README.md

@@ -158,11 +158,13 @@ There is currently no notification of what studies have been updated between sta
 ### To Serve Instances As a Web Server
 ```
 cd ~/dicomweb
-npx http-server -p 5000 -g --cors
+npx http-server -p 5000 -g --cors -e json
 ```
 
 The -g option serves up compressed files ending in .gz as compressed http streams.
 
+The -e option will mark json files as the default extension, so when requesting `GET dicomweb/studies/` the `./studies/index.json.gz` file will be served.
+
 ### To Create DICOM part 10 from DICOMweb files
 TODO
 

package/lib/DeleteStudy.js

@@ -1,6 +1,6 @@
 const { JSONReader } = require("@radicalimaging/static-wado-util");
-const JSONWriter = require("./writer/JSONWriter");
-const Tags = require("./dictionary/Tags");
+const { JSONWriter } = require("@radicalimaging/static-wado-util");
+const { Tags } = require("@radicalimaging/static-wado-util");
 
 module.exports = (options) =>
   async function (studyInstanceUid) {
@@ -8,7 +8,7 @@ module.exports = (options) =>
     const studyData = await this.scanStudy("studies", studyInstanceUid);
     studyData.delete();
     const allStudies = await JSONReader(options.directoryName, "studies/index.json.gz", []);
-    const studiesWithoutDeleted = allStudies.filter((study) => studyInstanceUid != Tags.getValue(study,Tags.StudyInstanceUID));
+    const studiesWithoutDeleted = allStudies.filter((study) => studyInstanceUid != Tags.getValue(study, Tags.StudyInstanceUID));
     await JSONWriter(options.directoryName, "studies", studiesWithoutDeleted);
     delete this.studyData;
   };

package/lib/StaticWado.js

@@ -3,8 +3,7 @@ const { Stats, handleHomeRelative } = require("@radicalimaging/static-wado-util"
 const dicomParser = require("dicom-parser");
 const fs = require("fs");
 const path = require("path");
-const { dirScanner } = require("@radicalimaging/static-wado-util");
-const asyncIterableToBuffer = require("./operation/adapter/asyncIterableToBuffer");
+const { dirScanner, JSONReader, JSONWriter, asyncIterableToBuffer } = require("@radicalimaging/static-wado-util");
 const getDataSet = require("./operation/getDataSet");
 const InstanceDeduplicate = require("./operation/InstanceDeduplicate");
 const DeduplicateWriter = require("./writer/DeduplicateWriter");
@@ -19,6 +18,7 @@ const ThumbnailWriter = require("./writer/ThumbnailWriter");
 const ThumbnailService = require("./operation/ThumbnailService");
 const DeleteStudy = require("./DeleteStudy");
 const RejectInstance = require("./RejectInstance");
+const RawDicomWriter = require("./writer/RawDicomWriter");
 
 function setStudyData(studyData) {
   this.studyData = studyData;
@@ -51,6 +51,7 @@ class StaticWado {
       reject: RejectInstance(this.options),
       delete: DeleteStudy(this.options),
       setStudyData,
+      rawDicomWriter: RawDicomWriter(this.options),
     };
   }
 
@@ -174,6 +175,8 @@ class StaticWado {
     // convert to DICOMweb MetaData and BulkData
     const result = await getDataSet(dataSet, generator, this.options);
 
+    await this.callback.rawDicomWriter?.(id, result, buffer);
+
     const transcodedMeta = transcodeMetadata(result.metadata, id, this.options);
     thumbnailService.generateThumbnails(id, dataSet, transcodedMeta, this.callback);
 
@@ -202,5 +205,24 @@ class StaticWado {
     await this.callback.completeStudy();
     Stats.OverallStats.summarize("Completed Study Processing");
   }
+
+  async reindex() {
+    const { directoryName } = this.options;
+    const studiesDir = `${directoryName}/studies/`;
+
+    console.log("Re-indexing", studiesDir);
+    const dirs = await fs.promises.readdir(studiesDir);
+    const studies = [];
+    for (const dir of dirs) {
+      const study = await JSONReader(`${studiesDir}/${dir}`, "index.json.gz", null);
+      if (study === null) {
+        console.log("No study found in", dir);
+        continue;
+      }
+      console.log("Adding study", dir);
+      studies.push(...study);
+    }
+    return JSONWriter(directoryName, "studies", studies);
+  }
 }
 module.exports = StaticWado;

package/lib/index.js

@@ -4,5 +4,6 @@ const StaticWado = require("./StaticWado");
 StaticWado.mkdicomwebConfig = mkdicomwebConfig;
 StaticWado.createMain = require("./createMain");
 StaticWado.deleteMain = require("./deleteMain");
+StaticWado.adaptProgramOpts = require("./util/adaptProgramOpts");
 
 module.exports = StaticWado;

package/lib/indexMain.js

@@ -0,0 +1,10 @@
+const StaticWado = require("./StaticWado");
+const adaptProgramOpts = require("./util/adaptProgramOpts");
+
+module.exports = function createMain(options) {
+  const finalOptions = adaptProgramOpts(options, {
+    ...this,
+  });
+  const importer = new StaticWado(finalOptions);
+  return importer.reindex();
+};

package/lib/mkdicomwebConfig.js

@@ -4,6 +4,7 @@ const createMain = require("./createMain");
 const deleteMain = require("./deleteMain");
 const rejectMain = require("./rejectMain");
 const instanceMain = require("./instanceMain");
+const indexMain = require("./indexMain");
 const groupMain = require("./groupMain");
 const metadataMain = require("./metadataMain");
 const compressionOptionParser = require("./util/compressionOptionParser");
@@ -24,6 +25,11 @@ const { mkdicomwebConfig } = ConfigPoint.register({
         description: "Clean the outputs before generating/starting to write new values.",
         defaultValue: false,
       },
+      {
+        key: "-d, --deployments <listvalue...>",
+        description: "List of deployments from configuration to deploy to. Separated by space.",
+        defaultValue: undefined,
+      },
       {
         key: "-v, --verbose",
         description: "Write verbose output",
@@ -31,10 +37,14 @@ const { mkdicomwebConfig } = ConfigPoint.register({
       },
       {
         key: "-t, --content-type <type>",
-        description: 'Destination type to compress to (choices: "jls", "lei", "jls-lossy" or DICOM Transfer Syntax UID - default: "jls")',
-        defaultValue: "jls",
+        description: 'Destination type to compress to (choices: "jls", "lei", "jls-lossy", "jhc", "jxl" or DICOM Transfer Syntax UID - default: "jls")',
+        defaultValue: "jhc",
         customParser: compressionOptionParser,
       },
+      {
+        key: "-e, --no-encapsulated-image-frame",
+        description: "Avoid encapsulating the image frame.  Writes with the extension and without multipart",
+      },
       {
         key: "-m, --maximum-inline-public-length <value>",
         description: "Maximum length of public binary data",
@@ -48,8 +58,8 @@ const { mkdicomwebConfig } = ConfigPoint.register({
       {
         key: "-r, --recompress <listvalue...>",
         description: "List of types to recompress separated by space",
-        defaultValue: ["uncompressed", "jp2"],
-        choices: ["uncompressed", "jp2", "jpeglossless", "rle", "none"],
+        defaultValue: ["uncompressed", "jp2", "jls", "jll"],
+        choices: ["uncompressed", "jp2", "jpeglossless", "rle", "jph", "jls", "true", "none"],
       },
       {
         key: "--recompress-thumb <listvalue...>",
@@ -114,6 +124,11 @@ const { mkdicomwebConfig } = ConfigPoint.register({
           "deduplicated files each time a study instance UID is found, and only updates those studies\n" +
           "having at least one ",
       },
+      {
+        command: "index",
+        main: indexMain,
+        helpDescription: "Recreate the index for the DICOMweb data.",
+      },
       {
         command: "instance",
         arguments: ["input"],

package/lib/model/TagLists.js

@@ -1,5 +1,5 @@
 const hashFactory = require("node-object-hash");
-const Tags = require("../dictionary/Tags");
+const { Tags } = require("@radicalimaging/static-wado-util");
 
 /* eslint "no-param-reassign": "off" */
 
@@ -9,9 +9,9 @@ const { PatientID, PatientName, IssuerOfPatientID } = Tags;
 const { StudyDescription, AccessionNumber, StudyInstanceUID, StudyDate, StudyTime } = Tags;
 const { SeriesDescription, SeriesNumber, SeriesInstanceUID, SeriesDate, SeriesTime } = Tags;
 
-const { DeduppedHash, DeduppedRef, DeduppedType, } = Tags;
+const { DeduppedHash, DeduppedRef, DeduppedType } = Tags;
 
-const { pushList, getList, setValue, getValue } = Tags;
+const { pushList, setValue, getValue } = Tags;
 
 const PatientQuery = [
   PatientID,
@@ -106,14 +106,14 @@ const ImageExtract = [
 ];
 
 const addHash = (data, type) => {
-  const existing = getValue(data,DeduppedHash);
+  const existing = getValue(data, DeduppedHash);
   if (existing) {
     return existing;
   }
 
   const hashValue = hasher.hash(data);
-  setValue(data, DeduppedHash, hashValue );
-  setValue(data, DeduppedType, type );
+  setValue(data, DeduppedHash, hashValue);
+  setValue(data, DeduppedType, type);
   return hashValue;
 };
 
@@ -141,7 +141,7 @@ const TagSets = {
     });
     const hashValue = addHash(ret, type);
     if (hashRef) {
-      pushList(data,DeduppedRef,hashValue);
+      pushList(data, DeduppedRef, hashValue);
     }
     return ret;
   },

package/lib/model/uids.js

@@ -12,7 +12,7 @@ const jpeg = "image/jpeg";
 const jls = "image/jls";
 const jll = "image/jll";
 const jxl = "image/x-jxl";
-const htj2k = "image/x-htj2k";
+const htj2k = "image/jphc";
 const jp2 = "image/jp2";
 const rle = "image/dicom-rle";
 
@@ -21,20 +21,19 @@ const uids = {
   "1.2.840.10008.1.2.1": uncompressed,
   "1.2.840.10008.1.2.1.99": uncompressed,
   "1.2.840.10008.1.2.2": uncompressed,
-  "1.2.840.10008.1.2.4.50": { contentType: jpeg, lossy: true },
+  "1.2.840.10008.1.2.4.50": { contentType: jpeg, lossy: true, extension: ".jpeg" },
   "1.2.840.10008.1.2.4.51": { contentType: jpeg, lossy: true },
   "1.2.840.10008.1.2.4.57": { contentType: jpeg },
-  "1.2.840.10008.1.2.4.70": { contentType: jll },
-  "1.2.840.10008.1.2.4.140": { contentType: jxl },
+  "1.2.840.10008.1.2.4.70": { contentType: jll, extension: ".jll" },
+  "1.2.840.10008.1.2.4.140": { contentType: jxl, extension: ".jxl" },
+  // Lossy, original JPEG reconstruction mode
   "1.2.840.10008.1.2.4.141": { contentType: jxl, lossy: true },
-  "1.2.840.10008.1.2.4.80": { contentType: jls },
+  "1.2.840.10008.1.2.4.142": { contentType: jxl, lossy: true },
+  "1.2.840.10008.1.2.4.80": { contentType: jls, extension: ".jls" },
   "1.2.840.10008.1.2.4.81": { contentType: jls, lossy: true },
-  "1.2.840.10008.1.2.4.90": { contentType: jp2 },
+  "1.2.840.10008.1.2.4.90": { contentType: jp2, extension: ".jp2" },
   "1.2.840.10008.1.2.4.91": { contentType: jp2 },
-  // From JPEG original data, lossless to JXL
-  "1.2.840.10008.1.2.4.142": { contentType: jxl, lossy: true },
-  "1.2.840.10008.1.2.4.150": { contentType: htj2k },
-  // **
+  "3.2.840.10008.1.2.4.96": { contentType: htj2k, extension: ".jhc" },
   "1.2.840.10008.1.2.5": { contentType: rle },
   default: {},
 };

package/lib/operation/InstanceDeduplicate.js

@@ -1,9 +1,9 @@
 // TODO review returning type of some methods
-const JSONWriter = require("../writer/JSONWriter");
+const { JSONWriter } = require("@radicalimaging/static-wado-util");
+const { Tags } = require("@radicalimaging/static-wado-util");
 const TagLists = require("../model/TagLists");
-const Tags = require("../dictionary/Tags");
 
-const {getValue, setValue} = Tags;
+const { getValue, setValue } = Tags;
 
 const extractors = {
   patient: TagLists.PatientQuery,
@@ -21,26 +21,26 @@ const extractors = {
 async function deduplicateSingleInstance(id, imageFrame) {
   if (!imageFrame) return {};
   const studyData = await this.completeStudy.getCurrentStudyData(this, id);
-  const seriesUID = getValue(imageFrame,Tags.SeriesInstanceUID);
-  const sopUID = getValue(imageFrame,Tags.SOPInstanceUID);
+  const seriesUID = getValue(imageFrame, Tags.SeriesInstanceUID);
+  const sopUID = getValue(imageFrame, Tags.SOPInstanceUID);
   if (!sopUID) {
     console.warn("No sop instance UID in", imageFrame);
     return {};
   }
   if (studyData.sopExists(sopUID)) {
-    if( this.verbose ) console.log('SOP Instance UID', sopUID, 'already exists, skipping');
+    if (this.verbose) console.log("SOP Instance UID", sopUID, "already exists, skipping");
     // TODO - allow replace as an option
     // Null value means skip writing this instance
     return null;
   }
 
-  if( this.verbose ) console.log('SOP Instance UID', sopUID, 'being added');
+  if (this.verbose) console.log("SOP Instance UID", sopUID, "being added");
   const deduplicated = { ...imageFrame };
 
   if (!this.extractors) this.extractors = extractors;
   for (const key of Object.keys(this.extractors)) {
     const extracted = TagLists.extract(deduplicated, key, this.extractors[key], TagLists.RemoveExtract);
-    const hashKey = getValue(extracted,Tags.DeduppedHash);
+    const hashKey = getValue(extracted, Tags.DeduppedHash);
     await studyData.addExtracted(this, hashKey, extracted);
   }
 

package/lib/operation/StudyData.js

@@ -1,16 +1,14 @@
 const path = require("path");
 const fs = require("fs");
 const hashFactory = require("node-object-hash");
-const { JSONReader } = require("@radicalimaging/static-wado-util");
-const Tags = require("../dictionary/Tags");
+const { JSONReader, JSONWriter } = require("@radicalimaging/static-wado-util");
+const { Tags } = require("@radicalimaging/static-wado-util");
 const TagLists = require("../model/TagLists");
-const JSONWriter = require("../writer/JSONWriter");
 
-const {getValue, setValue, getList, setList} = Tags;
+const { getValue, setValue, getList, setList } = Tags;
 const hasher = hashFactory();
 
-const getSeriesInstanceUid = (seriesInstance) =>
-  getValue(seriesInstance,Tags.SeriesInstanceUID);
+const getSeriesInstanceUid = (seriesInstance) => getValue(seriesInstance, Tags.SeriesInstanceUID);
 
 /**
  * StudyData contains information about the grouped study data.  It is used to create
@@ -88,10 +86,10 @@ class StudyData {
         return true;
       }
       const info = deduplicatedTopFile[0];
-      if (!info || getValue(info,Tags.DeduppedHash) || getValue(info,Tags.DeduppedType) != "info") {
+      if (!info || getValue(info, Tags.DeduppedHash) || getValue(info, Tags.DeduppedType) != "info") {
         return true;
       }
-      const hashValue = getValue(info,Tags.DeduppedHash);
+      const hashValue = getValue(info, Tags.DeduppedHash);
       return this.existingFiles[0].indexOf(hashValue) == -1;
     } catch (e) {
       console.log("Assume study metadata is dirty", e);
@@ -105,12 +103,12 @@ class StudyData {
     this.newInstancesAdded += 1;
     for (let i = 0; i < this.deduplicated.length; i++) {
       const recombined = await this.recombine(i);
-      const reSeriesUid = getValue(recombined,Tags.SeriesInstanceUID);
+      const reSeriesUid = getValue(recombined, Tags.SeriesInstanceUID);
       if (reSeriesUid !== seriesInstanceUid) continue;
-      const reSop = getValue(recombined,Tags.SOPInstanceUID);
+      const reSop = getValue(recombined, Tags.SOPInstanceUID);
       if (!reSop) continue;
       if (reSop !== sopInstanceUid) continue;
-      setValue(this.deduplicated[i], Tags.DeduppedType,"deleted");
+      setValue(this.deduplicated[i], Tags.DeduppedType, "deleted");
     }
   }
 
@@ -150,7 +148,7 @@ class StudyData {
     if (index < 0 || index >= this.deduplicated.length) {
       throw new Error(`Can't read index ${index}, out of bounds [0..${this.deduplicated.length})`);
     }
-    const refs = getList(deduplicated,Tags.DeduppedRef);
+    const refs = getList(deduplicated, Tags.DeduppedRef);
     if (!refs) {
       console.log("No refs for", deduplicated);
       return deduplicated;
@@ -165,7 +163,7 @@ class StudyData {
 
   async addExtracted(callback, hashKey, item) {
     if (this.extractData[hashKey]) {
-      if( this.verbose ) console.log("Already have extracted", hashKey, getValue(item,Tags.DeduppedType));
+      if (this.verbose) console.log("Already have extracted", hashKey, getValue(item, Tags.DeduppedType));
       return;
     }
     await callback.bulkdata(this, hashKey, item);
@@ -192,7 +190,7 @@ class StudyData {
       // console.log('Not adding', hashValue, 'because the hash exists');
       return false;
     }
-    const sopValue = getValue(data,Tags.SOPInstanceUID);
+    const sopValue = getValue(data, Tags.SOPInstanceUID);
     const sopIndex = this.sopInstances[sopValue];
     if (!sopValue) {
       console.warn("No sop value in", filename, "reading", data);
@@ -275,14 +273,14 @@ class StudyData {
         if (type == Tags.InstanceType) {
           this.internalAddDeduplicated(item, name);
         } else if (type == "info") {
-          const refs = getList(item,Tags.DeduppedRef);
+          const refs = getList(item, Tags.DeduppedRef);
           if (refs) {
             refs.forEach((hashValue) => {
               this.readHashes[hashValue] = `${hashValue}.gz`;
             });
           }
         } else {
-          const hashValue = getValue(item,Tags.DeduppedHash);
+          const hashValue = getValue(item, Tags.DeduppedHash);
           if (hashValue) {
             this.extractData[hashValue] = item;
           }
@@ -299,7 +297,7 @@ class StudyData {
 
     for (let i = 0; i < this.numberOfInstances; i++) {
       const seriesInstance = await this.recombine(i);
-      const type = getValue(seriesInstance,Tags.DeduppedType);
+      const type = getValue(seriesInstance, Tags.DeduppedType);
       if (type == "deleted") {
         console.log("Skipping", type);
         continue;
@@ -337,7 +335,7 @@ class StudyData {
       numberOfInstances += instances.length;
       numberOfSeries += 1;
       seriesList.push(seriesQuery);
-      const modality = getValue(seriesQuery,Tags.Modality);
+      const modality = getValue(seriesQuery, Tags.Modality);
       if (modalitiesInStudy.indexOf(modality) == -1) modalitiesInStudy.push(modality);
       await JSONWriter(seriesPath, "metadata", instances, {
         gzip: true,
@@ -379,8 +377,8 @@ class StudyData {
   createInfo() {
     const data = {};
     const hashValue = hasher.hash(this.deduplicated);
-    setValue(data,Tags.DeduppedHash,hashValue);
-    setValue(data,Tags.DeduppedType,"info");
+    setValue(data, Tags.DeduppedHash, hashValue);
+    setValue(data, Tags.DeduppedType, "info");
     return data;
   }
 
@@ -393,7 +391,7 @@ class StudyData {
   /** Writes the deduplicated group */
   async writeDeduplicatedGroup() {
     const data = this.createInfo();
-    const hashValue = getValue(data,Tags.DeduppedHash);
+    const hashValue = getValue(data, Tags.DeduppedHash);
     console.log(
       "Writing deduplicated hash data set data with",
       Object.values(this.extractData).length,
@@ -401,8 +399,11 @@ class StudyData {
       this.deduplicated.length,
       "instance items"
     );
-    setList(data,Tags.DeduppedRef,
-      Object.keys(this.readHashes).filter(() => this.deduplicatedHashes[hashValue] == undefined));
+    setList(
+      data,
+      Tags.DeduppedRef,
+      Object.keys(this.readHashes).filter(() => this.deduplicatedHashes[hashValue] == undefined)
+    );
     const deduplicatedList = [data, ...Object.values(this.extractData), ...this.deduplicated];
     // const naturalList = deduplicatedList.map(Tags.naturalizeDataset);
     // // console.log("naturalList=", JSON.stringify(naturalList,null,2));

package/lib/operation/ThumbnailService.js

@@ -4,10 +4,10 @@ const dicomCodec = require("@cornerstonejs/dicom-codec");
 const staticCS = require("@radicalimaging/static-cs-lite");
 const fs = require("fs");
 const { exec } = require("child_process");
+const { Tags } = require("@radicalimaging/static-wado-util");
 const decodeImage = require("./adapter/decodeImage");
 const { shouldThumbUseTranscoded } = require("./adapter/transcodeImage");
 const { isVideo } = require("../writer/VideoWriter");
-const Tags = require("../dictionary/Tags");
 
 /**
  * Return the middle index of given list