Skip to content

Commit d2d2079

Browse files
authored
Merge pull request #263 from crockettz/main
Add bad genomes to score ortho evo test
2 parents 032103e + 3312893 commit d2d2079

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

.DS_Store

6 KB
Binary file not shown.

lib/kb_phylogenomics/kb_phylogenomicsImpl.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import random
1313
import subprocess
1414
from Bio import SeqIO
15+
from Bio.Seq import Seq
1516

1617
from datetime import datetime
1718
from pprint import pformat,pprint

test/kb_phylogenomics_server_test.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from kb_phylogenomics.kb_phylogenomicsImpl import kb_phylogenomics
2020
from kb_phylogenomics.kb_phylogenomicsServer import MethodContext
2121
from kb_phylogenomics.authclient import KBaseAuth as _KBaseAuth
22-
22+
ws = workspaceService("https://appdev.kbase.us/services/ws")
2323

2424
class kb_phylogenomicsTest(unittest.TestCase):
2525

@@ -1100,18 +1100,26 @@ def test_score_ortho_evo_rates_01(self):
11001100

11011101
print ("\n\nRUNNING: test_"+method+"_01()")
11021102
print ("==================================================\n\n")
1103-
11041103
# input_data
11051104
genomeInfo_0 = self.getGenomeInfo('GCF_000287295.1_ASM28729v1_genomic', 0) # Candidatus Carsonella ruddii HT isolate Thao2000
11061105
genomeInfo_1 = self.getGenomeInfo('GCF_000306885.1_ASM30688v1_genomic', 1) # Wolbachia endosymbiont of Onchocerca ochengi
11071106
genomeInfo_2 = self.getGenomeInfo('GCF_001439985.1_wTPRE_1.0_genomic', 2) # Wolbachia endosymbiont of Trichogramma pretiosum
11081107
genomeInfo_3 = self.getGenomeInfo('GCF_000022285.1_ASM2228v1_genomic', 3) # Wolbachia sp. wRi
1109-
1108+
#genomeInfo_4 = ws.copy_object({
1109+
# "from":{'ref':'76694/103/1'},
1110+
# "to":{"workspace":os.environ['KB_WORKSPACE_ID'],'name':'additional_genome'}
1111+
# })
1112+
#genomeInfo_4 = ws.get_objects2({'objects':[{'ref':'76694/103/1'}]})['data'][0]['data']
1113+
genomeInfo_4 = next((obj for obj in ws.list_objects(params={'ids':['76694']}) if str(obj[0]) == '103'), None)
1114+
print ("==================================================\n\n*3")
1115+
print(genomeInfo_4)
1116+
print ("==================================================\n\n*3")
11101117
[OBJID_I, NAME_I, TYPE_I, SAVE_DATE_I, VERSION_I, SAVED_BY_I, WSID_I, WORKSPACE_I, CHSUM_I, SIZE_I, META_I] = range(11) # object_info tuple
11111118
genome_ref_0 = str(genomeInfo_0[WSID_I]) + '/' + str(genomeInfo_0[OBJID_I]) + '/' + str(genomeInfo_0[VERSION_I])
11121119
genome_ref_1 = str(genomeInfo_1[WSID_I]) + '/' + str(genomeInfo_1[OBJID_I]) + '/' + str(genomeInfo_1[VERSION_I])
11131120
genome_ref_2 = str(genomeInfo_2[WSID_I]) + '/' + str(genomeInfo_2[OBJID_I]) + '/' + str(genomeInfo_2[VERSION_I])
11141121
genome_ref_3 = str(genomeInfo_3[WSID_I]) + '/' + str(genomeInfo_3[OBJID_I]) + '/' + str(genomeInfo_3[VERSION_I])
1122+
genome_ref_4 = str(genomeInfo_4[WSID_I]) + '/' + str(genomeInfo_4[OBJID_I]) + '/' + str(genomeInfo_4[VERSION_I])
11151123

11161124
#feature_id_0 = 'A355_RS00030' # F0F1 ATP Synthase subunit B
11171125
#feature_id_1 = 'WOO_RS00195' # F0 ATP Synthase subunit B
@@ -1122,7 +1130,8 @@ def test_score_ortho_evo_rates_01(self):
11221130
genome_refs_map = { '23880/3/1': genome_ref_0,
11231131
'23880/4/1': genome_ref_1,
11241132
'23880/5/1': genome_ref_2,
1125-
'23880/6/1': genome_ref_3
1133+
'23880/6/1': genome_ref_3,
1134+
'23880/7/1': genome_ref_4
11261135
}
11271136
obj_info = self.getPangenomeInfo('Tiny_things.OrthoMCL_pangenome', 0, genome_refs_map)
11281137
[OBJID_I, NAME_I, TYPE_I, SAVE_DATE_I, VERSION_I, SAVED_BY_I, WSID_I, WORKSPACE_I, CHSUM_I, SIZE_I, META_I] = range(11) # object_info tuple

0 commit comments

Comments
 (0)