django-to-galaxy 0.6.9.4__py3-none-any.whl → 0.6.9.5__py3-none-any.whl

django_to_galaxy/models/history.py

@@ -46,7 +46,7 @@ class History(GalaxyElement):
 
     def delete(self, **kwargs):
         """Overloaded method to also delete history on Galaxy side."""
-        self.galaxy_owner.obj_gi.histories.delete(id_=self.galaxy_id)
+        self.galaxy_owner.obj_gi.histories.delete(id_=self.galaxy_id, purge=True)
         return super().delete(**kwargs)
 
     def synchronize(self):

django_to_galaxy/models/invocation.py

@@ -12,7 +12,6 @@ from django_to_galaxy.utils import enabled_cache
 
 from django.core.exceptions import ObjectDoesNotExist
 
-READY = "ready"
 RUNNING = "running"
 DONE = "done"
 ERROR = "error"
@@ -75,19 +74,17 @@ class Invocation(models.Model):
         """Get galaxy object using bioblend."""
         return self.workflow.galaxy_owner.obj_gi.invocations.get(self.galaxy_id)
 
-    def complet_jobs_summary(self, step, subworkflow_invocation_state):
+    def complet_jobs_summary(self, step):
         subinv = self.galaxy_invocation.gi.invocations.get(
             step.wrapped["subworkflow_invocation_id"]
         )
-        if subinv.state != READY or not subinv.steps:
-            subworkflow_invocation_state = subinv.state
         sub_jobs_summary = subinv.step_jobs_summary()
         for job in sub_jobs_summary:
             self.step_jobs_summary.append(job)
         for sub in subinv.steps:
             if "subworkflow_invocation_id" in sub.wrapped:
                 if sub.wrapped["subworkflow_invocation_id"]:
-                    self.complet_jobs_summary(sub, subworkflow_invocation_state)
+                    self.complet_jobs_summary(sub)
 
     @property
     def percentage_done(self) -> float:
@@ -96,13 +93,10 @@ class Invocation(models.Model):
             return 100.0
         self.step_jobs_summary = self.step_jobs_summary()
 
-        subworkflow_invocation_state = None
-        if self.galaxy_invocation.state != READY:
-            subworkflow_invocation_state = PAUSED
         for step in self.galaxy_invocation.steps:
             if "subworkflow_invocation_id" in step.wrapped:
                 if step.wrapped["subworkflow_invocation_id"]:
-                    self.complet_jobs_summary(step, subworkflow_invocation_state)
+                    self.complet_jobs_summary(step)
 
         count_states = defaultdict(int)
         for step in self.step_jobs_summary:
@@ -112,7 +106,7 @@ class Invocation(models.Model):
             percentage_done = count_states.get("ok", 0) / len(self.step_jobs_summary)
         except ZeroDivisionError:
             percentage_done = 0
-        if percentage_done == 1 and subworkflow_invocation_state is None:
+        if percentage_done == 1:
             self.status = DONE
             self.save()
         if "error" in count_states.keys():

django_to_galaxy/version.py

@@ -1,3 +1,3 @@
 """Handle library versioning."""
-version_info = (0, 6, 9, 4)
+version_info = (0, 6, 9, 5)
 __version__ = ".".join(str(c) for c in version_info)

{django_to_galaxy-0.6.9.4.dist-info → django_to_galaxy-0.6.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-to-galaxy
-Version: 0.6.9.4
+Version: 0.6.9.5
 Summary: Django extension that eases communication with Galaxy instance to execute workflows.
 Author: Kenzo-Hugo Hillion
 Author-email: hillion.kenzo@posteo.net

{django_to_galaxy-0.6.9.4.dist-info → django_to_galaxy-0.6.9.5.dist-info}/RECORD

@@ -45,8 +45,8 @@ django_to_galaxy/models/galaxy_element.py,sha256=55qUtUks-rC4A7O1DFjeUUm-AN0-qNm
 django_to_galaxy/models/galaxy_instance.py,sha256=931iyrqJxK6YCbkaC6FPdqMRI_hhGQ-UokhW5-N7swk,723
 django_to_galaxy/models/galaxy_output_file.py,sha256=oAq7HZBk3svG88NagFpkpiB5TQoncbpGFxCCTFoCzyo,1915
 django_to_galaxy/models/galaxy_user.py,sha256=Cz6wmyD3PvltFi2yKEKr2z7YTsxlmnNV8xwA0Gltu_o,3264
-django_to_galaxy/models/history.py,sha256=RF661ULnSMO6wvEutZ-qVDY-9vxu-JcWiGbN7MwdVvI,2635
-django_to_galaxy/models/invocation.py,sha256=yPx0wLkVz43bGl9Ct19hZaGOM9ka5HU_RpjaYgrZC3g,8720
+django_to_galaxy/models/history.py,sha256=-u0DDrwsNprYf-CMAut4q5eu2IzWXXLoKmuBpac7DKs,2647
+django_to_galaxy/models/invocation.py,sha256=kexyKXY2I5QaPlBUs9cva1jzsN2EczIwcPKElgG6Sng,8319
 django_to_galaxy/models/workflow.py,sha256=1Ok0TSSIM-LJbaY1Vm19YVg_WwDxznbLDcXI71S_IL8,1891
 django_to_galaxy/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_to_galaxy/schemas/dataset.py,sha256=yjwLJGb487VJDXoXGg8fG_TW6TJPeyeGtd9vofU-7HI,396
@@ -54,8 +54,8 @@ django_to_galaxy/settings.py,sha256=Jn1gznlxhlu57D_cdbAhBQTTN9jq4GIb31czhQQUtJo,
 django_to_galaxy/templates/admin/import_workflows.html,sha256=YB101H99EOR8td_DzfNshhJYpXpGD9aJNh8t4mKPgEQ,2389
 django_to_galaxy/urls.py,sha256=ydMl_0qSyz8GSGkWpiSzU3khqj9mPyZacx532JybLHk,106
 django_to_galaxy/utils.py,sha256=gjUzzqfpili66CY7vFyseqHOD9vqWg_2tzWAiTe3pNE,1625
-django_to_galaxy/version.py,sha256=YspVavZCvh-ZZ7Wk2kq7lZ-f16x-8wa-uUPn_gBeCNo,114
-django_to_galaxy-0.6.9.4.dist-info/LICENSE,sha256=Er3Bp2y6Wf31e0s1-Tdu_d6Gd89FtTizmGUJzGQkWvo,34498
-django_to_galaxy-0.6.9.4.dist-info/METADATA,sha256=KNx7KeNPtDFrRkW8mZYGAjLkq7JmDQZhKPBRYnPbmQc,612
-django_to_galaxy-0.6.9.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_to_galaxy-0.6.9.4.dist-info/RECORD,,
+django_to_galaxy/version.py,sha256=-mvkaTH9aOCqLazgP3snDMg-hrtcjBkwNC0P-BhxtAY,114
+django_to_galaxy-0.6.9.5.dist-info/LICENSE,sha256=Er3Bp2y6Wf31e0s1-Tdu_d6Gd89FtTizmGUJzGQkWvo,34498
+django_to_galaxy-0.6.9.5.dist-info/METADATA,sha256=FOprcHMGUv9XcLucKaCuNjKRZkrG1audhpauvg3Dxwk,612
+django_to_galaxy-0.6.9.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_to_galaxy-0.6.9.5.dist-info/RECORD,,