wwpdb.apps.seqmodule 0.26.9__tar.gz → 0.27.0__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.
Files changed (73) hide show
  1. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/PKG-INFO +1 -1
  2. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/__init__.py +1 -1
  3. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/SequenceDataAssemble_v2.py +2 -79
  4. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/LocalBlastSearchUtils.py +6 -2
  5. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb.apps.seqmodule.egg-info/PKG-INFO +1 -1
  6. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/README.md +0 -0
  7. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/setup.cfg +0 -0
  8. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/setup.py +0 -0
  9. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/__init__.py +0 -0
  10. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/__init__.py +0 -0
  11. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/AlignmentBackEndEditingTools.py +0 -0
  12. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/AlignmentDepictionTools.py +0 -0
  13. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/AlignmentExport.py +0 -0
  14. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/AlignmentFrontEndUIEditor.py +0 -0
  15. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/AlignmentStatistics.py +0 -0
  16. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/AlignmentStatisticsTests.py +0 -0
  17. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/AlignmentToolUtils.py +0 -0
  18. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/AlignmentTools.py +0 -0
  19. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/align/__init__.py +0 -0
  20. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/DataImporter.py +0 -0
  21. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/SequenceDataAssembleExample.py +0 -0
  22. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/SequenceDataAssembleTests.py +0 -0
  23. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/SequenceDataPrepTests.py +0 -0
  24. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/SummaryViewDepiction.py +0 -0
  25. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/SummaryViewTests.py +0 -0
  26. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/SummaryView_v2.py +0 -0
  27. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/control/__init__.py +0 -0
  28. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/AlignmentDataStore.py +0 -0
  29. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/BlastPlusReader.py +0 -0
  30. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/FetchSeqInfoUtils.py +0 -0
  31. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/ModelSequenceUtils.py +0 -0
  32. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/ModelSequenceUtilsTests.py +0 -0
  33. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/PdbxIoUtils.py +0 -0
  34. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/SequenceDataExportTests.py +0 -0
  35. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/SequenceDataExport_v2.py +0 -0
  36. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/SequenceDataStore.py +0 -0
  37. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/SequenceDataStoreTests.py +0 -0
  38. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/SequenceEditStore.py +0 -0
  39. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/SequenceEditStoreTests.py +0 -0
  40. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/TaxonomyDbUtils.py +0 -0
  41. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/TaxonomyUtils.py +0 -0
  42. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/TaxonomyUtilsTests.py +0 -0
  43. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/__init__.py +0 -0
  44. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/io/testAuto.py +0 -0
  45. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/link/PolymerLinkageDepict.py +0 -0
  46. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/link/__init__.py +0 -0
  47. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/update/UpdatePolymerEntityPartitions.py +0 -0
  48. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/update/UpdatePolymerEntityReference_v2.py +0 -0
  49. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/update/UpdatePolymerEntitySourceDetails.py +0 -0
  50. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/update/__init__.py +0 -0
  51. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/Autodict.py +0 -0
  52. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/FetchReferenceSequenceUtils.py +0 -0
  53. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/GetSameSeqAnnotationWithTaxIdOnly.py +0 -0
  54. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/MultiProcLimit.py +0 -0
  55. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/SearchEntityPolySeqs.py +0 -0
  56. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/SeqReferenceSearchUtils.py +0 -0
  57. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/SequenceAssign.py +0 -0
  58. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/SequenceExamples.py +0 -0
  59. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/SequenceFeatureDepict.py +0 -0
  60. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/SequenceLabel.py +0 -0
  61. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/SequenceReferenceData.py +0 -0
  62. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/UpdateSequenceDataStoreUtils.py +0 -0
  63. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/util/__init__.py +0 -0
  64. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/view3d/ModelViewer3D.py +0 -0
  65. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/view3d/__init__.py +0 -0
  66. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/webapp/SeqModWebApp_v2.py +0 -0
  67. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/webapp/SeqModWebRequest.py +0 -0
  68. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb/apps/seqmodule/webapp/__init__.py +0 -0
  69. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb.apps.seqmodule.egg-info/SOURCES.txt +0 -0
  70. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb.apps.seqmodule.egg-info/dependency_links.txt +0 -0
  71. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb.apps.seqmodule.egg-info/not-zip-safe +0 -0
  72. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb.apps.seqmodule.egg-info/requires.txt +0 -0
  73. {wwpdb.apps.seqmodule-0.26.9 → wwpdb.apps.seqmodule-0.27.0}/wwpdb.apps.seqmodule.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: wwpdb.apps.seqmodule
