@datagrok/bio 2.0.24 → 2.0.26

package/files/tests/toAtomicLevelTest.csv

@@ -0,0 +1,7 @@
+seq
+A
+G
+C
+U
+AG
+CU

package/package.json

@@ -5,7 +5,7 @@
     "name": "Leonid Stolbov",
     "email": "lstolbov@datagrok.ai"
   },
-  "version": "2.0.24",
+  "version": "2.0.26",
   "description": "Bio is a [package](https://datagrok.ai/help/develop/develop#packages) for the [Datagrok](https://datagrok.ai) platform",
   "repository": {
     "type": "git",
@@ -14,15 +14,10 @@
   },
   "dependencies": {
     "@biowasm/aioli": "^3.1.0",
-    "@datagrok-libraries/bio": "^5.2.0",
+    "@datagrok-libraries/bio": "^5.4.1",
     "@datagrok-libraries/chem-meta": "1.0.1",
     "@datagrok-libraries/ml": "^6.2.0",
-    "@datagrok-libraries/utils": "^1.11.0",
-    "@deck.gl/core": "^8.7.5",
-    "@deck.gl/layers": "^8.7.5",
-    "@luma.gl/constants": "^8.5.10",
-    "@luma.gl/core": "^8.5.10",
-    "@phylocanvas/phylocanvas.gl": "^1.44.0",
+    "@datagrok-libraries/utils": "^1.11.1",
     "cash-dom": "^8.0.0",
     "datagrok-api": "^1.7.0",
     "dayjs": "^1.11.4",
@@ -51,6 +46,9 @@
     "webpack": "^5.64.1",
     "webpack-cli": "^4.6.0"
   },
