@datagrok/bio 2.20.0 → 2.20.1

package/package.json

@@ -5,7 +5,7 @@
     "name": "Leonid Stolbov",
     "email": "lstolbov@datagrok.ai"
   },
-  "version": "2.20.0",
+  "version": "2.20.1",
   "description": "Bioinformatics support (import/export of sequences, conversion, visualization, analysis). [See more](https://github.com/datagrok-ai/public/blob/master/packages/Bio/README.md) for details.",
   "repository": {
     "type": "git",

package/src/analysis/sequence-search-base-viewer.ts

@@ -13,7 +13,7 @@ export class SequenceSearchBaseViewer extends SearchBaseViewer {
   fingerprint: string;
   metricsProperties = ['distanceMetric', 'fingerprint'];
   fingerprintChoices = ['Morgan', 'Pattern'];
-  tags = [DG.TAGS.UNITS, bioTAGS.aligned, bioTAGS.separator, bioTAGS.alphabet];
+  tags = [DG.TAGS.UNITS, bioTAGS.aligned, bioTAGS.separator, bioTAGS.alphabet, 'cell.renderer'];
   preComputeDistanceMatrix: boolean = false;
 
   constructor(name: string, semType: string) {

package/src/analysis/sequence-similarity-viewer.ts

@@ -3,7 +3,6 @@ import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
 import {SequenceSearchBaseViewer} from './sequence-search-base-viewer';
-import {getMonomericMols} from '../calculations/monomerLevelMols';
 import {createDifferenceCanvas, createDifferencesWithPositions} from './sequence-activity-cliffs';
 import {adjustGridcolAfterRender, updateDivInnerHTML} from '../utils/ui-utils';
 import {Subject} from 'rxjs';
@@ -57,8 +56,7 @@ export class SequenceSimilarityViewer extends SequenceSearchBaseViewer {
     if (this.targetColumn) {
       this.curIdx = this.dataFrame!.currentRowIdx == -1 ? 0 : this.dataFrame!.currentRowIdx;
       if (computeData && !this.gridSelect) {
-        this.targetMoleculeIdx = this.dataFrame!.currentRowIdx == -1 ? 0 : this.dataFrame!.currentRowIdx;
-        const sh = this.seqHelper.getSeqHandler(this.targetColumn!);
+        this.targetMoleculeIdx = (this.dataFrame!.currentRowIdx ?? -1) < 0 ? 0 : this.dataFrame!.currentRowIdx;
 
         await this.computeByMM();
         const similarColumnName: string = this.similarColumnLabel != null ? this.similarColumnLabel :
@@ -103,23 +101,6 @@ export class SequenceSimilarityViewer extends SequenceSearchBaseViewer {
     }
   }
 
-  private async computeByChem() {
-    const monomericMols = await getMonomericMols(this.targetColumn!, this.seqHelper);
-    //need to create df to calculate fingerprints
-    const _monomericMolsDf = DG.DataFrame.fromColumns([monomericMols]);
-    const df = await grok.functions.call('Chem:callChemSimilaritySearch', {
-      df: this.dataFrame,
-      col: monomericMols,
-      molecule: monomericMols.get(this.targetMoleculeIdx),
-      metricName: this.distanceMetric,
-      limit: this.limit,
-      minScore: this.cutoff,
-      fingerprint: this.fingerprint,
-    });
-    this.idxs = df.getCol('indexes');
-    this.scores = df.getCol('score');
-  }
-
   private async computeByMM() {
     const len = this.targetColumn!.length;
     const actualLimit = Math.min(this.limit, len - 1);

package/src/demo/bio01b-hierarchical-clustering-and-activity-cliffs.ts

@@ -107,3 +107,40 @@ export async function demoBio01bUI() {
     handleError(err);
   }
 }
+
+export async function demoActivityCliffsCyclic() {
+  const df = await _package.files.readCsv('tests/helm_cyclic_cliffs.csv');
+  df.name = 'Activity Cliffs Demo';
+  await grok.data.detectSemanticTypes(df);
+  await df.meta.detectSemanticTypes();
+  const tv = grok.shell.addTableView(df);
+  ui.setUpdateIndicator(tv.root, true);
+  try {
+    const seqEncodingFunc = DG.Func.find({name: 'macromoleculePreprocessingFunction', package: 'Bio'})[0];
+    const activityCliffsViewer = (await activityCliffs(
+      df, df.getCol('Sequence'), df.getCol('Activity'),
+      96, DimReductionMethods.UMAP, MmDistanceFunctionsNames.MONOMER_CHEMICAL_DISTANCE,
+      seqEncodingFunc, {}, true)) as DG.ScatterPlotViewer;
+    tv.dockManager.dock(activityCliffsViewer, DG.DOCK_TYPE.RIGHT, null, 'Activity Cliffs', 0.65);
+    await DG.delay(100);
+    const cliffsLink: HTMLButtonElement = $(activityCliffsViewer.root)
+      .find('button.scatter_plot_link,cliffs_grid').get()[0] as HTMLButtonElement;
+    cliffsLink.click();
+    await DG.delay(100);
+    tv.grid.props.rowHeight = 180;
+    tv.grid.col('sequence') && (tv.grid.col('sequence')!.width = 300);
+    tv.grid.col('structure') && (tv.grid.col('structure')!.width = 300);
+    const cliffsGrid = Array.from(tv.viewers).find((v) => v !== tv.grid && v.type === DG.VIEWER.GRID) as DG.Grid;
+    if (cliffsGrid) {
+      cliffsGrid.props.rowHeight = 40;
+      cliffsGrid.col('seq_diff')!.width = 600;
+      tv.dockManager.dock(cliffsGrid, DG.DOCK_TYPE.DOWN, null, 'Cliffs', 0.35);
+      tv.dockManager.dock(activityCliffsViewer, DG.DOCK_TYPE.RIGHT, null, 'Activity Cliffs', 0.55);
+    }
+  } catch (err: any) {
+    handleError(err);
+  } finally {
+    ui.setUpdateIndicator(tv.root, false);
+  }
+  grok.shell.windows.help.showHelp('/help/datagrok/solutions/domains/bio/bio.md#activity-cliffs');
+}

package/src/package.ts

@@ -49,7 +49,7 @@ import {MonomerLibManager} from './utils/monomer-lib/lib-manager';
 import {getMonomerLibraryManagerLink, showManageLibrariesDialog, showManageLibrariesView} from './utils/monomer-lib/library-file-manager/ui';
 import {demoBioSimDiv} from './demo/bio01-similarity-diversity';
 import {demoSeqSpace} from './demo/bio01a-hierarchical-clustering-and-sequence-space';
-import {demoBio01bUI} from './demo/bio01b-hierarchical-clustering-and-activity-cliffs';
+import {demoActivityCliffsCyclic} from './demo/bio01b-hierarchical-clustering-and-activity-cliffs';
 import {demoToAtomicLevel} from './demo/bio03-atomic-level';
 import {checkInputColumnUI} from './utils/check-input-column';
 import {MsaWarning} from './utils/multiple-sequence-alignment';
@@ -1115,10 +1115,9 @@ export async function demoBioSequenceSpace(): Promise<void> {
 //meta.demoPath: Bioinformatics | Activity Cliffs
 //description: Activity Cliffs analysis on Macromolecules data
 //meta.path: /apps/Tutorials/Demo/Bioinformatics/Activity%20Cliffs
-//meta.isDemoScript: True
 //meta.demoSkip: GROK-14320
 export async function demoBioActivityCliffs(): Promise<void> {
-  await demoBio01bUI();
+  await demoActivityCliffsCyclic();
 }
 
 // demoBio03