Skip to content
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

Jump to bottom

AggregatingDiskQueue in Offline mode #1850

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

AggregatingDiskQueue in Offline mode #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc0a138
use AggregatingDiskQueue in Offline operation processor
Jul 22, 2024
1e2b940
Bugfix operation utils (#1851)
szysad Jul 22, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ repos:
additional_dependencies:
- types-click
- mypy-protobuf
- neptune-api
- neptune-api==0.3.0
- packaging
exclude: |
(?x)(
Expand Down
10 changes: 7 additions & 3 deletions src/neptune/core/operation_processors/offline_operation_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@
from neptune.core.components.abstract import WithResources
from neptune.core.components.metadata_file import MetadataFile
from neptune.core.components.operation_storage import OperationStorage
from neptune.core.components.queue.disk_queue import DiskQueue
from neptune.core.components.queue.aggregating_disk_queue import AggregatingDiskQueue
from neptune.core.operation_processors.operation_processor import OperationProcessor
from neptune.core.operation_processors.utils import (
common_metadata,
get_container_full_path,
)
from neptune.core.operations.operation import Operation
from neptune.core.operations.utils import try_get_step
from neptune.internal.utils.disk_utilization import ensure_disk_not_overutilize

if TYPE_CHECKING:
Expand All @@ -60,7 +61,9 @@ def __init__(self, custom_id: "CustomId", container_type: "ContainerType", lock:
metadata=common_metadata(mode="offline", custom_id=custom_id, container_type=container_type),
)
self._operation_storage = OperationStorage(data_path=self._data_path)
self._queue = DiskQueue(data_path=self._data_path, to_dict=serializer, from_dict=Operation.from_dict, lock=lock)
self._queue: AggregatingDiskQueue = AggregatingDiskQueue(
data_path=self._data_path, to_dict=serializer, from_dict=Operation.from_dict, lock=lock
)

@property
def operation_storage(self) -> "OperationStorage":
Expand All @@ -76,7 +79,8 @@ def resources(self) -> Tuple["Resource", ...]:

@ensure_disk_not_overutilize
def enqueue_operation(self, op: Operation, *, wait: bool) -> None:
self._queue.put(op)
step = try_get_step(op)
self._queue.put(op, category=step)

def wait(self) -> None:
self.flush()
Expand Down
2 changes: 1 addition & 1 deletion src/neptune/core/operations/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from typing import Optional

from neptune.core.operations.operation import (
from neptune.internal.operation import (
LogFloats,
Operation,
)
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/neptune/new/core/operation_processors/test_offline_operation_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

@patch("neptune.core.operation_processors.utils.random.choice")
@patch("neptune.core.operation_processors.offline_operation_processor.Path.mkdir")
@patch("neptune.core.operation_processors.offline_operation_processor.DiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.AggregatingDiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.OperationStorage")
@patch("neptune.core.operation_processors.offline_operation_processor.MetadataFile")
@patch("neptune.core.operation_processors.utils.os.getpid", return_value=42)
Expand All @@ -54,7 +54,7 @@ def test_setup(_, __, ___, ____, mkdir_mock, random_choice_mock):
)


@patch("neptune.core.operation_processors.offline_operation_processor.DiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.AggregatingDiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.OperationStorage")
@patch("neptune.core.operation_processors.offline_operation_processor.MetadataFile")
def test_flush(metadata_file_mock, operation_storage_mock, disk_queue_mock):
Expand Down Expand Up @@ -82,7 +82,7 @@ def test_flush(metadata_file_mock, operation_storage_mock, disk_queue_mock):
metadata_file.flush.assert_called_once()


@patch("neptune.core.operation_processors.offline_operation_processor.DiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.AggregatingDiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.OperationStorage")
@patch("neptune.core.operation_processors.offline_operation_processor.MetadataFile")
def test_close(metadata_file_mock, operation_storage_mock, disk_queue_mock):
Expand Down Expand Up @@ -110,7 +110,7 @@ def test_close(metadata_file_mock, operation_storage_mock, disk_queue_mock):
metadata_file.close.assert_called_once()


@patch("neptune.core.operation_processors.offline_operation_processor.DiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.AggregatingDiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.OperationStorage")
@patch("neptune.core.operation_processors.offline_operation_processor.MetadataFile")
def test_stop(metadata_file_mock, operation_storage_mock, disk_queue_mock):
Expand Down Expand Up @@ -148,7 +148,7 @@ def test_stop(metadata_file_mock, operation_storage_mock, disk_queue_mock):
metadata_file.cleanup.assert_not_called()


@patch("neptune.core.operation_processors.offline_operation_processor.DiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.AggregatingDiskQueue")
@patch("neptune.core.operation_processors.offline_operation_processor.OperationStorage")
@patch("neptune.core.operation_processors.offline_operation_processor.MetadataFile")
def test_metadata(metadata_file_mock, _, __):
Expand Down
Loading