Skip to content

Commit

Permalink
Revised datetime typing, other refinements
Browse files Browse the repository at this point in the history
  • Loading branch information
mranst committed Sep 16, 2024
1 parent 812990d commit c109c28
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/swell/tasks/base/task_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion src/swell/utilities/get_channels.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/swell/utilities/render_jedi_interface_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
3 changes: 2 additions & 1 deletion src/swell/utilities/run_jedi_executables.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion src/swell/utilities/slurm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c109c28

Please sign in to comment.