+  "grokDependencies": {
+    "@datagrok/chem": "1.3.16"
+  },
   "scripts": {
     "link-api": "npm link datagrok-api",
     "link-bio": "npm link @datagrok-libraries/bio",

package/setup.sh

@@ -31,7 +31,7 @@ for dir in ${dirs[@]}; do
     npm run link-all
   fi
   echo -e $GREEN npm run build in$(pwd) $NO_COLOR
-  npm run build
+  npm run build || exit
 done
 
 cd $package_dir

package/src/calculations/monomerLevelMols.ts

@@ -8,17 +8,20 @@ import {getHelmMonomers} from '../package';
 
 const V2000_ATOM_NAME_POS = 31;
 
-export async function getMonomericMols(mcol: DG.Column, pattern: boolean = false): Promise<DG.Column> {
+export async function getMonomericMols(mcol: DG.Column,
+  pattern: boolean = false, monomersDict?: Map<string, string>): Promise<DG.Column> {
   const separator: string = mcol.tags[C.TAGS.SEPARATOR];
   const units: string = mcol.tags[DG.TAGS.UNITS];
   const splitter = bio.getSplitter(units, separator);
   let molV3000Array;
-  const monomersDict = new Map();
+  monomersDict ??= new Map();
   const monomers = units === 'helm' ?
     getHelmMonomers(mcol) : Object.keys(bio.getStats(mcol, 0, splitter).freq).filter((it) => it !== '');
 
-  for (let i = 0; i < monomers.length; i++)
-    monomersDict.set(monomers[i], `${i + 1}`);
+  for (let i = 0; i < monomers.length; i++) {
+    if (!monomersDict.has(monomers[i]))
+      monomersDict.set(monomers[i], `${monomersDict.size + 1}`);
+  }
 
   if (units === 'helm') {
     molV3000Array = await grok.functions.call('HELM:getMolFiles', {col: mcol});

package/src/package-test.ts

@@ -1,8 +1,7 @@
 import * as DG from 'datagrok-api/dg';
 
-import {runTests, tests} from '@datagrok-libraries/utils/src/test';
+import {runTests, TestContext, tests} from '@datagrok-libraries/utils/src/test';
 
-import './tests/WebLogo-test';
 import './tests/Palettes-test';
 import './tests/detectors-test';
 import './tests/msa-tests';
@@ -13,6 +12,7 @@ import './tests/renderers-test';
 import './tests/convert-test';
 import './tests/fasta-handler-test';
 import './tests/fasta-export-tests';
+import './tests/bio-tests';
 import './tests/WebLogo-positions-test';
 import './tests/checkInputColumn-tests';
 import './tests/similarity-diversity-tests';
@@ -24,9 +24,9 @@ export {tests};
 //name: test
 //input: string category {optional: true}
 //input: string test {optional: true}
-//input: bool catchUnhandled {optional: true}
+//input: object testContext {optional: true}
 //output: dataframe result
-export async function test(category: string, test: string, catchUnhandled: boolean): Promise<DG.DataFrame> {
-  const data = await runTests({category, test, catchUnhandled});
+export async function test(category: string, test: string, testContext: TestContext): Promise<DG.DataFrame> {
+  const data = await runTests({category, test, testContext});
   return DG.DataFrame.fromObjects(data)!;
 }

package/src/package.ts

@@ -13,11 +13,17 @@ import {SequenceAlignment, Aligned} from './seq_align';
 import {getEmbeddingColsNames, sequenceSpace} from './analysis/sequence-space';
 import {getActivityCliffs} from '@datagrok-libraries/ml/src/viewers/activity-cliffs';
 import {createPropPanelElement, createTooltipElement, getSimilaritiesMarix} from './analysis/sequence-activity-cliffs';
-import {createJsonMonomerLibFromSdf, encodeMonomers, getMolfilesFromSeq, HELM_CORE_LIB_FILENAME} from './utils/utils';
+import {createJsonMonomerLibFromSdf, encodeMonomers, getMolfilesFromSeq} from '@datagrok-libraries/bio/src/utils/monomer-utils';
+import {HELM_CORE_LIB_FILENAME} from '@datagrok-libraries/bio/src/utils/const';
 import {getMacroMol} from './utils/atomic-works';
 import {MacromoleculeSequenceCellRenderer} from './utils/cell-renderer';
 import {convert} from './utils/convert';
 import {getMacroMolColumnPropertyPanel, representationsWidget} from './widgets/representations';
+import {UnitsHandler, ALIGNMENT} from '@datagrok-libraries/bio/src/utils/units-handler';
+import {TAGS} from '@datagrok-libraries/bio/src/utils/macromolecule';
+import {ALPHABET, NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule'
+import {_toAtomicLevel} from '@datagrok-libraries/bio/src/utils/to-atomic-level';
+import {FastaFileHandler} from '@datagrok-libraries/bio/src/utils/fasta-handler';
 import {removeEmptyStringRows} from '@datagrok-libraries/utils/src/dataframe-utils';
 import {
   generateManySequences,
@@ -99,7 +105,7 @@ export function checkInputColumn(
     ) {
       const notationAdd = allowedNotations.length == 0 ? 'any notation' :
         (`notation${allowedNotations.length > 1 ? 's' : ''} ${allowedNotations.map((n) => `"${n}"`).join(', ')} `);
-      msg = `${name} analysis is allowed for Macromolecules with ${notationAdd}.`;
+      msg = `${name} + ' analysis is allowed for Macromolecules with notation ${notationAdd}.`;
       res = false;
     } else if (!uh.isHelm()) {
       // alphabet is not specified for 'helm' notation
@@ -169,10 +175,10 @@ export async function activityCliffs(df: DG.DataFrame, macroMolecule: DG.Column,
     'SPE': {cycles: 2000, lambda: 1.0, dlambda: 0.0005},
   };
   const tags = {
-    'units': macroMolecule.tags['units'],
-    'aligned': macroMolecule.tags['aligned'],
-    'separator': macroMolecule.tags['separator'],
-    'alphabet': macroMolecule.tags['alphabet'],
+    'units': macroMolecule.getTag(DG.TAGS.UNITS),
+    'aligned': macroMolecule.getTag(TAGS.aligned),
+    'separator': macroMolecule.getTag(TAGS.separator),
+    'alphabet': macroMolecule.getTag(TAGS.alphabet),
   };
   const sp = await getActivityCliffs(
     df,
@@ -247,20 +253,11 @@ export async function toAtomicLevel(df: DG.DataFrame, macroMolecule: DG.Column):
   }
   if (!checkInputColumnUi(macroMolecule, 'To Atomic Level'))
     return;
-
   const monomersLibFile = await _package.files.readAsText(HELM_CORE_LIB_FILENAME);
   const monomersLibObject: any[] = JSON.parse(monomersLibFile);
-  const atomicCodes = getMolfilesFromSeq(macroMolecule, monomersLibObject);
-  const result = await getMacroMol(atomicCodes!);
-
-  const col = DG.Column.fromStrings('regenerated', result);
-  col.semType = DG.SEMTYPE.MOLECULE;
-  col.tags[DG.TAGS.UNITS] = 'molblock';
-  df.columns.add(col, true);
-  await grok.data.detectSemanticTypes(df);
+  _toAtomicLevel(df, macroMolecule, monomersLibObject);
 }
 
-
 //top-menu: Bio | MSA...
 //name: MSA
 //input: dataframe table
@@ -528,5 +525,3 @@ export function saveAsFasta() {
 export function bioSubstructureFilter(): BioSubstructureFilter {
   return new BioSubstructureFilter();
 }
-
-

package/src/substructure-search/substructure-search.ts

@@ -8,6 +8,14 @@ import {getMonomericMols} from '../calculations/monomerLevelMols';
 import {BitSet} from 'datagrok-api/dg';
 import {updateDivInnerHTML} from '../utils/ui-utils';
 
+export const MONOMER_MOLS_COL = 'monomeric-mols';
+
+const enum MONOMERIC_COL_TAGS{
+  MONOMERIC_MOLS = 'monomeric-mols',
+  LAST_INVALIDATED_VERSION = 'last-invalidated-version',
+  MONOMERS_DICT = 'monomers-dict'
+}
+
 /**
  * Searches substructure in each row of Macromolecule column
  *
@@ -67,29 +75,48 @@ export function substructureSearchDialog(col: DG.Column): void {
     .show();
 }
 
-export function linearSubstructureSearch(substructure: string, col: DG.Column): DG.BitSet {
-  const lowerCaseSubstr = substructure.toLowerCase();
+export function linearSubstructureSearch(substructure: string, col: DG.Column, separator?: string): DG.BitSet {
+  const re = separator ? prepareSubstructureRegex(substructure, separator) : substructure;
   const resultArray = DG.BitSet.create(col.length);
   for (let i = 0; i < col.length; i++) {
-    const macromolecule = col.get(i).toLowerCase();
-    if (macromolecule.indexOf(lowerCaseSubstr) !== -1)
+    const macromolecule = col.get(i);
+    if (macromolecule.match(re) || macromolecule === substructure)
       resultArray.set(i, true, false);
   }
   return resultArray;
 }
 
+function prepareSubstructureRegex(substructure: string, separator: string) {
+  const char = `${separator}`.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
+  const startsWithSep = substructure.charAt(0) === separator;
+  const endsWithSep = substructure.charAt(substructure.length - 1) === separator;
+  const substrWithoutSep = substructure.replace(new RegExp(`^${char}|${char}$`, 'g'), '');
+  const re = startsWithSep ? endsWithSep ? `${char}${substrWithoutSep}${char}` :
+    `${char}${substrWithoutSep}${char}|${char}${substrWithoutSep}$` :
+    endsWithSep ? `^${substrWithoutSep}${char}|${char}${substrWithoutSep}${char}` :
+      `^${substrWithoutSep}${char}|${char}${substrWithoutSep}${char}|${char}${substrWithoutSep}$`;
+  return re;
+}
+
 export async function helmSubstructureSearch(substructure: string, col: DG.Column): Promise<BitSet> {
-  const helmColWithSubstructure = DG.Column.string('helm', col.length + 1)
-    .init((i) => i === col.length ? substructure : col.get(i));
-  helmColWithSubstructure.setTag(DG.TAGS.UNITS, bio.NOTATION.HELM);
-  const monomericMolsCol = await getMonomericMols(helmColWithSubstructure, true);
-  const molSubstructure = monomericMolsCol.get(col.length);
-  const monomericMolsDf = DG.DataFrame.fromColumns([monomericMolsCol]);
-  monomericMolsDf.rows.removeAt(col.length);
+  if (col.version !== col.temp[MONOMERIC_COL_TAGS.LAST_INVALIDATED_VERSION])
+    await invalidateHelmMols(col);
+  const substructureCol = DG.Column.string('helm', 1).init((i) => substructure);
+  substructureCol.setTag(DG.TAGS.UNITS, bio.NOTATION.HELM);
+  const substructureMolsCol =
+    await getMonomericMols(substructureCol, true, col.temp[MONOMERIC_COL_TAGS.MONOMERS_DICT]);
   const matchesCol = await grok.functions.call('Chem:searchSubstructure', {
-    molStringsColumn: monomericMolsDf.columns.byIndex(0),
-    molString: molSubstructure,
+    molStringsColumn: col.temp[MONOMERIC_COL_TAGS.MONOMERIC_MOLS],
+    molString: substructureMolsCol.get(0),
     molBlockFailover: '',
   });
   return matchesCol.get(0);
 }
+
+export async function invalidateHelmMols(col: DG.Column) {
+  const monomersDict = new Map();
+  const monomericMolsCol = await getMonomericMols(col, true, monomersDict);
+  col.temp[MONOMERIC_COL_TAGS.MONOMERIC_MOLS] = monomericMolsCol;
+  col.temp[MONOMERIC_COL_TAGS.MONOMERS_DICT] = monomersDict;
+  col.temp[MONOMERIC_COL_TAGS.LAST_INVALIDATED_VERSION] = col.version;
+}

package/src/tests/{WebLogo-test.ts → bio-tests.ts}

@@ -5,7 +5,7 @@ import * as bio from '@datagrok-libraries/bio';
 
 import {after, before, category, test, expect, expectObject} from '@datagrok-libraries/utils/src/test';
 
-category('WebLogo', () => {
+category('bio', () => {
   const csvDfN1: string = `seq
 ACGTCT
 CAGTGT
@@ -47,7 +47,21 @@ XZJ{}2
 `;
 
   // anonymous functions specified in test() registering must return Promise<any>
-  test('testGetStats', async () => { await _testGetStats(csvDfN1); });
+  test('testGetStatsHelm1', async () => {
+    const csv = `seq
+PEPTIDE1{meI}$$$$
+`;
+    const df: DG.DataFrame = DG.DataFrame.fromCsv(csv);
+    const seqCol: DG.Column = df.getCol('seq')!;
+    const stats = bio.getStats(seqCol, 1, bio.splitterAsHelm);
+
+    expectObject(stats.freq, {
+      'meI': 1
+    });
+    expect(stats.sameLength, true);
+  });
+
+  test('testGetStatsN1', async () => { await _testGetStats(csvDfN1); });
   test('testGetAlphabetSimilarity', async () => { await _testGetAlphabetSimilarity(); });
 
   test('testPickupPaletteN1', async () => { await _testPickupPaletteN1(csvDfN1); });

package/src/tests/checkInputColumn-tests.ts

@@ -8,10 +8,9 @@ import {after, before, category, test, expect, expectArray} from '@datagrok-libr
 
 import {checkInputColumn, multipleSequenceAlignmentAny} from '../package';
 import {UNITS} from 'datagrok-api/dg';
-
+import {ALPHABET, NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule';
 
 category('checkInputColumn', () => {
-
   const csv = `seq
 seq1,
 seq2,
@@ -22,7 +21,7 @@ seq4`;
     const func: DG.Func = DG.Func.find({package: 'Bio', name: 'multipleSequenceAlignmentAny'})[0];
     const funcInputColumnProperty: DG.Property = func.inputs.find((i) => i.name == 'sequence')!;
 
-    let k = 11;
+    const k = 11;
 
     const df: DG.DataFrame = DG.DataFrame.fromCsv(csv);
     const col: DG.Column = df.getCol('seq');
@@ -42,7 +41,7 @@ seq4`;
     const df: DG.DataFrame = DG.DataFrame.fromCsv(csv);
     const col: DG.Column = df.getCol('seq');
     col.semType = DG.SEMTYPE.MACROMOLECULE;
-    col.setTag(DG.TAGS.UNITS, 'helm');
+    col.setTag(DG.TAGS.UNITS, NOTATION.HELM);
     col.setTag(bio.TAGS.alphabetSize, '11');
     col.setTag(bio.TAGS.alphabetIsMultichar, 'true');
 
@@ -57,7 +56,7 @@ seq4`;
     const df: DG.DataFrame = DG.DataFrame.fromCsv(csv);
     const col: DG.Column = df.getCol('seq');
     col.semType = DG.SEMTYPE.MACROMOLECULE;
-    col.setTag(DG.TAGS.UNITS, 'fasta');
+    col.setTag(DG.TAGS.UNITS, NOTATION.FASTA);
     col.setTag(bio.TAGS.alphabet, 'UN');
     col.setTag(bio.TAGS.alphabetSize, '11');
     col.setTag(bio.TAGS.alphabetIsMultichar, 'true');
@@ -73,6 +72,6 @@ seq4`;
   test('testGetActionFunctionMeta', async () => {
     const func: DG.Func = DG.Func.find({package: 'Bio', name: 'multipleSequenceAlignmentAny'})[0];
     const sequenceInput: DG.Property = func.inputs.find((i) => i.name == 'sequence')!;
-    let k = 11;
+    const k = 11;
   });
-});
+});

package/src/tests/detectors-test.ts

@@ -6,7 +6,8 @@ import * as bio from '@datagrok-libraries/bio';
 import {after, before, category, test, expect, expectObject} from '@datagrok-libraries/utils/src/test';
 
 import {importFasta} from '../package';
-import {UnitsHandler} from '@datagrok-libraries/bio/src/utils/units-handler';
+import {UnitsHandler, ALIGNMENT} from '@datagrok-libraries/bio/src/utils/units-handler';
+import {NOTATION, ALPHABET} from '@datagrok-libraries/bio/src/utils/macromolecule';
 
 type DfReaderFunc = () => Promise<DG.DataFrame>;
 
@@ -200,44 +201,49 @@ MWRSWY-CKHP
   test('NegativeSmiles', async () => { await _testNeg(readCsv('csvDfSmiles', csvDfSmiles), 'col1'); });
 
   test('Dna1', async () => {
-    await _testPos(readCsv('csvDfDna1', csvDfDna1), 'seq', 'fasta', 'SEQ', 'DNA', 4, false);
+    await _testPos(readCsv('csvDfDna1', csvDfDna1), 'seq', NOTATION.FASTA, ALIGNMENT.SEQ, ALPHABET.DNA, 4, false);
   });
   test('Rna1', async () => {
-    await _testPos(readCsv('csvDfRna1', csvDfRna1), 'seq', 'fasta', 'SEQ', 'RNA', 4, false);
+    await _testPos(readCsv('csvDfRna1', csvDfRna1), 'seq', NOTATION.FASTA, ALIGNMENT.SEQ, ALPHABET.RNA, 4, false);
   });
   test('AA1', async () => {
-    await _testPos(readCsv('csvDfPt1', csvDfPt1), 'seq', 'fasta', 'SEQ', 'PT', 20, false);
+    await _testPos(readCsv('csvDfPt1', csvDfPt1), 'seq', NOTATION.FASTA, ALIGNMENT.SEQ, ALPHABET.PT, 20, false);
   });
   test('MsaDna1', async () => {
-    await _testPos(readCsv('csvDfMsaDna1', csvDfMsaDna1), 'seq', 'fasta', 'SEQ.MSA', 'DNA', 4, false);
+    await _testPos(readCsv('csvDfMsaDna1', csvDfMsaDna1), 'seq', NOTATION.FASTA, ALIGNMENT.SEQ_MSA, ALPHABET.DNA, 4, false);
   });
 
   test('MsaAA1', async () => {
-    await _testPos(readCsv('csvDfMsaPt1', csvDfMsaPt1), 'seq', 'fasta', 'SEQ.MSA', 'PT', 20, false);
+    await _testPos(readCsv('csvDfMsaPt1', csvDfMsaPt1), 'seq', NOTATION.FASTA,
+      ALIGNMENT.SEQ_MSA, ALPHABET.PT, 20, false);
   });
 
   test('SepDna', async () => {
-    await _testPos(readCsv('csvDfSepDna', csvDfSepDna), 'seq', 'separator', 'SEQ', 'DNA', 4, false, '*');
+    await _testPos(readCsv('csvDfSepDna', csvDfSepDna), 'seq', NOTATION.SEPARATOR, ALIGNMENT.SEQ, ALPHABET.DNA, 4, false, '*');
   });
   test('SepRna', async () => {
-    await _testPos(readCsv('csvDfSepRna', csvDfSepRna), 'seq', 'separator', 'SEQ', 'RNA', 4, false, '*');
+    await _testPos(readCsv('csvDfSepRna', csvDfSepRna), 'seq', NOTATION.SEPARATOR, ALIGNMENT.SEQ, ALPHABET.RNA, 4, false, '*');
   });
   test('SepPt', async () => {
-    await _testPos(readCsv('csvDfSepPt', csvDfSepPt), 'seq', 'separator', 'SEQ', 'PT', 20, false, '-');
+    await _testPos(readCsv('csvDfSepPt', csvDfSepPt), 'seq',
+      NOTATION.SEPARATOR, ALIGNMENT.SEQ, ALPHABET.PT, 20, false, '-');
   });
   test('SepUn1', async () => {
-    await _testPos(readCsv('csvDfSepUn1', csvDfSepUn1), 'seq', 'separator', 'SEQ', 'UN', 8, true, '-');
+    await _testPos(readCsv('csvDfSepUn1', csvDfSepUn1), 'seq',
+      NOTATION.SEPARATOR, ALIGNMENT.SEQ, ALPHABET.UN, 8, true, '-');
   });
   test('SepUn2', async () => {
-    await _testPos(readCsv('csvDfSepUn2', csvDfSepUn2), 'seq', 'separator', 'SEQ', 'UN', 9, true, '/');
+    await _testPos(readCsv('csvDfSepUn2', csvDfSepUn2), 'seq',
+      NOTATION.SEPARATOR, ALIGNMENT.SEQ, ALPHABET.UN, 9, true, '/');
   });
 
   test('SepMsaN1', async () => {
-    await _testPos(readCsv('csvDfSepMsaDna1', csvDfSepMsaDna1), 'seq', 'separator', 'SEQ.MSA', 'DNA', 4, false, '-');
+    await _testPos(readCsv('csvDfSepMsaDna1', csvDfSepMsaDna1), 'seq',
+      NOTATION.SEPARATOR, ALIGNMENT.SEQ_MSA, ALPHABET.DNA, 4, false, '-');
   });
 
   test('SamplesFastaCsvPt', async () => {
-    await _testPos(readSamples(Samples.fastaCsv), 'sequence', 'fasta', 'SEQ', 'PT', 20, false);
+    await _testPos(readSamples(Samples.fastaCsv), 'sequence', NOTATION.FASTA, ALIGNMENT.SEQ, ALPHABET.PT, 20, false);
   });
   test('SamplesFastaCsvNegativeEntry', async () => {
     await _testNeg(readSamples(Samples.fastaCsv), 'Entry');
@@ -250,7 +256,8 @@ MWRSWY-CKHP
   });
 
   test('SamplesFastaFastaPt', async () => {
-    await _testPos(readSamples(Samples.fastaFasta, readFileFasta), 'sequence', 'fasta', 'SEQ', 'PT', 20, false);
+    await _testPos(readSamples(Samples.fastaFasta, readFileFasta),
+      'sequence', NOTATION.FASTA, ALIGNMENT.SEQ, ALPHABET.PT, 20, false);
   });
 
   // peptidesComplex contains monomers with spaces in AlignedSequence columns, which are forbidden
@@ -268,7 +275,8 @@ MWRSWY-CKHP
   });
 
   test('samplesMsaComplexUn', async () => {
-    await _testPos(readSamples(Samples.msaComplex), 'MSA', 'separator', 'SEQ.MSA', 'UN', 161, true, '/');
+    await _testPos(readSamples(Samples.msaComplex), 'MSA',
+      NOTATION.SEPARATOR, ALIGNMENT.SEQ_MSA, ALPHABET.UN, 161, true, '/');
   });
   test('samplesMsaComplexNegativeActivity', async () => {
     await _testNeg(readSamples(Samples.msaComplex), 'Activity');
@@ -283,7 +291,7 @@ MWRSWY-CKHP
   });
 
   test('samplesHelmCsvHELM', async () => {
-    await _testPos(readSamples(Samples.helmCsv), 'HELM', 'helm', null, null, 160, true, null);
+    await _testPos(readSamples(Samples.helmCsv), 'HELM', NOTATION.HELM, null, null, 160, true, null);
   });
 
   test('samplesHelmCsvNegativeActivity', async () => {
@@ -299,7 +307,7 @@ MWRSWY-CKHP
     await _testNeg(readSamples(Samples.testHelmCsv), 'Test type');
   });
   test('samplesTestHelmPositiveHelmString', async () => {
-    await _testPos(readSamples(Samples.testHelmCsv), 'HELM string', 'helm', null, null, 9, true, null);
+    await _testPos(readSamples(Samples.testHelmCsv), 'HELM string', NOTATION.HELM, null, null, 9, true, null);
   });
   test('samplesTestHelmNegativeValid', async () => {
     await _testNeg(readSamples(Samples.testHelmCsv), 'Valid?');
@@ -331,7 +339,7 @@ MWRSWY-CKHP
   });
 
   test('samplesFastaPtPosSequence', async () => {
-    await _testPos(readSamples(Samples.fastaPtCsv), 'sequence', 'fasta', 'SEQ', 'PT', 20, false);
+    await _testPos(readSamples(Samples.fastaPtCsv), 'sequence', NOTATION.FASTA, ALIGNMENT.SEQ, ALPHABET.PT, 20, false);
   });
 
   test('samplesTestCerealNegativeCerealName', async () => {
@@ -383,7 +391,7 @@ export async function _testNeg(readDf: DfReaderFunc, colName: string) {
     throw new Error(msg);
     // col.semType = '';
     // col.setTag(DG.TAGS.UNITS, '');
-    // col.setTag('separator', '');
+    // col.setTag(NOTATION.SEPARATOR, '');
   }
 }
 

package/src/tests/renderers-test.ts

@@ -6,6 +6,8 @@ import {after, before, category, delay, expect, test} from '@datagrok-libraries/
 
 import {importFasta, multipleSequenceAlignmentAny} from '../package';
 import {convertDo} from '../utils/convert';
+import {ALPHABET, NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule';
+import {UnitsHandler, ALIGNMENT} from '@datagrok-libraries/bio/src/utils/units-handler';
 import {SEM_TYPES, TAGS} from '../utils/constants';
 import {generateLongSequence, generateManySequences, performanceTest} from './test-sequnces-generators';
 
@@ -103,7 +105,7 @@ category('renderers', () => {
   async function _rendererMacromoleculeDifference() {
     const seqDiffCol: DG.Column = DG.Column.fromStrings('SequencesDiff',
       ['meI/hHis/Aca/N/T/dK/Thr_PO3H2/Aca#D-Tyr_Et/Tyr_ab-dehydroMe/meN/E/N/dV']);
-    seqDiffCol.tags[DG.TAGS.UNITS] = 'separator';
+    seqDiffCol.tags[DG.TAGS.UNITS] = NOTATION.SEPARATOR;
     seqDiffCol.tags[TAGS.SEPARATOR] = '/';
     seqDiffCol.semType = SEM_TYPES.MACROMOLECULE_DIFFERENCE;
     const df = DG.DataFrame.fromColumns([seqDiffCol]);
@@ -139,7 +141,7 @@ category('renderers', () => {
       `cell.renderer="${srcSeqCol!.getTag(DG.TAGS.CELL_RENDERER)}"`);
     expect(srcSeqCol.semType, DG.SEMTYPE.MACROMOLECULE);
     expect(srcSeqCol.getTag(DG.TAGS.UNITS), bio.NOTATION.FASTA);
-    expect(srcSeqCol.getTag(bio.TAGS.aligned), 'SEQ');
+    expect(srcSeqCol.getTag(bio.TAGS.aligned), ALIGNMENT.SEQ);
     expect(srcSeqCol.getTag(bio.TAGS.alphabet), bio.ALPHABET.PT);
     expect(srcSeqCol.getTag(DG.TAGS.CELL_RENDERER), 'sequence');
 
@@ -148,7 +150,7 @@ category('renderers', () => {
 
     expect(msaSeqCol.semType, DG.SEMTYPE.MACROMOLECULE);
     expect(msaSeqCol.getTag(DG.TAGS.UNITS), bio.NOTATION.FASTA);
-    expect(msaSeqCol.getTag(bio.TAGS.aligned), 'SEQ.MSA');
+    expect(msaSeqCol.getTag(bio.TAGS.aligned), ALIGNMENT.SEQ_MSA);
     expect(msaSeqCol.getTag(bio.TAGS.alphabet), bio.ALPHABET.PT);
     expect(msaSeqCol.getTag(DG.TAGS.CELL_RENDERER), 'sequence');
 
@@ -190,7 +192,7 @@ category('renderers', () => {
     /**/
     const seqDiffCol: DG.Column = DG.Column.fromStrings('SequencesDiff',
       ['meI/hHis/Aca/N/T/dK/Thr_PO3H2/Aca#D-Tyr_Et/Tyr_ab-dehydroMe/meN/E/N/dV']);
-    seqDiffCol.tags[DG.TAGS.UNITS] = 'separator';
+    seqDiffCol.tags[DG.TAGS.UNITS] = NOTATION.SEPARATOR;
     seqDiffCol.tags[TAGS.SEPARATOR] = '/';
     seqDiffCol.semType = SEM_TYPES.MACROMOLECULE_DIFFERENCE;
     const df = DG.DataFrame.fromColumns([seqDiffCol]);
@@ -206,10 +208,12 @@ category('renderers', () => {
         `view renderer has set to '${renderer}' instead of correct 'MacromoleculeDifference'.`);
   }
 
+  /** GROK-11212 Do not overwrite / recalculate 'cell.renderer' tag that has been set programmatically
+   * https://reddata.atlassian.net/browse/GROK-11212 */
   async function _setRendererManually() {
     const seqDiffCol: DG.Column = DG.Column.fromStrings('SequencesDiff',
       ['meI/hHis/Aca/N/T/dK/Thr_PO3H2/Aca#D-Tyr_Et/Tyr_ab-dehydroMe/meN/E/N/dV']);
-    seqDiffCol.tags[DG.TAGS.UNITS] = 'separator';
+    seqDiffCol.tags[DG.TAGS.UNITS] = NOTATION.SEPARATOR;
     seqDiffCol.tags[TAGS.SEPARATOR] = '/';
     seqDiffCol.semType = SEM_TYPES.MACROMOLECULE;
     const tgtCellRenderer = 'MacromoleculeDifference';

package/src/tests/test-sequnces-generators.ts

@@ -2,6 +2,9 @@ import * as DG from 'datagrok-api/dg';
 import * as grok from 'datagrok-api/grok';
 import {DataFrame} from 'datagrok-api/dg';
 
+import {ALIGNMENT, UnitsHandler} from '@datagrok-libraries/bio/src/utils/units-handler';
+import {NOTATION, ALPHABET, TAGS} from '@datagrok-libraries/bio/src/utils/macromolecule';
+
 export function generateManySequences(): DG.Column[] {
   let columns: DG.Column[] = [];
   columns.push(DG.Column.fromList('string', 'MSA', new Array(10 ** 6).fill('meI/hHis/Aca/N/T/dE/Thr_PO3H2/Aca/D-Tyr_Et/Tyr_ab-dehydroMe/dV/E/N/D-Orn/D-aThr//Phe_4Me')));
@@ -19,10 +22,10 @@ export function generateLongSequence(): DG.Column[] {
 
 export function setTagsMacromolecule(col: DG.Column) {
   col.semType = DG.SEMTYPE.MACROMOLECULE;
-  col.setTag('units', 'separator');
-  col.setTag('aligned', 'SEQ.MSA');
-  col.setTag('alphabet', 'UN');
-  col.setTag('separator', '/');
+  col.setTag(DG.TAGS.UNITS, NOTATION.SEPARATOR);
+  col.setTag(TAGS.aligned, ALIGNMENT.SEQ_MSA);
+  col.setTag(TAGS.alphabet, ALPHABET.UN);
+  col.setTag(TAGS.separator, '/');
   return col;
 }
 

package/src/utils/cell-renderer.ts

@@ -1,6 +1,9 @@
 import * as grok from 'datagrok-api/grok';
-import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
+import * as ui from 'datagrok-api/ui';
+
+import {printLeftOrCentered, DrawStyle} from '@datagrok-libraries/bio/src/utils/cell-renderer';
+import {ALIGNMENT} from '@datagrok-libraries/bio/src/utils/units-handler';
 import * as bio from '@datagrok-libraries/bio';
 import * as C from './constants';
 
@@ -44,7 +47,7 @@ export class MacromoleculeSequenceCellRenderer extends DG.GridCellRenderer {
   }
 
   onMouseMove(gridCell: DG.GridCell, e: MouseEvent): void {
-    if (gridCell.cell.column.getTag(bio.TAGS.aligned) !== 'SEQ.MSA')
+    if (gridCell.cell.column.getTag(bio.TAGS.aligned) !== ALIGNMENT.SEQ_MSA)
       return;
 
     const maxLengthWordsSum = gridCell.cell.column.temp['bio-sum-maxLengthWords'];

package/src/widgets/bio-substructure-filter.ts

@@ -14,6 +14,7 @@ import {Subject, Subscription} from 'rxjs';
 import * as C from '../utils/constants';
 import {updateDivInnerHTML} from '../utils/ui-utils';
 import {NOTATION} from '@datagrok-libraries/bio';
+import { delay } from '@datagrok-libraries/utils/src/test';
 
 export class BioSubstructureFilter extends DG.Filter {
   bioFilter: FastaFilter | SeparatorFilter | HelmFilter | null = null;
@@ -102,9 +103,7 @@ export class BioSubstructureFilter extends DG.Filter {
     } else {
       this.calculating = true;
       try {
-        this.bitset = this.notation === NOTATION.HELM ?
-          await helmSubstructureSearch(this.bioFilter!.substructure, this.column!) :
-          linearSubstructureSearch(this.bioFilter!.substructure, this.column!);
+        this.bitset = await this.bioFilter?.substrucrureSearch(this.column!)!;
         this.calculating = false;
         this.dataFrame?.rows.requestFilter();
       } finally {
@@ -127,6 +126,10 @@ abstract class BioFilterBase {
 
   set substructure(s: string) {
   }
+
+  async substrucrureSearch(column: DG.Column): Promise<DG.BitSet | null> {
+    return null;
+  }
 }
 
 class FastaFilter extends BioFilterBase {
@@ -149,6 +152,10 @@ class FastaFilter extends BioFilterBase {
   set substructure(s: string) {
     this.substructureInput.value = s;
   }
+
+  async substrucrureSearch(column: DG.Column): Promise<DG.BitSet | null> {
+    return await linearSubstructureSearch(this.substructure, column);
+  }
 }
 
 class SeparatorFilter extends FastaFilter {
@@ -179,6 +186,10 @@ class SeparatorFilter extends FastaFilter {
   set substructure(s: string) {
     this.substructureInput.value = s;
   }
+
+  async substrucrureSearch(column: DG.Column): Promise<DG.BitSet | null> {
+    return await linearSubstructureSearch(this.substructure, column, this.colSeparator);
+  }
 }
 
 class HelmFilter extends BioFilterBase {
@@ -202,9 +213,9 @@ class HelmFilter extends BioFilterBase {
         .onOK(() => {
           const helmString = this.helmEditor
             .webEditor.canvas.getHelm(true).replace(/<\/span>/g, '').replace(/<span style='background:#bbf;'>/g, '');
-          this.updateFilterPanel(helmString);
           this.helmSubstructure = helmString;
-          this.onChanged.next();
+          this.updateFilterPanel(this.substructure);
+          setTimeout(() => { this.onChanged.next(); }, 10);
         }).show({modal: true, fullScreen: true});
     });
     ui.onSizeChanged(this._filterPanel).subscribe((_) => {
@@ -247,4 +258,12 @@ class HelmFilter extends BioFilterBase {
       this.helmEditor.resizeEditor(width, height);
     }
   }
+
+  async substrucrureSearch(column: DG.Column): Promise<DG.BitSet | null> {
+    ui.setUpdateIndicator(this._filterPanel, true);
+    await delay(10);
+    const res = await helmSubstructureSearch(this.substructure, column);
+    ui.setUpdateIndicator(this._filterPanel, false);
+    return res;
+  }
 }