histomicsui 1.6.1.dev18__tar.gz → 1.6.1.dev22__tar.gz

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev18
+Version: 1.6.1.dev22
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -20,7 +20,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.29.4
+Requires-Dist: girder-large-image-annotation>=1.29.10
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/histomicsui/__init__.py

@@ -465,7 +465,7 @@ class GirderPlugin(plugin.GirderPlugin):
         # Auto-ingest annotations into database when a file with an identifier
         # ending in 'AnnotationFile' is uploaded (usually .anot files).
         events.bind('data.process', 'histomicsui.annotations', handlers.process_annotations)
-        # Auto-ingest metadta into parent when a file with an identifier
+        # Auto-ingest metadata into parent when a file with an identifier
         # ending in 'ItemMetadata' is uploaded (usually .meta files).
         events.bind('data.process', 'histomicsui.metadata', handlers.process_metadata)
 

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/histomicsui/web_client/package.json

@@ -42,6 +42,7 @@
         "sinon": "^2.1.0",
         "tinycolor2": "~1.4.1",
         "url-search-params-polyfill": "^8.1.1",
+        "uuid": "^8.3.2",
         "vue": "~2.6.14",
         "vue-color": "^2.8.1",
         "vue-loader": "~15.9.8",

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/histomicsui/web_client/panels/MetadataPlot.js

@@ -2,6 +2,7 @@
 
 import $ from 'jquery';
 import _ from 'underscore';
+import {v4 as uuidv4} from 'uuid';
 
 import {restRequest} from '@girder/core/rest';
 
@@ -12,6 +13,8 @@ import MetadataPlotDialog from '../dialogs/metadataPlot';
 import metadataPlotTemplate from '../templates/panels/metadataPlot.pug';
 import '../stylesheets/panels/metadataPlot.styl';
 
+const sessionId = uuidv4();
+
 var MetadataPlot = Panel.extend({
     events: _.extend(Panel.prototype.events, {
         'click .g-widget-metadata-plot-settings': function (event) {
@@ -94,7 +97,8 @@ var MetadataPlot = Panel.extend({
             method: 'POST',
             error: null,
             data: {
-                annotations: JSON.stringify(this._currentAnnotations)
+                annotations: JSON.stringify(this._currentAnnotations),
+                uuid: sessionId
             }
         }).done((result) => {
             this.plottableList = result;
@@ -182,25 +186,26 @@ var MetadataPlot = Panel.extend({
                 requiredKeys = requiredKeys.concat(this.plotConfig.u);
             }
         }
-        const fetch = {
+        const params = {
             adjacentItems: !!this.plotConfig.folder,
             keys: keys.join(','),
             requiredKeys: requiredKeys.join(','),
-            annotations: JSON.stringify(this._currentAnnotations)
+            annotations: JSON.stringify(this._currentAnnotations),
+            uuid: sessionId
         };
         if (this.plotConfig.u && this.plotConfig.u.length >= 3 && anyCompute) {
-            fetch.compute = JSON.stringify({columns: this.plotConfig.u});
+            params.compute = JSON.stringify({columns: this.plotConfig.u});
         }
-        if (!_.isEqual(this._lastPlottableDataFetch, fetch)) {
+        if (!_.isEqual(this._lastPlottableDataParams, params)) {
             this.$el.addClass('loading');
             this.plottableDataPromise = restRequest({
                 url: `annotation/item/${this.item.id}/plot/data`,
                 method: 'POST',
                 error: null,
-                data: fetch
+                data: params
             });
         }
-        this._lastPlottableDataFetch = fetch;
+        this._lastPlottableDataParams = params;
         this.plottableDataPromise.done((result) => {
             this.plottableData = result;
             this.plottableDataPromise = null;

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev18
+Version: 1.6.1.dev22
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -20,7 +20,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.29.4
+Requires-Dist: girder-large-image-annotation>=1.29.10
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/histomicsui.egg-info/requires.txt

@@ -1,4 +1,4 @@
-girder-large-image-annotation>=1.29.4
+girder-large-image-annotation>=1.29.10
 girder-slicer-cli-web[girder]>=1.4.0
 cachetools
 orjson

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/ruff.toml

@@ -4,7 +4,7 @@ exclude = [
     "*/web_client/*",
     "*/*egg*/*",
 ]
-ignore = [
+lint.ignore = [
     "B017",
     "B026",
     "B904",
@@ -33,7 +33,7 @@ ignore = [
     "PT017",
 ]
 line-length = 100
-select = [
+lint.select = [
     "B",  # bugbear
     "C90",  # mccabe
     "D",  # pydocstyle
@@ -56,8 +56,8 @@ select = [
     "RSE",
 ]
 
-[flake8-quotes]
+[lint.flake8-quotes]
 inline-quotes = "single"
 
-[mccabe]
+[lint.mccabe]
 max-complexity = 14

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/setup.py

@@ -42,7 +42,7 @@ setup(
         'Programming Language :: Python :: 3.12',
     ],
     install_requires=[
-        'girder-large-image-annotation>=1.29.4',
+        'girder-large-image-annotation>=1.29.10',
         'girder-slicer-cli-web[girder]>=1.4.0',
         'cachetools',
         'orjson',

{histomicsui-1.6.1.dev18 → histomicsui-1.6.1.dev22}/tox.ini

@@ -18,7 +18,6 @@ deps =
   setuptools_scm
   urllib3<1.26
   -rrequirements-dev.txt
-  girder-large-image-annotation!=1.29.8,!=1.29.9
 extras =
   analysis
 allowlist_externals =