3
- Version: 0.26.9
3
+ Version: 0.27.0
4
4
  Summary: wwPDB sequence module
5
5
  Home-page: https://github.com/wwPDB/py-wwpdb_apps_seqmodule
6
6
  Author: Ezra Peisach
@@ -2,4 +2,4 @@ __docformat__ = "restructuredtext en"
2
2
  __author__ = "Ezra Peisach"
3
3
  __email__ = "ezra.peisach@rcsb.org"
4
4
  __license__ = "Apache 2.0"
5
- __version__ = "0.26.9"
5
+ __version__ = "0.27.0"
@@ -113,7 +113,8 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
113
113
  self.__doRefSearchFlag = doRefSearch
114
114
  #
115
115
  if self._verbose:
116
- self._lfh.write("\n+SequenceDataAssemble.doAssemble() STARTING with depId %r calPolyLink %r doRefSearch %r\n" % (self.__dataSetId, calPolyLink, doRefSearch))
116
+ self._lfh.write("\n+SequenceDataAssemble.doAssemble() STARTING with depId %r calPolyLink %r doRefSearch %r doAutoProcess %r\n" %
117
+ (self.__dataSetId, calPolyLink, doRefSearch, doAutoProcess))
117
118
  #
118
119
  pdbxFilePath = self.__pI.getModelPdbxFilePath(self.__dataSetId, fileSource="session", versionId="1")
119
120
  polyLinkPath = self.__pI.getFilePath(self.__dataSetId, contentType="polymer-linkage-distances", formatType="json", fileSource="session")
@@ -720,8 +721,6 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
720
721
  #
721
722
  return {}, {}, {}
722
723
  #
723
- # refD,ownRefD,otherRefD = self.__runSeqAllSearches(entityTupList)
724
- #
725
724
  if withRefFlag and (len(entityTupList) == 1):
726
725
  seqSearchUtil = LocalBlastSearchUtils(siteId=self.__siteId, sessionPath=self.__sessionPath, pathInfo=self.__pI,
727
726
  doRefSearchFlag=self.__doRefSearchFlag, verbose=self._verbose, log=self._lfh)
@@ -811,82 +810,6 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
811
810
  #
812
811
  return {}, {}, {}
813
812
 
