diff --git a/src/swell/tasks/base/task_base.py b/src/swell/tasks/base/task_base.py index c290dbb2..844c71ec 100644 --- a/src/swell/tasks/base/task_base.py +++ b/src/swell/tasks/base/task_base.py @@ -294,7 +294,7 @@ def task_wrapper( task: str, config: str, datetime: Union[str, dt, None], - model: str, + model: Optional[str], ensemblePacket: Optional[str] ) -> None: diff --git a/src/swell/utilities/get_channels.py b/src/swell/utilities/get_channels.py index 1f44b4ee..11aba2d1 100644 --- a/src/swell/utilities/get_channels.py +++ b/src/swell/utilities/get_channels.py @@ -56,7 +56,7 @@ def create_range_string(avail_list: list) -> str: # -------------------------------------------------------------------------------------------------- -def get_channel_list(input_dict: dict, dt_cycle_time: dt) -> Optional[list]: +def get_channel_list(input_dict: dict, dt_cycle_time: dt) -> list: ''' Function retrieves channel lists from dict loaded from a yaml file diff --git a/src/swell/utilities/render_jedi_interface_files.py b/src/swell/utilities/render_jedi_interface_files.py index c6c86a51..5e8c8af3 100644 --- a/src/swell/utilities/render_jedi_interface_files.py +++ b/src/swell/utilities/render_jedi_interface_files.py @@ -27,7 +27,7 @@ def __init__( experiment_root: str, experiment_id: str, cycle_dir: Optional[str], - cycle_time: Union[str, Datetime, None], + cycle_time: Union[Datetime, None], jedi_interface: Optional[str] = None ) -> None: diff --git a/src/swell/utilities/run_jedi_executables.py b/src/swell/utilities/run_jedi_executables.py index de79409c..66d39c33 100644 --- a/src/swell/utilities/run_jedi_executables.py +++ b/src/swell/utilities/run_jedi_executables.py @@ -11,6 +11,7 @@ import os import netCDF4 as nc from typing import Optional +import datetime from swell.utilities.shell_commands import run_track_log_subprocess from swell.utilities.logger import Logger @@ -52,7 +53,7 @@ def jedi_dictionary_iterator( jedi_rendering: JediConfigRendering, window_type: Optional[str] = None, obs: Optional[list[str]] = None, - cycle_time: Optional[str] = None, + cycle_time: Optional[datetime.datetime] = None, jedi_forecast_model: Optional[str] = None ) -> None: diff --git a/src/swell/utilities/slurm.py b/src/swell/utilities/slurm.py index e0398fd8..4d52250d 100644 --- a/src/swell/utilities/slurm.py +++ b/src/swell/utilities/slurm.py @@ -214,7 +214,7 @@ def validate_directives(directive_dict: dict) -> None: def slurm_global_defaults( - logger: Logger, + logger: Union[Logger, pyLogger], yaml_path: str = "~/.swell/swell-slurm.yaml" ) -> dict: yaml_path = os.path.expanduser(yaml_path)