More linting fixes...

jmchilton · Jan 30, 2024 · eabffec · eabffec
1 parent e2454d3
commit eabffec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/lib/galaxy/tool_util/parameters/_types.py b/lib/galaxy/tool_util/parameters/_types.py
@@ -23,10 +23,10 @@
 # Compatibility
 except ImportError:
 
-    def get_args(tp: Any) -> tuple:
+    def get_args(tp: Any) -> tuple:  # type: ignore
         return getattr(tp, "__args__", ()) if tp is not Generic else Generic  # type: ignore[return-value,assignment]
 
-    def get_origin(tp: Any) -> Optional[Any]:
+    def get_origin(tp: Any) -> Optional[Any]:  # type: ignore
         return getattr(tp, "__origin__", None)
 
 

diff --git a/lib/galaxy/tool_util/parameters/models.py b/lib/galaxy/tool_util/parameters/models.py
@@ -55,7 +55,7 @@
 
 
 # could be made more specific - validators need to be classmethod
-ValidatorDictT = Dict[str, "classmethod[Any]"]
+ValidatorDictT = Dict[str, "classmethod[Any, Any, Any]"]
 
 
 class DynamicModelInformation(NamedTuple):
@@ -245,7 +245,7 @@ class MultiDataInstanceInternal(StrictModel):
 
 
 class DataTestCaseValue(StrictModel):
-    src: TestCaseDataSrcT = Field("class")
+    src: TestCaseDataSrcT
     path: str
 
 

diff --git a/lib/galaxy/webapps/galaxy/services/jobs.py b/lib/galaxy/webapps/galaxy/services/jobs.py
@@ -29,11 +29,13 @@
     view_show_job,
 )
 from galaxy.model import ToolRequest
-from galaxy.schema.fields import DecodedDatabaseIdField
+from galaxy.schema.fields import (
+    DecodedDatabaseIdField,
+    EncodedDatabaseIdField,
+)
 from galaxy.schema.jobs import JobAssociation
 from galaxy.schema.schema import (
     AsyncTaskResultSummary,
-    EncodedDatabaseIdField,
     EncodedDatasetSourceId,
     JobIndexQueryPayload,
 )
@@ -59,13 +61,13 @@
 
 
 class JobRequest(BaseModel):
-    tool_id: Optional[str] = Field(title="tool_id", description="TODO")
-    tool_uuid: Optional[str] = Field(title="tool_uuid", description="TODO")
-    tool_version: Optional[str] = Field(title="tool_version", description="TODO")
-    history_id: Optional[DecodedDatabaseIdField] = Field("history_id", description="TODO")
+    tool_id: Optional[str] = Field(default=None, title="tool_id", description="TODO")
+    tool_uuid: Optional[str] = Field(default=None, title="tool_uuid", description="TODO")
+    tool_version: Optional[str] = Field(default=None, title="tool_version", description="TODO")
+    history_id: Optional[DecodedDatabaseIdField] = Field(default=None, title="history_id", description="TODO")
     inputs: Optional[Dict[str, Any]] = Field(default_factory=lambda: {}, title="Inputs", description="TODO")
     use_cached_jobs: Optional[bool] = Field(default=None, title="use_cached_jobs")
-    rerun_remap_job_id: Optional[DecodedDatabaseIdField] = Field("rerun_remap_job_id", description="TODO")
+    rerun_remap_job_id: Optional[DecodedDatabaseIdField] = Field(default=None, title="rerun_remap_job_id", description="TODO")
     send_email_notification: bool = Field(default=False, title="Send Email Notification", description="TODO")