814
- # def __runSeqAllSearches(self, entityTupList):
815
- # """Perform all searches of the reference sequences"""
816
- # try:
817
- # startTime = time.time()
818
- # #
819
- # if self.__cI.get("USE_COMPUTE_CLUSTER"):
820
- # numProc = len(entityTupList)
821
- # else:
822
- # numProc = int(multiprocessing.cpu_count() / 2)
823
- # mpu = MultiProcUtil(verbose=True)
824
- # mpu.set(workerObj=self, workerMethod="runMultiReferenceSearches")
825
- # mpu.setWorkingDir(self.__sessionPath)
826
- # #
827
- # # Setup limits for NCBI requets
828
- # apikey = self.__cI.get("NCBI_API_KEY")
829
- # apirate = self.__cI.get("NCBI_API_RATE")
830
- # if apikey:
831
- # if apirate:
832
- # rate = int(apirate)
833
- # else:
834
- # rate = 5
835
- # #
836
- # else:
837
- # rate = 1
838
- # #
839
- # mpl = MultiProcLimit(rate)
840
- # mpu.setOptions({"ncbilock": mpl})
841
- # #
842
- # _ok, _failList, retLists, _diagList = mpu.runMulti(dataList=entityTupList, numProc=numProc, numResults=1)
843
- # #
844
- # refD = {}
845
- # ownRefD = {}
846
- # otherRefD = {}
847
- # for tupList in retLists:
848
- # for tup in tupList:
849
- # if tup[1]:
850
- # refD[tup[0]] = tup[1]
851
- # #
852
- # if tup[2]:
853
- # ownRefD[tup[0]] = tup[2]
854
- # #
855
- # if tup[3]:
856
- # otherRefD[tup[0]] = tup[3]
857
- # #
858
- # #
859
- # #
860
- # if self._verbose:
861
- # endTime = time.time()
862
- # self._lfh.write(
863
- # "+SequenceDataAssemble.__runSeqAllSearches() completed at %s (%.2f seconds)\n" % (time.strftime("%Y %m %d %H:%M:%S", time.localtime()), endTime - startTime)
864
- # )
865
- # #
866
- # return refD, ownRefD, otherRefD
867
- # except: # noqa: E722 pylint: disable=bare-except
868
- # if self._verbose:
869
- # self._lfh.write("+SequenceDataAssemble.__runSeqAllSearches() - failing \n")
870
- # traceback.print_exc(file=self._lfh)
871
- # #
872
- # #
873
- # return {}, {}, {}
874
-
875
- # EP: Believe unused
876
- # def runMultiReferenceSearches(self, dataList, procName, optionsD, workingDir): # pylint: disable=unused-argument
877
- # """Multiple reference sequence search processing API"""
878
- # ncbilock = optionsD.get("ncbilock", None)
879
- # rList = []
880
- # for tupL in dataList:
881
- # seqSearchUtil = SeqReferenceSearchUtils(
882
- # siteId=self.__siteId, sessionPath=self.__sessionPath, pathInfo=self.__pI, verbose=self._verbose, log=self._lfh, ncbilock=ncbilock
883
- # )
884
- # eRefD, selfRefD, sameSeqRefD = seqSearchUtil.run(self.__dataSetId, tupL[1], tupL[2], self.__doRefSearchFlag, self.__forceBlastSearchFlag)
885
- # rList.append((tupL[0], eRefD, selfRefD, sameSeqRefD))
886
- # #
887
- # #
888
- # return rList, rList, []
889
-
890
813
  def __runSameSeqAnnotationSearch(self, entityTupList):
891
814
  """Search same sequence annotation information from processed entries"""
892
815
  try:
@@ -965,6 +965,7 @@ class LocalBlastSearchUtils(object):
965
965
  if "non_isoform_score" not in hit:
966
966
  hit["non_isoform_score"] = 1
967
967
  #
968
+ hit["db_score"] = 0
968
969
  if fullScoreFlag or ("identity_score" not in hit):
969
970
  hit["identity_score"] = (float(hit["identity"]) - float(hit["gaps"])) * 100.0 / float(hit["query_length"])
970
971
  hit["sorting_score"] = hit["identity_score"]
@@ -980,8 +981,6 @@ class LocalBlastSearchUtils(object):
980
981
  #
981
982
  if hit["db_name"] == "SP":
982
983
  hit["db_score"] = 1
983
- else:
984
- hit["db_score"] = 0
985
984
  #
986
985
  #
987
986
  if self.__authRefIdList and ((hit["db_code"].strip().upper() in self.__authRefIdList) or (hit["db_accession"].strip().upper() in
@@ -1016,6 +1015,11 @@ class LocalBlastSearchUtils(object):
1016
1015
  taxidMatch = 1
1017
1016
  #
1018
1017
  #
1018
+ # Add the following modification per request by DAOTHER-8863
1019
+ #
1020
+ if (hit["db_score"] == 1) and (taxidMatch > 0):
1021
+ taxidMatch = 3
1022
+ #
1019
1023
  hit["taxid_match"] = taxidMatch
1020
1024
  if fullScoreFlag and (taxidMatch == 3):
1021
1025
  if hit["identity_score"] > highest_identity_score_with_taxid_match:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: wwpdb.apps.seqmodule
3
- Version: 0.26.9
3
+ Version: 0.27.0
4
4
  Summary: wwPDB sequence module
5
5
  Home-page: https://github.com/wwPDB/py-wwpdb_apps_seqmodule
6
6
  Author: Ezra Peisach