Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Feb 25, 2025
1 parent 5618c19 commit ba25a5c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
9 changes: 3 additions & 6 deletions src/aiida/cmdline/commands/cmd_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,8 @@ def group_mirror(
from aiida.tools.dumping import GroupDumper # ProfileDumper
from aiida.tools.dumping.config import (
BaseDumpConfig,
ProcessDumpConfig,
GroupDumpConfig,
ProcessDumpConfig,
)
from aiida.tools.dumping.logger import DumpLogger
from aiida.tools.dumping.utils import (
Expand Down Expand Up @@ -739,16 +739,13 @@ def group_mirror(
except IndexError:
last_dump_time = None


# Update the `last_dump_time` now, rather than after the dumping, as writing files to disk can take some time, and
# which processes should be dumped is evaluated beforehand (here)
current_dump_time = datetime.now().astimezone()

# Try to get `last_dump_time` from dumping safeguard file, if it already exsits
try:
dump_logger = DumpLogger.from_file(
dump_parent_path=dump_paths.parent, dump_sub_path=dump_paths.child
)
dump_logger = DumpLogger.from_file(dump_parent_path=dump_paths.parent, dump_sub_path=dump_paths.child)
except (json.JSONDecodeError, OSError):
dump_logger = DumpLogger(
dump_parent_path=dump_paths.parent,
Expand Down Expand Up @@ -777,7 +774,7 @@ def group_mirror(
delete_missing=delete_missing,
only_top_level_calcs=only_top_level_calcs,
only_top_level_workflows=only_top_level_workflows,
filter_by_last_dump_time=filter_by_last_dump_time
filter_by_last_dump_time=filter_by_last_dump_time,
)

group_dumper = GroupDumper(
Expand Down
4 changes: 1 addition & 3 deletions src/aiida/cmdline/commands/cmd_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,7 @@ def profile_mirror(

# Try to get `last_dump_time` from dumping safeguard file, if it already exsits
try:
dump_logger = DumpLogger.from_file(
dump_parent_path=dump_paths.parent, dump_sub_path=dump_paths.child
)
dump_logger = DumpLogger.from_file(dump_parent_path=dump_paths.parent, dump_sub_path=dump_paths.child)
except (json.JSONDecodeError, OSError):
dump_logger = DumpLogger(dump_parent_path=dump_paths.parent, dump_sub_path=dump_paths.child)

Expand Down
4 changes: 4 additions & 0 deletions src/aiida/tools/dumping/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,25 @@ class ProcessDumpConfig:
@dataclass
class CollectionDumpConfig:
"""Shared arguments for dumping of collections of nodes."""

dump_processes: bool = True
symlink_duplicates: bool = False
delete_missing: bool = False
only_top_level_calcs: bool = True
only_top_level_workflows: bool = True
filter_by_last_dump_time: bool = True


@dataclass
class GroupDumpConfig(CollectionDumpConfig):
"""Arguments for dumping group data."""

...


@dataclass
class ProfileDumpConfig(CollectionDumpConfig):
"""Arguments for dumping profile data."""

organize_by_groups: bool = True
only_groups: bool = False
8 changes: 2 additions & 6 deletions src/aiida/tools/dumping/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@
from pathlib import Path
from typing import cast

import ipdb

from aiida import orm
from aiida.common.log import AIIDA_LOGGER
from aiida.tools.dumping.base import BaseDumper
from aiida.tools.dumping.config import BaseDumpConfig, ProcessDumpConfig, GroupDumpConfig
from aiida.tools.dumping.config import BaseDumpConfig, GroupDumpConfig, ProcessDumpConfig
from aiida.tools.dumping.logger import DumpLog, DumpLogger
from aiida.tools.dumping.process import ProcessDumper
from aiida.tools.dumping.utils import (
Expand Down Expand Up @@ -103,7 +101,6 @@ def group_nodes(self) -> list[str]:
return nodes

def _get_group_nodes(self) -> list[str]:

assert self.group is not None, "`self.group` shouldn't be None at this stage."
nodes = [n.uuid for n in self.group.nodes]

Expand Down Expand Up @@ -248,7 +245,6 @@ def _get_no_group_nodes(self) -> list[str]:

return no_group_nodes


def delete_processes(self):
# print(f'TO_DUMP_PROCESSES: {to_dump_processes}')
# print(f'TO_DELETE_PROCESSES: {to_delete_processes}')
Expand Down Expand Up @@ -382,4 +378,4 @@ def dump(self, output_path: Path | None = None) -> None:
# ]
# process_nodes = filter_nodes_last_dump_time(nodes=process_nodes, last_dump_time=self.last_dump_time)

# return process_nodes
# return process_nodes
3 changes: 2 additions & 1 deletion src/aiida/tools/dumping/profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@

import dataclasses
from datetime import datetime
from functools import cached_property
from pathlib import Path
from typing import cast

import ipdb
from functools import cached_property

from aiida import orm
from aiida.common.log import AIIDA_LOGGER
Expand Down

0 comments on commit ba25a5c

Please sign in to comment.