From 80d80cb1fa99f2ea4417afe279e9e21a7363619c Mon Sep 17 00:00:00 2001 From: Madeesh Kannan Date: Wed, 22 May 2024 16:25:42 +0200 Subject: [PATCH] refactor: Restructure submodules in `evaluation` (#6) --- haystack_experimental/evaluation/__init__.py | 2 +- haystack_experimental/evaluation/harness/__init__.py | 7 +++++++ .../{eval_harness.py => harness/evalution_harness.py} | 0 haystack_experimental/evaluation/util/__init__.py | 3 +++ .../evaluation/{util.py => util/helpers.py} | 0 .../evaluation/{ => util}/pipeline_pair.py | 0 test/evaluation/util/__init__.py | 3 +++ test/evaluation/{test_util.py => util/test_helpers.py} | 2 +- test/evaluation/{ => util}/test_pipeline_pair.py | 4 ++-- 9 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 haystack_experimental/evaluation/harness/__init__.py rename haystack_experimental/evaluation/{eval_harness.py => harness/evalution_harness.py} (100%) create mode 100644 haystack_experimental/evaluation/util/__init__.py rename haystack_experimental/evaluation/{util.py => util/helpers.py} (100%) rename haystack_experimental/evaluation/{ => util}/pipeline_pair.py (100%) create mode 100644 test/evaluation/util/__init__.py rename test/evaluation/{test_util.py => util/test_helpers.py} (97%) rename test/evaluation/{ => util}/test_pipeline_pair.py (98%) diff --git a/haystack_experimental/evaluation/__init__.py b/haystack_experimental/evaluation/__init__.py index 918176cc..4546e497 100644 --- 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 new file mode 100644 index 00000000..90792912 --- /dev/null +++ b/haystack_experimental/evaluation/harness/__init__.py @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: 2022-present deepset GmbH +# +# SPDX-License-Identifier: Apache-2.0 + +from .evalution_harness import EvalRunOverrides, EvaluationHarness + +_all_ = ["EvaluationHarness", "EvalRunOverrides"] diff --git a/haystack_experimental/evaluation/eval_harness.py b/haystack_experimental/evaluation/harness/evalution_harness.py similarity index 100% rename from haystack_experimental/evaluation/eval_harness.py rename to haystack_experimental/evaluation/harness/evalution_harness.py diff --git a/haystack_experimental/evaluation/util/__init__.py b/haystack_experimental/evaluation/util/__init__.py new file mode 100644 index 00000000..c1764a6e --- /dev/null +++ b/haystack_experimental/evaluation/util/__init__.py @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: 2022-present deepset GmbH +# +# SPDX-License-Identifier: Apache-2.0 diff --git a/haystack_experimental/evaluation/util.py b/haystack_experimental/evaluation/util/helpers.py similarity index 100% rename from haystack_experimental/evaluation/util.py rename to haystack_experimental/evaluation/util/helpers.py diff --git a/haystack_experimental/evaluation/pipeline_pair.py b/haystack_experimental/evaluation/util/pipeline_pair.py similarity index 100% rename from haystack_experimental/evaluation/pipeline_pair.py rename to haystack_experimental/evaluation/util/pipeline_pair.py diff --git a/test/evaluation/util/__init__.py b/test/evaluation/util/__init__.py new file mode 100644 index 00000000..c1764a6e --- /dev/null +++ b/test/evaluation/util/__init__.py @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: 2022-present deepset GmbH +# +# SPDX-License-Identifier: Apache-2.0 diff --git a/test/evaluation/test_util.py b/test/evaluation/util/test_helpers.py similarity index 97% rename from test/evaluation/test_util.py rename to test/evaluation/util/test_helpers.py index e6d80d89..595ef1e1 100644 --- a/test/evaluation/test_util.py +++ b/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 b/test/evaluation/util/test_pipeline_pair.py similarity index 98% rename from test/evaluation/test_pipeline_pair.py rename to test/evaluation/util/test_pipeline_pair.py index 16007f8a..519e85c6 100644 --- a/test/evaluation/test_pipeline_pair.py +++ b/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