Skip to content

Fix non-git edge cases #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtrevisan merged 6 commits into from
Apr 3, 2025
Merged

Fix non-git edge cases #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f53801
slightly more general logged header
gtrevisan Apr 3, 2025
033763e
replace import of tests from main package
gtrevisan Apr 3, 2025
35b600b
minor
gtrevisan Apr 3, 2025
76d84dc
log critical error if nothing to do
gtrevisan Apr 3, 2025
05b6a4f
fixup! slightly more general logged header
gtrevisan Apr 3, 2025
94788ed
fixup! log critical error if nothing to do
gtrevisan Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions disruption_py/settings/log_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,22 +163,24 @@ def setup_logging(self):
self.reset_handlers(num_shots=None)

# header
package = "disruption_py"
package, *_ = __name__.split(".")
commit = get_commit_hash()
logger.info(
"Starting: {p} ~ v{v} # {c} / {u}@{h}",
"Starting: {p} ~ v{v}{t}{c} / {u}@{h}",
p=package,
v=importlib.metadata.version(package),
t=" # " if commit else "",
c=commit,
u=os.getenv("USER"),
h=os.uname().nodename,
)
if self.log_file_path is not None:
logger.info("Logging: {l}", l=self.log_file_path)
logger.debug(
"Repository: {r}/commit/{c}",
r="https://github.com/MIT-PSFC/disruption-py",
c=commit,
"Repository: {url}{append}{commit}",
url="https://github.com/MIT-PSFC/disruption-py",
append="/commit/" if commit else "",
commit=commit,
)
logger.debug("Executable: {e}", e=sys.executable)

Expand Down
5 changes: 1 addition & 4 deletions disruption_py/settings/retrieval_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
NicknameSetting,
resolve_nickname_setting,
)
from disruption_py.settings.time_setting import (
TimeSetting,
resolve_time_setting,
)
from disruption_py.settings.time_setting import TimeSetting, resolve_time_setting


class InterpolationMethod(Enum):
Expand Down
7 changes: 5 additions & 2 deletions disruption_py/workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from loguru import logger
from tqdm.auto import tqdm

from disruption_py.config import config
from disruption_py.core.retrieval_manager import RetrievalManager
from disruption_py.core.utils.misc import (
get_elapsed_time,
Expand All @@ -37,7 +38,6 @@
ShotlistSettingType,
shotlist_setting_runner,
)
from tests.utils.factory import get_tokamak_test_shotlist


def _execute_retrieval(args):
Expand Down Expand Up @@ -122,6 +122,9 @@ def get_shots_data(
shotlist_setting_runner(shotlist_setting, shotlist_setting_params)
)
num_processes = min(num_processes, len(shotlist_list))
if num_processes < 1:
logger.critical("Nothing to do!")
return None

# Dynamically set the console log level based on the number of shots
if log_settings.console_log_level is None:
Expand Down Expand Up @@ -235,7 +238,7 @@ def run(
if not tokamak:
tokamak = resolve_tokamak_from_environment()
if not shots:
shots, *_ = get_tokamak_test_shotlist(tokamak)
shots, *_ = config(tokamak).tests.shots.values()
methods = methods or None

sett = RetrievalSettings(
Expand Down