django-to-galaxy 0.6.5__py3-none-any.whl → 0.6.7__py3-none-any.whl

django_to_galaxy/admin/invocation.py

@@ -36,13 +36,22 @@ class InvocationAdmin(GalaxyElementAdmin):
 
     @admin.display(description="Percentage Done")
     def display_percentage_done(self, obj):
-        return format_html(
-            """
-            <progress value="{0}" max="100"></progress>
-            <span style="font-weight:bold">{0}%</span>
-            """,
-            obj.percentage_done,
-        )
+        try:
+            return format_html(
+                """
+                <progress value="{0}" max="100"></progress>
+                <span style="font-weight:bold">{0}%</span>
+                """,
+                obj.percentage_done,
+            )
+        except ZeroDivisionError:
+            return format_html(
+                """
+                <progress value="{0}" max="100"></progress>
+                <span style="font-weight:bold">{0}%</span>
+                """,
+                0,
+            )
 
     def _get_message_invocation(
         self,

django_to_galaxy/models/invocation.py

@@ -59,17 +59,35 @@ 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):
+        subinv = self.galaxy_invocation.gi.invocations.get(
+            step.wrapped["subworkflow_invocation_id"]
+        )
+        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)
+
     @property
     def percentage_done(self) -> float:
         """Retrieve percentage of jobs done for the invocation."""
         if self.status == DONE:
             return 100.0
-        step_jobs_summary = self.galaxy_invocation.step_jobs_summary()
+        self.step_jobs_summary = self.galaxy_invocation.step_jobs_summary()
+
+        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)
+
         count_states = defaultdict(int)
-        for step in step_jobs_summary:
+        for step in self.step_jobs_summary:
             for key in step["states"].keys():
                 count_states[key] += 1
-        percentage_done = count_states.get("ok", 0) / len(step_jobs_summary)
+        percentage_done = count_states.get("ok", 0) / len(self.step_jobs_summary)
         if percentage_done == 1:
             self.status = DONE
             self.save()

{django_to_galaxy-0.6.5.dist-info → django_to_galaxy-0.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-to-galaxy
-Version: 0.6.5
+Version: 0.6.7
 Summary: Django extension that eases communication with Galaxy instance to execute workflows.
 Author: Kenzo-Hugo Hillion
 Author-email: hillion.kenzo@posteo.net
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: Django (>=4.0.3,<5.0.0)
 Requires-Dist: Markdown (>=3.3.6,<4.0.0)
 Requires-Dist: bioblend (>=0.16.0,<0.17.0)

{django_to_galaxy-0.6.5.dist-info → django_to_galaxy-0.6.7.dist-info}/RECORD

@@ -5,7 +5,7 @@ django_to_galaxy/admin/galaxy_instance.py,sha256=yVlbA5fVbMQBKyKwaFJM3CRFQ2HDjzY
 django_to_galaxy/admin/galaxy_output_file.py,sha256=bnpwlAH8cQe6nkWIln8iSFDtVyr0kqI5P-QNbISWCfE,2321
 django_to_galaxy/admin/galaxy_user.py,sha256=NO0qzhsk6WVnWwvXuodGPLi0o4CPbg0yTZh4VxYvH0k,7278
 django_to_galaxy/admin/history.py,sha256=eVN-ZCAju0_1ygeSnHEie3a7iy7LoW3bOhWQyU20XTw,2562
-django_to_galaxy/admin/invocation.py,sha256=Rgtkyyl2WrDZN-fF_u5lPlicGe341UGwBMbI06nZG78,4821
+django_to_galaxy/admin/invocation.py,sha256=BsVrgMlnEisGcK3ni5oBbcL__yH0PsXYUkPNkIPpEsQ,5121
 django_to_galaxy/admin/tag.py,sha256=jqQ64sLieq4CSRFHesNt33SqTNnA-z3oiQuj7Ncx_jU,315
 django_to_galaxy/admin/workflow.py,sha256=6t9z7JQPv-D7tzyi9WNUxEQXdetGlNCSzNIoX1SCAdM,1360
 django_to_galaxy/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -46,7 +46,7 @@ django_to_galaxy/models/galaxy_instance.py,sha256=931iyrqJxK6YCbkaC6FPdqMRI_hhGQ
 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=gjSdyYdyEcrDMFG-wO_Zp4wyQCpwwilCx-q9ymudbRU,6870
+django_to_galaxy/models/invocation.py,sha256=VfNeP_yplKlh0Uzx9ZYMOErpX7uH2yVOHvZhN94zN00,7620
 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
@@ -55,7 +55,7 @@ django_to_galaxy/templates/admin/import_workflows.html,sha256=YB101H99EOR8td_Dzf
 django_to_galaxy/urls.py,sha256=ydMl_0qSyz8GSGkWpiSzU3khqj9mPyZacx532JybLHk,106
 django_to_galaxy/utils.py,sha256=gjUzzqfpili66CY7vFyseqHOD9vqWg_2tzWAiTe3pNE,1625
 django_to_galaxy/version.py,sha256=O9WfyDkb-iJLGWlnKx2K7kFtcDgFCboBiFm553-3Sjk,111
-django_to_galaxy-0.6.5.dist-info/LICENSE,sha256=Er3Bp2y6Wf31e0s1-Tdu_d6Gd89FtTizmGUJzGQkWvo,34498
-django_to_galaxy-0.6.5.dist-info/METADATA,sha256=W0Qp3Rkdj1hexDNR1UT6XmN3JSse8DSNZZn7Tkzxfxs,713
-django_to_galaxy-0.6.5.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-django_to_galaxy-0.6.5.dist-info/RECORD,,
+django_to_galaxy-0.6.7.dist-info/LICENSE,sha256=Er3Bp2y6Wf31e0s1-Tdu_d6Gd89FtTizmGUJzGQkWvo,34498
+django_to_galaxy-0.6.7.dist-info/METADATA,sha256=wnFfuwrnXc-YA10ZGhBsgac0XRE5I9bojn3IhYwzO08,764
+django_to_galaxy-0.6.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_to_galaxy-0.6.7.dist-info/RECORD,,

{django_to_galaxy-0.6.5.dist-info → django_to_galaxy-0.6.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.7.0
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any