refactor: Restructure submodules in evaluation (#6)

deepset-ai · May 22, 2024 · 80d80cb · 80d80cb
1 parent 57ece86
commit 80d80cb
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 4 deletions.
diff --git a/haystack_experimental/evaluation/__init__.py b/haystack_experimental/evaluation/__init__.py
@@ -2,6 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from .eval_harness import EvalRunOverrides, EvaluationHarness
+from .harness import EvalRunOverrides, EvaluationHarness
 
 _all_ = ["EvaluationHarness", "EvalRunOverrides"]
diff --git a/haystack_experimental/evaluation/harness/__init__.py b/haystack_experimental/evaluation/harness/__init__.py
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: 2022-present deepset GmbH <[email protected]>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from .evalution_harness import EvalRunOverrides, EvaluationHarness
+
+_all_ = ["EvaluationHarness", "EvalRunOverrides"]
diff --git a/...k_experimental/evaluation/eval_harness.py → ...l/evaluation/harness/evalution_harness.py b/...k_experimental/evaluation/eval_harness.py → ...l/evaluation/harness/evalution_harness.py
diff --git a/haystack_experimental/evaluation/util/__init__.py b/haystack_experimental/evaluation/util/__init__.py
@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2022-present deepset GmbH <[email protected]>
+#
+# SPDX-License-Identifier: Apache-2.0
diff --git a/haystack_experimental/evaluation/util.py → ...k_experimental/evaluation/util/helpers.py b/haystack_experimental/evaluation/util.py → ...k_experimental/evaluation/util/helpers.py
diff --git a/..._experimental/evaluation/pipeline_pair.py → ...rimental/evaluation/util/pipeline_pair.py b/..._experimental/evaluation/pipeline_pair.py → ...rimental/evaluation/util/pipeline_pair.py
diff --git a/test/evaluation/util/__init__.py b/test/evaluation/util/__init__.py
@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2022-present deepset GmbH <[email protected]>
+#
+# SPDX-License-Identifier: Apache-2.0
diff --git a/test/evaluation/test_util.py → test/evaluation/util/test_helpers.py b/test/evaluation/test_util.py → test/evaluation/util/test_helpers.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 import pytest
 
-from haystack_experimental.evaluation.util import (
+from haystack_experimental.evaluation.util.helpers import (
     aggregate_batched_pipeline_outputs,
     deaggregate_batched_pipeline_inputs,
 )

diff --git a/test/evaluation/test_pipeline_pair.py → test/evaluation/util/test_pipeline_pair.py b/test/evaluation/test_pipeline_pair.py → test/evaluation/util/test_pipeline_pair.py
@@ -1,8 +1,8 @@
 import pytest
 
 from haystack import Pipeline
-from haystack_experimental.evaluation.pipeline_pair import PipelinePair
-from haystack_experimental.evaluation.util import aggregate_batched_pipeline_outputs
+from haystack_experimental.evaluation.util.pipeline_pair import PipelinePair
+from haystack_experimental.evaluation.util.helpers import aggregate_batched_pipeline_outputs
 
 from haystack.testing.sample_components import AddFixedValue, Double
 from haystack_experimental.testing.sample_components import AddFixedValueBatch, DoubleBatch