django-to-galaxy 0.6.9__tar.gz → 0.6.9.2__tar.gz

{django_to_galaxy-0.6.9 → django_to_galaxy-0.6.9.2}/PKG-INFO

@@ -1,16 +1,14 @@
 Metadata-Version: 2.1
 Name: django-to-galaxy
-Version: 0.6.9
+Version: 0.6.9.2
 Summary: Django extension that eases communication with Galaxy instance to execute workflows.
 Author: Kenzo-Hugo Hillion
 Author-email: hillion.kenzo@posteo.net
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.11,<4.0
 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: Django (>=5.1.1,<6.0.0)
 Requires-Dist: Markdown (>=3.3.6,<4.0.0)
 Requires-Dist: bioblend (>=0.16.0,<0.17.0)
 Requires-Dist: djangorestframework (>=3.13.1,<4.0.0)

{django_to_galaxy-0.6.9 → django_to_galaxy-0.6.9.2}/django_to_galaxy/api/views/invoke_workflow.py

@@ -70,11 +70,23 @@ class GetWorkflowDatamapTemplateView(RetrieveAPIView):
     def get(self, request, *args, **kwargs):
         instance = self.get_object()
         inputs = instance.galaxy_workflow.inputs
+        steps = instance.galaxy_workflow.steps
         input_mapping = {}
         datamap_template = {}
         for input_id, input_dict in inputs.items():
-            input_mapping[input_id] = input_dict["label"]
-            datamap_template[input_id] = {"id": "", "src": "hda"}
+            input_mapping[input_id] = {}
+            input_mapping[input_id]["label"] = input_dict["label"]
+            input_mapping[input_id]["type"] = steps[input_id].type
+            input_mapping[input_id]["tool_inputs"] = steps[input_id].tool_inputs
+
+            if steps[input_id].type == "parameter_input":
+                datamap_template[input_id] = input_mapping[input_id]["tool_inputs"][
+                    "parameter_type"
+                ]
+            else:
+                datamap_template[input_id] = {"id": "", "src": "hda"}
+            # TODO: Add template for a collection input
+
         return Response(
             data={"input_mapping": input_mapping, "datamap_template": datamap_template}
         )

{django_to_galaxy-0.6.9 → django_to_galaxy-0.6.9.2}/django_to_galaxy/version.py

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

{django_to_galaxy-0.6.9 → django_to_galaxy-0.6.9.2}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "django-to-galaxy"
-version = "0.6.9"
+version = "0.6.9.2"
 description = "Django extension that eases communication with Galaxy instance to execute workflows."
 authors = ["Kenzo-Hugo Hillion <hillion.kenzo@posteo.net>"]
 
 [tool.poetry.dependencies]
-python = "^3.9"
-Django = "^4.0.3"
+python = "^3.11"
+Django = "^5.1.1"
 bioblend = "^0.16.0"
 djangorestframework = "^3.13.1"
 Markdown = "^3.3.6"
@@ -14,11 +14,11 @@ pydantic = "^1.9.1"
 requests-cache = "^0.9.5"
 
 [tool.poetry.dev-dependencies]
-pytest = "^5.2"
+pytest = "^6.2.5"
 flake8 = "^4.0.1"
 black = "^22.3.0"
 pytest-cov = "^3.0.0"
-invoke = "^1.7.0"
+invoke = "^2.2.0"
 ipython = "^8.2.0"
 drf-yasg = "^1.20.0"
 Sphinx = "^5.0.2"