Merge pull request #195 from hubmapconsortium/main

DEV sync

Author: jpuerto-psc

src/example_config.json

@@ -30,13 +30,11 @@
       "user_authentication": "main_auth",
       "passthrough_domain": "127.0.0.1:8000",
       "connection_details": {},
-      "parameter_mapping": [
-          {
+      "parameter_mapping": {
             "num_cpus": "cpus_per_task",
             "memory_mb": "memory_per_node",
             "time_limit_min": "time_limit"
-          }
-      ]
+       }
     }
   },
   "available_job_types": {

src/tests/github_test_config.json

@@ -27,13 +27,11 @@
       "user_authentication": "test_auth",
       "passthrough_domain": "127.0.0.1:8000",
       "connection_details": {},
-      "parameter_mapping": [
-          {
+      "parameter_mapping": {
             "num_cpus": "cpus_per_task",
             "memory_mb": "memory_per_node",
             "time_limit_min": "time_limit"
-          }
-      ]
+            }
     }
   },
   "available_job_types": {

src/tests/unittests/test_views.py

@@ -661,22 +661,22 @@ def test_workspace_custom_params_validation_required(self):
             "job_type": "test_job",
             "job_details": {},
         }
-        response = self.client.put(
+        response_bad = self.client.put(
             reverse("workspaces_put_type", args=[self.workspace.id, "start"]),
             body,
         )
         self.assertValidResponse(
-            response,
+            response_bad,
             status.HTTP_422_UNPROCESSABLE_ENTITY,
             success=False,
             message="Invalid resource options found: ['Missing required: test_param']",
         )
         body["resource_options"] = {"test_param": "test"}
-        response = self.client.put(
+        response_good = self.client.put(
             reverse("workspaces_put_type", args=[self.workspace.id, "start"]),
             body,
         )
-        self.assertValidResponse(response, status.HTTP_200_OK, success=True)
+        self.assertValidResponse(response_good, status.HTTP_200_OK, success=True)
         self.assertEqual(
             apps.get_app_config("user_workspaces_server").parameters.pop(), test_param
         )

src/user_workspaces_server/controllers/resources/abstract_resource.py

@@ -48,3 +48,14 @@ def validate_options(self, resource_options: dict) -> bool:
             logging.error(f"Validation errors: {validator.errors}")
             raise ValidationException(f"Invalid resource options found: {validator.errors}")
         return validator.is_valid
+
+    def translate_option_name(self, option: str) -> str:
+        return self.config.get("parameter_mapping", {}).get(option)
+
+    def translate_options(self, resource_options: dict) -> dict:
+        translated_options = {}
+        for option_name, option_value in resource_options.items():
+            if updated_option_name := self.translate_option_name(option_name):
+                translated_options[updated_option_name] = option_value
+
+        return translated_options

src/user_workspaces_server/controllers/resources/slurm_api_resource.py

@@ -226,17 +226,10 @@ def get_user_token(self, external_user):
 
     def translate_options(self, resource_options):
         # Should translate the options into a format that can be used by the resource
-        updated_options = {}
-        for option_name, option_value in resource_options.items():
-            if updated_option_name := self.translate_option_name(option_name):
-                updated_options[updated_option_name] = option_value
-
+        translated_options = super().translate_options(resource_options)
         gpu_enabled = resource_options.get("gpu_enabled", False)
         if isinstance(gpu_enabled, bool) and gpu_enabled:
-            updated_options["tres_per_job"] = "gres/gpu=1"
+            translated_options["tres_per_job"] = "gres/gpu=1"
             if gpu_partition := self.config.get("gpu_partition"):
-                updated_options["partition"] = gpu_partition
-        return updated_options
-
-    def translate_option_name(self, option: str) -> str:
-        return self.config.get("parameter_mapping", {}).get(option)
+                translated_options["partition"] = gpu_partition
+        return translated_options

src/user_workspaces_server/urls.py

@@ -16,12 +16,11 @@
 
 from django.urls import include, path
 
-from user_workspaces_server.views import parameter_view
-
 from . import ws_consumers
 from .views import (
     job_type_view,
     job_view,
+    parameter_view,
     passthrough_view,
     shared_workspace_view,
     status_view,

src/user_workspaces_server/views/workspace_view.py

@@ -274,6 +274,7 @@ def put(self, request, workspace_id, put_type=None):
 
             if not resource.validate_options(resource_options):
                 raise ParseError("Invalid resource options found.")
+            translated_options = resource.translate_options(resource_options)
 
             # TODO: Check whether user has permission for this resource (and resource storage).
 
@@ -287,7 +288,7 @@ def put(self, request, workspace_id, put_type=None):
                     "request_job_details": job_details,
                     "current_job_details": {},
                 },
-                "resource_options": resource_options,
+                "resource_options": translated_options,
                 "resource_name": type(resource).__name__,
                 "status": "pending",
                 "resource_job_id": -1,

user-workspaces-spec.yaml

@@ -198,6 +198,33 @@ components:
           type: string
         success:
           type: boolean
+    ParametersResponse:
+      type: object
+      properties:
+        parameters:
+          type: array
+          items:
+            type: object
+            properties:
+              display_name:
+                type: string
+              description:
+                type: string
+              variable_name:
+                type: string
+              default_value:
+                type: integer
+              validation:
+                type: object
+                properties:
+                  type:
+                    type: string
+                  min:
+                    type: integer
+                  max:
+                    type: integer
+                  required:
+                    type: boolean
 paths:
   '/workspaces/':
     get:
@@ -457,7 +484,20 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/JobTypeResponse'
+  '/parameters/':
+    get:
+      tags:
+        - Parameters
+      summary: Get the parameters that may be passed in JSON body of request.
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ParametersResponse'
 tags:
   - name: Workspaces
   - name: Jobs
   - name: JobTypes
+  - name: Parameters