@datagrok/eda 1.1.35 → 1.2.0

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@datagrok/eda",
   "friendlyName": "EDA",
-  "version": "1.1.35",
+  "version": "1.2.0",
   "description": "Exploratory Data Analysis Tools",
   "dependencies": {
-    "@datagrok-libraries/math": "^1.1.11",
-    "@datagrok-libraries/ml": "^6.6.23",
-    "@datagrok-libraries/tutorials": "^1.3.13",
-    "@datagrok-libraries/utils": "^4.2.29",
+    "@datagrok-libraries/math": "^1.2.0",
+    "@datagrok-libraries/ml": "^6.7.0",
+    "@datagrok-libraries/tutorials": "^1.4.0",
+    "@datagrok-libraries/utils": "^4.3.0",
     "@keckelt/tsne": "^1.0.2",
     "@webgpu/types": "^0.1.40",
     "cash-dom": "^8.1.1",
-    "datagrok-api": "^1.20.1",
+    "datagrok-api": "^1.21.1",
     "dayjs": "^1.11.9",
     "jstat": "^1.9.6",
     "source-map-loader": "^4.0.1",

package/src/missing-values-imputation/ui.ts

@@ -85,23 +85,22 @@ export async function runKNNImputer(df?: DG.DataFrame): Promise<void> {
   // In-place components
   let inPlace = DEFAULT.IN_PLACE > 0;
   const inPlaceInput = ui.input.bool(TITLE.IN_PLACE, {value: inPlace,
-    onValueChanged: () => {inPlace = inPlaceInput.value ?? false;}});
+    onValueChanged: (value) => {inPlace = value ?? false;}});
   inPlaceInput.setTooltip(HINT.IN_PLACE);
 
   // Keep empty feature
   let keepEmpty = DEFAULT.KEEP_EMPTY > 0;
   const keepEmptyInput = ui.input.bool(TITLE.KEEP_EMPTY, {value: keepEmpty,
-    onValueChanged: () => {keepEmpty = keepEmptyInput.value ?? false;}});
+    onValueChanged: (value) => {keepEmpty = value ?? false;}});
   keepEmptyInput.setTooltip(HINT.KEEP_EMPTY);
 
   // Neighbors components
   let neighbors = DEFAULT.NEIGHBORS;
