Accept path and job_key both as query and form parameters for POST requests to /api/jobs/{job_id}/files

Pulsar formats the `path` and `job_key` parameters as query parameters when submitting POST requests to `/api/jobs/{job_id}/files`. However, many Galaxy tests format them as form parameters. The only way to keep the endpoint working as it should (as it worked before the migration to FastAPI) is to accept both query and form parameters.

Author: kysrpex

client/src/api/schema/schema.ts

@@ -6682,15 +6682,15 @@ export interface components {
              */
             file?: string;
             /**
-             * Job Key
+             * Job Key Form
              * @description A key used to authenticate this request as acting on behalf or a job runner for the specified job.
              */
-            job_key: string;
+            job_key_form?: string | null;
             /**
-             * Path
+             * Path Form
              * @description Path to file to create.
              */
-            path: string;
+            path_form?: string | null;
             /** Session Id */
             session_id?: string;
         };
@@ -31288,7 +31288,12 @@ export interface operations {
     };
     create_api_jobs__job_id__files_post: {
         parameters: {
-            query?: never;
+            query?: {
+                /** @description Path to file to create. */
+                path?: string | null;
+                /** @description A key used to authenticate this request as acting on behalf or a job runner for the specified job. */
+                job_key?: string | null;
+            };
             header?: {
                 /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
                 "run-as"?: string | null;
@@ -31299,7 +31304,7 @@ export interface operations {
             };
             cookie?: never;
         };
-        requestBody: {
+        requestBody?: {
             content: {
                 "multipart/form-data": components["schemas"]["Body_create_api_jobs__job_id__files_post"];
             };

lib/galaxy/webapps/galaxy/api/job_files.py

@@ -18,8 +18,10 @@
     Form,
     Path,
     Query,
+    Request,
     UploadFile,
 )
+from fastapi.params import Depends
 from typing_extensions import Annotated
 
 from galaxy import (
@@ -48,6 +50,54 @@
 )
 
 
+def path_query_or_form(
+    request: Request,
+    path_query: Annotated[Optional[str], Query(alias="path", description="Path to file to create.")] = None,
+    path_form: Annotated[Optional[str], Form(alias="path", description="Path to file to create.")] = None,
+):
+    """
+    Accept `path` parameter both in query and form format.
+
+    This method does not force the client to provide the parameter, it could simply not submit the parameter in either
+    format. To force the client to provide the parameter, coerce the output of the method to a string, i.e.
+    `path: str = Depends(path_query_or_form)` so that FastAPI responds with status code 500 when the parameter is not
+    provided.
+    """
+    return path_query or path_form
+
+
+def job_key_query_or_form(
+    request: Request,
+    job_key_query: Annotated[
+        Optional[str],
+        Query(
+            alias="job_key",
+            description=(
+                "A key used to authenticate this request as acting on behalf or a job runner for the specified job."
+            ),
+        ),
+    ] = None,
+    job_key_form: Annotated[
+        Optional[str],
+        Form(
+            alias="job_key",
+            description=(
+                "A key used to authenticate this request as acting on behalf or a job runner for the specified job."
+            ),
+        ),
+    ] = None,
+):
+    """
+    Accept `job_key` parameter both in query and form format.
+
+    This method does not force the client to provide the parameter, it could simply not submit the parameter in either
+    format. To force the client to provide the parameter, coerce the output of the method to a string, i.e.
+    `job_key: str = Depends(job_key_query_or_form)` so that FastAPI responds with status code 500 when the parameter is
+    not provided.
+    """
+    return job_key_query or job_key_form
+
+
 @router.cbv
 class FastAPIJobFiles:
     """
@@ -139,15 +189,8 @@ def index(
     def create(
         self,
         job_id: Annotated[str, Path(description="Encoded id string of the job.")],
-        path: Annotated[str, Form(description="Path to file to create.")],
-        job_key: Annotated[
-            str,
-            Form(
-                description=(
-                    "A key used to authenticate this request as acting on behalf or a job runner for the specified job."
-                )
-            ),
-        ],
+        path: Annotated[str, Depends(path_query_or_form)],
+        job_key: Annotated[str, Depends(job_key_query_or_form)],
         file: UploadFile = File(None, description="Contents of the file to create."),
         session_id: str = Form(None),
         nginx_upload_module_file_path: str = Form(