diff --git a/syftbox/lib/metrics.py b/syftbox/client/benchmark/metrics.py similarity index 100% rename from syftbox/lib/metrics.py rename to syftbox/client/benchmark/metrics.py diff --git a/syftbox/client/benchmark/network_metric.py b/syftbox/client/benchmark/network_metric.py index 0a7c1004..2c684b6d 100644 --- a/syftbox/client/benchmark/network_metric.py +++ b/syftbox/client/benchmark/network_metric.py @@ -5,8 +5,8 @@ import requests from syftbox.client.base import BaseMetric, MetricCollector +from syftbox.client.benchmark.metrics import HTTPMetrics, HTTPPerfStats, TCPMetrics, TCPPerfStats from syftbox.lib.client_config import SyftClientConfig -from syftbox.lib.metrics import HTTPMetrics, HTTPPerfStats, TCPMetrics, TCPPerfStats @dataclass diff --git a/tests/unit/client/benchmark_network_test.py b/tests/unit/client/benchmark_network_test.py index d7e63afa..fb12a1fd 100644 --- a/tests/unit/client/benchmark_network_test.py +++ b/tests/unit/client/benchmark_network_test.py @@ -4,8 +4,8 @@ import pytest import requests +from syftbox.client.benchmark.metrics import AggregateStats, HTTPMetrics, TCPMetrics from syftbox.client.benchmark.network_metric import NetworkMetric, ServerNetworkMetricCollector -from syftbox.lib.metrics import AggregateStats, HTTPMetrics, TCPMetrics @pytest.fixture diff --git a/tests/unit/client/benchmark_report_test.py b/tests/unit/client/benchmark_report_test.py index e92079f1..0eb9cbd6 100644 --- a/tests/unit/client/benchmark_report_test.py +++ b/tests/unit/client/benchmark_report_test.py @@ -3,6 +3,7 @@ import pytest +from syftbox.client.benchmark.metrics import AggregateStats, HTTPMetrics, TCPMetrics from syftbox.client.benchmark.report import ( HumanReadableBenchmarkReport, JsonBenchmarkReport, @@ -10,7 +11,6 @@ SyncPerformanceMetric, ) from syftbox.client.benchmark.sync_metric import PerformanceMetrics, SizePerformanceData -from syftbox.lib.metrics import AggregateStats, HTTPMetrics, TCPMetrics @pytest.fixture