-  const neighborsInput = ui.input.int(TITLE.NEIGHBORS, {value: neighbors, onValueChanged: () => {
-    const val = neighborsInput.value;
-    if (val === null)
+  const neighborsInput = ui.input.int(TITLE.NEIGHBORS, {value: neighbors, onValueChanged: (value) => {
+    if (value === null)
       neighborsInput.value = neighbors;
-    else if (val >= MIN_NEIGHBORS)
-      neighbors = val;
+    else if (value >= MIN_NEIGHBORS)
+      neighbors = value;
     else
       neighborsInput.value = neighbors;
   }});
@@ -112,21 +111,21 @@ export async function runKNNImputer(df?: DG.DataFrame): Promise<void> {
   const distTypeInput: DG.ChoiceInput<DISTANCE_TYPE> = ui.input.choice(TITLE.DISTANCE, {
     value: distType,
     items: [DISTANCE_TYPE.EUCLIDEAN, DISTANCE_TYPE.MANHATTAN],
-    onValueChanged: () => distType = distTypeInput.value ?? DISTANCE_TYPE.EUCLIDEAN}) as DG.ChoiceInput<DISTANCE_TYPE>;
+    onValueChanged: (value) => distType = value ?? DISTANCE_TYPE.EUCLIDEAN}) as DG.ChoiceInput<DISTANCE_TYPE>;
   distTypeInput.setTooltip(HINT.DISTANCE);
 
   // Target columns components (cols with missing values to be imputed)
   let targetColNames = colsWithMissingVals.map((col) => col.name);
-  const targetColInput = ui.input.columns(TITLE.COLUMNS, {table: df, value: df.columns.byNames(availableTargetColsNames), onValueChanged: () => {
-    targetColNames = targetColInput.value.map((col) => col.name);
+  const targetColInput = ui.input.columns(TITLE.COLUMNS, {table: df, value: df.columns.byNames(availableTargetColsNames), onValueChanged: (value) => {
+    targetColNames = value.map((col) => col.name);
     checkApplicability();
   }, available: availableTargetColsNames});
   targetColInput.setTooltip(HINT.TARGET);
 
   // Feature columns components
   let selectedFeatureColNames = availableFeatureColsNames as string[];
-  const featuresInput = ui.input.columns(TITLE.FEATURES, {value: df.columns.byNames(availableFeatureColsNames), table: df, onValueChanged: () => {
-    selectedFeatureColNames = featuresInput.value.map((col) => col.name);
+  const featuresInput = ui.input.columns(TITLE.FEATURES, {value: df.columns.byNames(availableFeatureColsNames), table: df, onValueChanged: (value) => {
+    selectedFeatureColNames = value.map((col) => col.name);
 
     if (selectedFeatureColNames.length > 0) {
       checkApplicability();
@@ -185,9 +184,9 @@ export async function runKNNImputer(df?: DG.DataFrame): Promise<void> {
 
     // distance input
     const distTypeInput = ui.input.choice(name, {value: settings.defaultMetric,
-      items: settings.availableMetrics, onValueChanged: () => {
+      items: settings.availableMetrics, onValueChanged: (value) => {
         const distInfo = featuresMetrics.get(name) ?? {weight: settings.defaultWeight, type: settings.defaultMetric};
-        distInfo.type = distTypeInput.value ?? settings.defaultMetric;
+        distInfo.type = value ?? settings.defaultMetric;
         featuresMetrics.set(name, distInfo);
       }});
     distTypeInput.root.style.width = '50%';
@@ -206,9 +205,9 @@ export async function runKNNImputer(df?: DG.DataFrame): Promise<void> {
     });
     const weightInput = ui.input.forProperty(prop);
     weightInput.value = settings.defaultWeight;
-    weightInput.onChanged(() => {
+    weightInput.onChanged.subscribe((value) => {
       const distInfo = featuresMetrics.get(name) ?? {weight: settings.defaultWeight, type: settings.defaultMetric};
-      distInfo.weight = weightInput.value ?? settings.defaultWeight;
+      distInfo.weight = value ?? settings.defaultWeight;
       featuresMetrics.set(name, distInfo);
     });
     weightInput.setTooltip(HINT.WEIGHT);
@@ -264,7 +263,7 @@ export async function runKNNImputer(df?: DG.DataFrame): Promise<void> {
           grok.shell.error(`${ERROR_MSG.KNN_FAILS}: ${ERROR_MSG.CORE_ISSUE}`);
         reject(err);
       }
-    }).onClose.subscribe(() => !okClicked && reject());
+    }).onClose.subscribe(() => !okClicked && resolve());
 
   return promise;
 } // runKNNImputer

package/src/pls/pls-tools.ts

@@ -317,8 +317,8 @@ export async function runMVA(analysisType: PLS_ANALYSIS): Promise<void> {
 
   // responce (to predict)
   let predict = numCols[numCols.length - 1];
-  const predictInput = ui.input.column(TITLE.PREDICT, {table: table, value: predict, onValueChanged: () => {
-    predict = predictInput.value!;
+  const predictInput = ui.input.column(TITLE.PREDICT, {table: table, value: predict, onValueChanged: (value) => {
+    predict = value;
     updateIputs();
   }, filter: (col: DG.Column) => isValidNumeric(col)},
   );
@@ -327,7 +327,7 @@ export async function runMVA(analysisType: PLS_ANALYSIS): Promise<void> {
   // predictors (features)
   let features: DG.Column[];
   const featuresInput = ui.input.columns(TITLE.USING, {table: table, available: numColNames});
-  featuresInput.onInput(() => updateIputs());
+  featuresInput.onInput.subscribe(() => updateIputs());
   featuresInput.setTooltip(HINT.FEATURES);
 
   // components count
@@ -340,7 +340,7 @@ export async function runMVA(analysisType: PLS_ANALYSIS): Promise<void> {
     showPlusMinus: true,
     min: COMPONENTS.MIN,
   }));
-  componentsInput.onInput(() => updateIputs());
+  componentsInput.onInput.subscribe(() => updateIputs());
   componentsInput.setTooltip(HINT.COMPONENTS);
 
   let dlgTitle: string;