@datagrok/bio 2.4.11 → 2.4.13

package/src/package-test.ts

@@ -21,6 +21,7 @@ import './tests/similarity-diversity-tests';
 import './tests/substructure-filters-tests';
 import './tests/pepsea-tests';
 import './tests/viewers';
+import './tests/units-handler-tests';
 
 // Tests hanging github CI
 import './tests/activity-cliffs-tests';

package/src/package.ts

@@ -655,30 +655,34 @@ export function bioSubstructureFilter(): BioSubstructureFilter {
 //name: demoBioSimilarityDiversity
 //meta.demoPath: Bioinformatics | Similarity, Diversity
 //description:
+//meta.path: /apps/Tutorials/Demo/Bioinformatics/Similarity,%20Diversity
 export async function demoBioSimilarityDiversity(): Promise<void> {
-  await demoBio01UI('func/Bio.demoBio01');
+  await demoBio01UI();
 }
 
 // demoBio01a
 //name:demoBioSequenceSpace
 //meta.demoPath: Bioinformatics | Sequence Space
 //description:
+//meta.path: /apps/Tutorials/Demo/Bioinformatics/Sequence%20Space
 export async function demoBioSequenceSpace(): Promise<void> {
-  await demoBio01aUI('func/Bio.demoBio01a');
+  await demoBio01aUI();
 }
 
 // demoBio01b
 //name: demoBioActivityCliffs
 //meta.demoPath: Bioinformatics | Activity Cliffs
 //description:
+//meta.path: /apps/Tutorials/Demo/Bioinformatics/Activity%20Cliffs
 export async function demoBioActivityCliffs(): Promise<void> {
-  await demoBio01bUI('func/Bio.demoBio01b');
+  await demoBio01bUI();
 }
 
 // demoBio05
 //name: demoBioHelmMsaSequenceSpace
 //meta.demoPath: Bioinformatics | Helm, MSA, Sequence Space
 //description:
+//meta.path: /apps/Tutorials/Demo/Bioinformatics/Helm,%20MSA,%20Sequence%20Space
 export async function demoBioHelmMsaSequenceSpace(): Promise<void> {
-  await demoBio05UI('func/demoBio05');
+  await demoBio05UI();
 }

package/src/tests/units-handler-tests.ts

@@ -0,0 +1,97 @@
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
+
+import {after, before, category, test, expect, expectObject} from '@datagrok-libraries/utils/src/test';
+import {UnitsHandler} from '@datagrok-libraries/bio/src/utils/units-handler';
+import {ALPHABET, NOTATION, TAGS} from '@datagrok-libraries/bio/src/utils/macromolecule';
+
+const seqDna = `seq
+ACGTC
+CAGTGT
+TTCAAC
+`;
+
+const seqDnaMsa = `seq
+AC-GT-CT
+CAC-T-GT
+ACCGTACT
+`;
+
+const seqUn = `seq
+abc-dfgg-abc1-cfr3-rty-wert
+rut12-her2-rty-wert-abc-abc1-dfgg
+rut12-rty-her2-abc-cfr3-wert-rut12
+`;
+
+const seqHelm = `seq
+PEPTIDE1{meI.hHis.Aca.N.T.dE.Thr_PO3H2.Aca.D-Tyr_Et.Tyr_ab-dehydroMe.dV.E.N.D-Orn.D-aThr.Phe_4Me}$$$$
+PEPTIDE1{meI.hHis.Aca.Cys_SEt.T.dK.Thr_PO3H2.Aca.Tyr_PO3H2.D-Chg.dV.Phe_ab-dehydro.N.D-Orn.D-aThr.Phe_4Me}$$$$
+PEPTIDE1{Lys_Boc.hHis.Aca.Cys_SEt.T.dK.Thr_PO3H2.Aca.Tyr_PO3H2.D-Chg.dV.Thr_PO3H2.N.D-Orn.D-aThr.Phe_4Me}$$$$
+PEPTIDE1{meI.hHis.Aca.Cys_SEt.T.dK.Thr_PO3H2.Aca.Tyr_PO3H2.D-Chg.dV.Thr_PO3H2.N.D-Orn.D-aThr.Phe_4Me}$$$$
+`;
+
+category('UnitsHandler', () =>{
+  test('Seq-Fasta', async () =>{
+    const [df, uh] = await loadCsvWithDetection(seqDna);
+    expect(uh.notation, NOTATION.FASTA);
+    expect(uh.isMsa(), false);
+  });
+
+  test('Seq-Fasta-MSA', async () =>{
+    const [df, uh] = await loadCsvWithDetection(seqDnaMsa);
+    expect(uh.notation, NOTATION.FASTA);
+    expect(uh.isMsa(), true);
+  });
+
+  test('Seq-Fasta-units', async () =>{
+    const [df, uh] = await loadCsvWithTag(seqDna, DG.TAGS.UNITS, NOTATION.FASTA);
+    expect(uh.notation, NOTATION.FASTA);
+    expect(uh.isMsa(), false);
+  });
+
+  test('Seq-Fasta-MSA-units', async () =>{
+    const [df, uh] = await loadCsvWithTag(seqDnaMsa, DG.TAGS.UNITS, NOTATION.FASTA);
+    expect(uh.notation, NOTATION.FASTA);
+    expect(uh.isMsa(), true);
+  });
+
+  test('Seq-Helm', async () =>{
+    const [df, uh] = await loadCsvWithTag(seqHelm, DG.TAGS.UNITS, NOTATION.HELM);
+    expect(uh.notation, NOTATION.HELM);
+    expect(uh.isHelm(), true);
+  });
+
+  test('Seq-UN', async () =>{
+    const [df, uh] = await loadCsvWithTag(seqUn, DG.TAGS.UNITS, NOTATION.SEPARATOR);
+    expect(uh.notation, NOTATION.SEPARATOR);
+    expect(uh.separator, '-');
+    expect(uh.alphabet, ALPHABET.UN);
+  });
+
+  test('Seq-UN-auto', async () =>{
+    const [df, uh] = await loadCsvWithDetection(seqUn);
+    expect(uh.notation, NOTATION.SEPARATOR);
+    expect(uh.separator, '-');
+    expect(uh.alphabet, ALPHABET.UN);
+  });
+
+  async function loadCsvWithDetection(csv: string): Promise<[df: DG.DataFrame, uh: UnitsHandler]> {
+    const df = DG.DataFrame.fromCsv(csv);
+    await grok.data.detectSemanticTypes(df);
+    const uh = new UnitsHandler(df.getCol('seq'));
+    return [df, uh];
+  }
+
+  async function loadCsvWithTag(csv: string, tag: string, value: string):
+    Promise<[df: DG.DataFrame, uh: UnitsHandler]> {
+    const df = DG.DataFrame.fromCsv(csv);
+    const col = df.getCol('seq');
+    col.setTag(tag, value);
+    col.semType = DG.SEMTYPE.MACROMOLECULE;
+    if (value === NOTATION.SEPARATOR)
+      col.setTag(TAGS.separator, '-');
+    const uh = new UnitsHandler(df.getCol('seq'));
+    return [df, uh];
+  }
+});