wwpdb.apps.seqmodule 0.24.9.dev1__tar.gz → 0.24.11__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/PKG-INFO +1 -1
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/__init__.py +1 -1
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/SequenceDataAssemble_v2.py +32 -12
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/SummaryView_v2.py +26 -13
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/GetSameSeqAnnotationWithTaxIdOnly.py +3 -1
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/UpdateSequenceDataStoreUtils.py +1 -1
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/webapp/SeqModWebApp_v2.py +8 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb.apps.seqmodule.egg-info/PKG-INFO +1 -1
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/README.md +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/setup.cfg +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/setup.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/AlignmentBackEndEditingTools.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/AlignmentDepictionTools.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/AlignmentExport.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/AlignmentFrontEndUIEditor.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/AlignmentStatistics.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/AlignmentStatisticsTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/AlignmentToolUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/AlignmentTools.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/align/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/DataImporter.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/SequenceDataAssembleExample.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/SequenceDataAssembleTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/SequenceDataPrepTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/SummaryViewDepiction.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/SummaryViewTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/control/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/AlignmentDataStore.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/BlastPlusReader.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/FetchSeqInfoUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/ModelSequenceUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/ModelSequenceUtilsTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/PdbxIoUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/SequenceDataExportTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/SequenceDataExport_v2.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/SequenceDataStore.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/SequenceDataStoreTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/SequenceEditStore.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/SequenceEditStoreTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/TaxonomyDbUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/TaxonomyUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/TaxonomyUtilsTests.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/io/testAuto.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/link/PolymerLinkageDepict.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/link/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/update/UpdatePolymerEntityPartitions.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/update/UpdatePolymerEntityReference_v2.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/update/UpdatePolymerEntitySourceDetails.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/update/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/Autodict.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/FetchReferenceSequenceUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/LocalBlastSearchUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/MultiProcLimit.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/SearchEntityPolySeqs.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/SeqReferenceSearchUtils.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/SequenceAssign.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/SequenceExamples.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/SequenceFeatureDepict.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/SequenceLabel.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/SequenceReferenceData.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/util/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/view3d/ModelViewer3D.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/view3d/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/webapp/SeqModWebRequest.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb/apps/seqmodule/webapp/__init__.py +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb.apps.seqmodule.egg-info/SOURCES.txt +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb.apps.seqmodule.egg-info/dependency_links.txt +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb.apps.seqmodule.egg-info/not-zip-safe +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb.apps.seqmodule.egg-info/requires.txt +0 -0
- {wwpdb.apps.seqmodule-0.24.9.dev1 → wwpdb.apps.seqmodule-0.24.11}/wwpdb.apps.seqmodule.egg-info/top_level.txt +0 -0
|
@@ -125,7 +125,9 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
|
|
|
125
125
|
if not os.access(polyLinkPath, os.R_OK):
|
|
126
126
|
return False
|
|
127
127
|
#
|
|
128
|
-
ok, no_coord_issue, seqSimilarityInfoList, polymerLinkDistList, entryD, entityD, instanceD, statisticsMap, depSeqAssign,
|
|
128
|
+
ok, no_coord_issue, seqSimilarityInfoList, polymerLinkDistList, mixMseMetResidueList, entryD, entityD, instanceD, statisticsMap, depSeqAssign, \
|
|
129
|
+
seqAssign = self.__readJsonObject(polyLinkPath)
|
|
130
|
+
#
|
|
129
131
|
if not ok:
|
|
130
132
|
return False
|
|
131
133
|
#
|
|
@@ -178,9 +180,8 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
|
|
|
178
180
|
except: # noqa: E722 pylint: disable=bare-except
|
|
179
181
|
sortedEntityIdList = self.__entityIdList
|
|
180
182
|
#
|
|
181
|
-
self.__createSeqMatchFileAndMisMatchPickleFile(
|
|
182
|
-
|
|
183
|
-
)
|
|
183
|
+
self.__createSeqMatchFileAndMisMatchPickleFile(sortedEntityIdList, entityD, ownRefD, eSSRefD, list(newOldEntityIdMap.keys()), misMatchList, \
|
|
184
|
+
notFoundMatchList, seqSimilarityInfoList, mixMseMetResidueList)
|
|
184
185
|
#
|
|
185
186
|
self.__updateUtilDataStore(pdbxFilePath)
|
|
186
187
|
#
|
|
@@ -325,6 +326,7 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
|
|
|
325
326
|
no_coord_issue = True
|
|
326
327
|
seqSimilarityInfoList = []
|
|
327
328
|
polymerLinkDistList = []
|
|
329
|
+
mixMseMetResidueList = []
|
|
328
330
|
entryD = {}
|
|
329
331
|
entityD = {}
|
|
330
332
|
instanceD = {}
|
|
@@ -362,13 +364,31 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
|
|
|
362
364
|
seqAssign = jsonObj["annSeqAssign"]
|
|
363
365
|
#
|
|
364
366
|
#
|
|
365
|
-
|
|
367
|
+
for key,valD in entityD.items():
|
|
368
|
+
if ("SEQ_TUP_LIST" not in valD) or (not valD["SEQ_TUP_LIST"]):
|
|
369
|
+
continue
|
|
370
|
+
#
|
|
371
|
+
hasMSE = False
|
|
372
|
+
hasMET = False
|
|
373
|
+
for seqTupl in valD["SEQ_TUP_LIST"]:
|
|
374
|
+
if seqTupl[0] == "MSE":
|
|
375
|
+
hasMSE = True
|
|
376
|
+
elif seqTupl[0] == "MET":
|
|
377
|
+
hasMET = True
|
|
378
|
+
#
|
|
379
|
+
#
|
|
380
|
+
if hasMSE and hasMET:
|
|
381
|
+
mixMseMetResidueList.append("Entity " + key + " contains both MET and MSE.")
|
|
382
|
+
#
|
|
383
|
+
#
|
|
384
|
+
return True, no_coord_issue, seqSimilarityInfoList, polymerLinkDistList, mixMseMetResidueList, entryD, entityD, instanceD, \
|
|
385
|
+
statisticsMap, depSeqAssign, seqAssign
|
|
366
386
|
except: # noqa: E722 pylint: disable=bare-except
|
|
367
387
|
if self._verbose:
|
|
368
388
|
traceback.print_exc(file=self._lfh)
|
|
369
389
|
#
|
|
370
390
|
#
|
|
371
|
-
return False, False, [], [], {}, {}, {}, {}, {}, {}
|
|
391
|
+
return False, False, [], [], [], {}, {}, {}, {}, {}, {}
|
|
372
392
|
|
|
373
393
|
def __getAuthDefinedRefD(self, depSeqAssign):
|
|
374
394
|
"""Get author provided reference information from pdbx_struct_ref_seq_depositor_info category"""
|
|
@@ -485,9 +505,9 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
|
|
|
485
505
|
tmpPolyLinkPath = os.path.join(self.__sessionPath, self.__dataSetId + "-poly-link.json")
|
|
486
506
|
self.__calcPolymerLinkages(pdbxFilePath=prevModelFilePath, polyLinkPath=tmpPolyLinkPath)
|
|
487
507
|
#
|
|
488
|
-
ok, _no_coord_issue, _seqSimilarityInfoList, _polymerLinkDistList, _entryD, prevEntityD, prevInstanceD, _statisticsMap,
|
|
489
|
-
|
|
490
|
-
|
|
508
|
+
ok, _no_coord_issue, _seqSimilarityInfoList, _polymerLinkDistList, _mixMseMetResidueList, _entryD, prevEntityD, prevInstanceD, _statisticsMap, \
|
|
509
|
+
_depSeqAssign, _seqAssign = self.__readJsonObject(tmpPolyLinkPath)
|
|
510
|
+
#
|
|
491
511
|
if not ok:
|
|
492
512
|
return {}, [], []
|
|
493
513
|
#
|
|
@@ -960,9 +980,8 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
|
|
|
960
980
|
#
|
|
961
981
|
return rList, rList, []
|
|
962
982
|
|
|
963
|
-
def __createSeqMatchFileAndMisMatchPickleFile(
|
|
964
|
-
|
|
965
|
-
):
|
|
983
|
+
def __createSeqMatchFileAndMisMatchPickleFile(self, sortedEntityIdList, entityD, ownRefD, eSSRefD, prevEntityIdList, prevMisMatchList, \
|
|
984
|
+
prevNotFoundMatchList, seqSimilarityInfoList, mixMseMetResidueList):
|
|
966
985
|
"""Create D_xxxxxxxxxx_seqmatch_P1.cif.Vx file"""
|
|
967
986
|
annList = []
|
|
968
987
|
misMatchList = []
|
|
@@ -1035,6 +1054,7 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
|
|
|
1035
1054
|
#
|
|
1036
1055
|
warningMsgMap["mismatch"] = misMatchList
|
|
1037
1056
|
warningMsgMap["not_found_existing_match"] = notFoundMatchList
|
|
1057
|
+
warningMsgMap["mix_mse_met"] = mixMseMetResidueList
|
|
1038
1058
|
#
|
|
1039
1059
|
fb = open(self.__misMatchPath, "wb")
|
|
1040
1060
|
pickle.dump(warningMsgMap, fb)
|
|
@@ -204,7 +204,6 @@ class SummaryView(object):
|
|
|
204
204
|
#
|
|
205
205
|
if self.__verbose:
|
|
206
206
|
self.__lfh.write("+SummaryView.__loadSummary() with sessionId %s\n" % self.__sessionObj.getId())
|
|
207
|
-
|
|
208
207
|
#
|
|
209
208
|
summaryDataObj = {}
|
|
210
209
|
#
|
|
@@ -216,11 +215,12 @@ class SummaryView(object):
|
|
|
216
215
|
self.__lfh.write("+SummaryView.__loadSummary() starting alignment list %r\n" % self.__summarySeqAlignList)
|
|
217
216
|
#
|
|
218
217
|
polyAlaCaseList = []
|
|
218
|
+
warningMsg = ""
|
|
219
219
|
for gId in gIdList:
|
|
220
220
|
#
|
|
221
221
|
summaryDataObj[gId] = {}
|
|
222
222
|
#
|
|
223
|
-
dT, polyALA_assignment, authSummaryPageD, method, polyType, dbAccessionList = self.__buildAuthSection(groupId=gId, op=op)
|
|
223
|
+
dT, polyALA_assignment, authSummaryPageD, method, polyType, dbAccessionList, seqLength = self.__buildAuthSection(groupId=gId, op=op)
|
|
224
224
|
if polyALA_assignment > 0:
|
|
225
225
|
polyAlaCaseList.append((gId, polyALA_assignment))
|
|
226
226
|
#
|
|
@@ -229,7 +229,11 @@ class SummaryView(object):
|
|
|
229
229
|
rL, withGapScoreList, withoutGapScoreList, hitDbInfoList, hitDbIdList, authTaxIdList = self.__buildReferenceSection(groupId=gId)
|
|
230
230
|
summaryDataObj[gId]["ref"] = rL
|
|
231
231
|
#
|
|
232
|
-
summaryDataObj[gId]["xyz"] = self.__buildCoordinateSection(groupId=gId)
|
|
232
|
+
summaryDataObj[gId]["xyz"],missingResidueInfoList = self.__buildCoordinateSection(groupId=gId, authSeqLength=seqLength)
|
|
233
|
+
if len(missingResidueInfoList) > 0:
|
|
234
|
+
for missingInfo in missingResidueInfoList:
|
|
235
|
+
warningMsg += missingInfo + "<br />\n"
|
|
236
|
+
#
|
|
233
237
|
#
|
|
234
238
|
decoration_start = ""
|
|
235
239
|
decoration_end = ""
|
|
@@ -323,8 +327,10 @@ class SummaryView(object):
|
|
|
323
327
|
#
|
|
324
328
|
self.__finish()
|
|
325
329
|
#
|
|
326
|
-
warningMsg = ""
|
|
327
330
|
if len(self.__natureSourceTaxIds) > 1:
|
|
331
|
+
if warningMsg:
|
|
332
|
+
warningMsg += "<br />\n"
|
|
333
|
+
#
|
|
328
334
|
warningMsg += "Entry contains multiple natural sources:<br />\n"
|
|
329
335
|
for k, v in self.__natureSourceTaxIds.items():
|
|
330
336
|
if len(v) > 1:
|
|
@@ -387,13 +393,13 @@ class SummaryView(object):
|
|
|
387
393
|
#
|
|
388
394
|
# Get polyALA_assignment
|
|
389
395
|
#
|
|
390
|
-
polyALA_assignment, method, polyType = self.__checkPolyAlaAssignment(seqId=groupId, partId=partIdList[0], altId=altId, version=verList[0])
|
|
396
|
+
polyALA_assignment, method, polyType, seqLength = self.__checkPolyAlaAssignment(seqId=groupId, partId=partIdList[0], altId=altId, version=verList[0])
|
|
391
397
|
#
|
|
392
398
|
summaryPageD = self.__getSummaryPageInfo(seqId=groupId, partIdList=partIdList, altId=altId)
|
|
393
399
|
#
|
|
394
|
-
return dT, polyALA_assignment, summaryPageD, method, polyType, dbAccessionList
|
|
400
|
+
return dT, polyALA_assignment, summaryPageD, method, polyType, dbAccessionList, seqLength
|
|
395
401
|
|
|
396
|
-
def __buildCoordinateSection(self, groupId=None):
|
|
402
|
+
def __buildCoordinateSection(self, groupId=None, authSeqLength=0):
|
|
397
403
|
"""Assemble the data content for the coordinate sequence summary view.
|
|
398
404
|
|
|
399
405
|
Returns: summaryDataObject
|
|
@@ -401,15 +407,15 @@ class SummaryView(object):
|
|
|
401
407
|
"""
|
|
402
408
|
seqLabel = SequenceLabel()
|
|
403
409
|
seqFeature = SequenceFeature()
|
|
404
|
-
|
|
405
410
|
#
|
|
406
411
|
# For each coordinate sequence -
|
|
407
412
|
#
|
|
408
413
|
seqIdList = self.__sds.getGroup(groupId)
|
|
409
|
-
|
|
414
|
+
#
|
|
410
415
|
rowIdList = []
|
|
411
416
|
rowStatusList = []
|
|
412
417
|
rowDataDictList = []
|
|
418
|
+
missingResidueInfoList = []
|
|
413
419
|
#
|
|
414
420
|
partId = 1
|
|
415
421
|
altId = 1
|
|
@@ -417,15 +423,16 @@ class SummaryView(object):
|
|
|
417
423
|
verList = self.__sds.getVersionIds(seqId=seqId, partId=partId, altId=altId, dataType="sequence", seqType="xyz")
|
|
418
424
|
if len(verList) < 1:
|
|
419
425
|
continue
|
|
426
|
+
#
|
|
420
427
|
maxVrsnNum = verList[0]
|
|
421
428
|
seqLabel.set(seqType="xyz", seqInstId=seqId, seqPartId=partId, seqAltId=altId, seqVersion=maxVrsnNum)
|
|
422
429
|
maxSeqXyzId = seqLabel.pack()
|
|
423
|
-
|
|
430
|
+
#
|
|
424
431
|
# select the highest version sequence
|
|
425
432
|
if not (maxSeqXyzId in self.__summarySeqSelectList):
|
|
426
433
|
self.__summarySeqSelectList.append(maxSeqXyzId)
|
|
427
434
|
self.__summarySeqAlignList.append(maxSeqXyzId)
|
|
428
|
-
|
|
435
|
+
#
|
|
429
436
|
for ver in verList:
|
|
430
437
|
seqXyz = self.__sds.getSequence(seqId, "xyz", partId=partId, altId=altId, version=ver)
|
|
431
438
|
seqXyzFD = self.__sds.getFeature(seqId, "xyz", partId=partId, altId=altId, version=ver)
|
|
@@ -450,6 +457,11 @@ class SummaryView(object):
|
|
|
450
457
|
# JDW add instance here to provide a selection group
|
|
451
458
|
if ver == maxVrsnNum:
|
|
452
459
|
rowStatusList.append((isSelected, isAligned, seqId, "maxver"))
|
|
460
|
+
if (authSeqLength > 0) and ((authSeqLength * 3) >= (10 * len(seqXyz))):
|
|
461
|
+
percent = float((authSeqLength - len(seqXyz)) * 100) / float(authSeqLength)
|
|
462
|
+
missingResidueInfoList.append("%.1f" % percent + "% residues of chain '" + seqId + "' are missing in coordinates (%d/%d)." % \
|
|
463
|
+
(len(seqXyz), authSeqLength))
|
|
464
|
+
#
|
|
453
465
|
else:
|
|
454
466
|
rowStatusList.append((isSelected, isAligned, seqId, ""))
|
|
455
467
|
#
|
|
@@ -460,12 +472,13 @@ class SummaryView(object):
|
|
|
460
472
|
rowDataDict["ROW_DETAIL_STRING"] = detailString
|
|
461
473
|
rowDataDict.update(seqXyzFD)
|
|
462
474
|
rowDataDictList.append(rowDataDict)
|
|
475
|
+
#
|
|
463
476
|
#
|
|
464
477
|
dT = {}
|
|
465
478
|
dT["ROW_IDS"] = rowIdList
|
|
466
479
|
dT["ROW_STATUS"] = rowStatusList
|
|
467
480
|
dT["ROW_DATA_DICT"] = rowDataDictList
|
|
468
|
-
return dT
|
|
481
|
+
return dT,missingResidueInfoList
|
|
469
482
|
|
|
470
483
|
def __buildReferenceSection(self, groupId=None):
|
|
471
484
|
"""Assemble the data content for the reference sequence summary view.
|
|
@@ -743,7 +756,7 @@ class SummaryView(object):
|
|
|
743
756
|
elif has_consecutive_ALA:
|
|
744
757
|
return 2, authFObj.getEntitySourceMethod(), authFObj.getPolymerLinkingType()
|
|
745
758
|
#
|
|
746
|
-
return 0, authFObj.getEntitySourceMethod(), authFObj.getPolymerLinkingType()
|
|
759
|
+
return 0, authFObj.getEntitySourceMethod(), authFObj.getPolymerLinkingType(), len(seqAuth)
|
|
747
760
|
|
|
748
761
|
def __getSummaryPageInfo(self, seqId="1", partIdList=None, altId=1):
|
|
749
762
|
"""
|
|
@@ -549,6 +549,7 @@ class GetSameSeqAnnotation(object):
|
|
|
549
549
|
authIdx = -1
|
|
550
550
|
refIdx = -1
|
|
551
551
|
alignLength = 0
|
|
552
|
+
seqLength = 0
|
|
552
553
|
numMatch = 0
|
|
553
554
|
numMatchGaps = 0
|
|
554
555
|
alignmentList = []
|
|
@@ -558,6 +559,7 @@ class GetSameSeqAnnotation(object):
|
|
|
558
559
|
if matchTup[0] != self.__gapSymbol:
|
|
559
560
|
authIdx += 1
|
|
560
561
|
currAuthIdx = authIdx
|
|
562
|
+
seqLength += 1
|
|
561
563
|
#
|
|
562
564
|
alignTup = []
|
|
563
565
|
if matchTup[4] == partTup[0]:
|
|
@@ -580,7 +582,7 @@ class GetSameSeqAnnotation(object):
|
|
|
580
582
|
#
|
|
581
583
|
alignmentList.append(alignTup)
|
|
582
584
|
#
|
|
583
|
-
alignmentMap[partTup[0]] = (alignmentList, (alignLength, float(numMatch) / float(alignLength), float(numMatchGaps) / float(
|
|
585
|
+
alignmentMap[partTup[0]] = (alignmentList, (alignLength, float(numMatch) / float(alignLength), float(numMatchGaps) / float(seqLength)), sTup3L)
|
|
584
586
|
#
|
|
585
587
|
return alignmentMap
|
|
586
588
|
|
|
@@ -415,7 +415,7 @@ class UpdateSequenceDataStoreUtils(object):
|
|
|
415
415
|
rList.extend(autoList)
|
|
416
416
|
#
|
|
417
417
|
if (len(rList) > 0) and (not selfRefFlag):
|
|
418
|
-
if ("statistics" in rList[-1]) and (rList[-1]["statistics"][2] > 0.899999):
|
|
418
|
+
if (("statistics" in rList[-1]) and (rList[-1]["statistics"][2] > 0.899999)) or (len(autoList) > 0):
|
|
419
419
|
self.__seqLabel.set(seqType="ref", seqInstId=sId, seqPartId=partNo, seqAltId=len(rList), seqVersion=1)
|
|
420
420
|
self.__defSelList.append(self.__seqLabel.pack())
|
|
421
421
|
ref_label[partNo] = [self.__seqLabel.pack()]
|
|
@@ -947,6 +947,14 @@ class SeqModWebAppWorker(object):
|
|
|
947
947
|
warningMsg += "Sequences not matched to existing entries in entity: " + warningD["not_found_existing_match"][0]
|
|
948
948
|
#
|
|
949
949
|
#
|
|
950
|
+
if ("mix_mse_met" in warningD) and len(warningD["mix_mse_met"]) > 0:
|
|
951
|
+
for textMsg in warningD["mix_mse_met"]:
|
|
952
|
+
if warningMsg:
|
|
953
|
+
warningMsg += "</br>\n"
|
|
954
|
+
#
|
|
955
|
+
warningMsg += textMsg
|
|
956
|
+
#
|
|
957
|
+
#
|
|
950
958
|
if warningMsg:
|
|
951
959
|
rC.set("entrywarningmessage", warningMsg)
|
|
952
960
|
#
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|