Fix imports

marqo-ai · Nov 21, 2024 · 2849cc2 · 2849cc2
1 parent bf43d54
commit 2849cc2
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/largemodel_unit_test_CI.yml b/.github/workflows/largemodel_unit_test_CI.yml
@@ -165,8 +165,8 @@ jobs:
           export PRIVATE_MODEL_TESTS_AWS_SECRET_ACCESS_KEY=${{ secrets.PRIVATE_MODEL_TESTS_AWS_SECRET_ACCESS_KEY }}
           export PRIVATE_MODEL_TESTS_HF_TOKEN=${{ secrets.PRIVATE_MODEL_TESTS_HF_TOKEN }}
           
-          export PYTHONPATH="./marqo/tests/integ_tests:./marqo/src:./marqo"
-          pytest marqo/tests --largemodel 
+          export PYTHONPATH="./marqo/tests/integ_tests:./marqo/src"
+          pytest marqo/tests/integ_tests --largemodel 
 
   Stop-Runner:
     name: Stop self-hosted EC2 runner

diff --git a/tests/integ_tests/tensor_search/backwards_compat/test_search_regression.py b/tests/integ_tests/tensor_search/backwards_compat/test_search_regression.py
@@ -19,7 +19,7 @@
 from marqo.tensor_search import api
 import numpy as np
 from marqo.tensor_search.models.api_models import CustomVectorQuery
-from tests.tensor_search.backwards_compat.resources import results_2_9
+from integ_tests.tensor_search.backwards_compat.resources import results_2_9
 
 
 class TestSearchRegression(MarqoTestCase):

diff --git a/tests/integ_tests/tensor_search/integ_tests/test_delete_documents.py b/tests/integ_tests/tensor_search/integ_tests/test_delete_documents.py
@@ -11,7 +11,7 @@
 from marqo.core.models.marqo_index_request import FieldRequest
 from marqo.api import exceptions as api_exceptions
 from marqo.tensor_search import enums
-from tests.utils.transition import add_docs_batched
+from integ_tests.utils.transition import add_docs_batched
 import os
 from marqo.vespa.models.delete_document_response import DeleteBatchDocumentResponse, DeleteBatchResponse
 

diff --git a/tests/integ_tests/tensor_search/integ_tests/test_get_documents_by_ids.py b/tests/integ_tests/tensor_search/integ_tests/test_get_documents_by_ids.py
@@ -19,7 +19,7 @@
 from unittest.mock import patch
 import os
 import pprint
-from tests.utils.transition import *
+from integ_tests.utils.transition import *
 
 
 class TestGetDocuments(MarqoTestCase):

diff --git a/tests/integ_tests/tensor_search/integ_tests/test_no_model.py b/tests/integ_tests/tensor_search/integ_tests/test_no_model.py
@@ -11,7 +11,7 @@
 from marqo.tensor_search import tensor_search
 from marqo.tensor_search.models.search import SearchContext
 from integ_tests.marqo_test import MarqoTestCase
-from tests.utils.transition import *
+from integ_tests.utils.transition import *
 
 
 class TestNoModel(MarqoTestCase):

diff --git a/tests/integ_tests/tensor_search/integ_tests/test_search_semi_structured.py b/tests/integ_tests/tensor_search/integ_tests/test_search_semi_structured.py
@@ -23,7 +23,7 @@
 from marqo.tensor_search.models.search import SearchContext
 from integ_tests.marqo_test import MarqoTestCase, TestImageUrls
 from marqo.tensor_search.models.api_models import ScoreModifierLists
-from tests.tensor_search.integ_tests.common_test_constants import SPECIAL_CHARACTERS
+from integ_tests.tensor_search.integ_tests.common_test_constants import SPECIAL_CHARACTERS
 
 
 class TestSearchSemiStructured(MarqoTestCase):

diff --git a/tests/integ_tests/tensor_search/integ_tests/test_search_structured.py b/tests/integ_tests/tensor_search/integ_tests/test_search_structured.py
@@ -21,7 +21,7 @@
 from marqo.tensor_search.models.search import SearchContext
 from integ_tests.marqo_test import MarqoTestCase, TestImageUrls
 from marqo.tensor_search.models.api_models import ScoreModifierLists
-from tests.tensor_search.integ_tests.common_test_constants import SPECIAL_CHARACTERS
+from integ_tests.tensor_search.integ_tests.common_test_constants import SPECIAL_CHARACTERS
 
 
 class TestSearchStructured(MarqoTestCase):

diff --git a/tests/integ_tests/tensor_search/integ_tests/test_search_unstructured.py b/tests/integ_tests/tensor_search/integ_tests/test_search_unstructured.py
@@ -24,7 +24,7 @@
 from integ_tests.marqo_test import MarqoTestCase, TestImageUrls
 from marqo.vespa.models import QueryResult
 from marqo.tensor_search.models.api_models import ScoreModifierLists
-from tests.tensor_search.integ_tests.common_test_constants import SPECIAL_CHARACTERS
+from integ_tests.tensor_search.integ_tests.common_test_constants import SPECIAL_CHARACTERS
 
 
 class TestSearchUnstructured(MarqoTestCase):

diff --git a/tests/integ_tests/tensor_search/test_boost_field_scores.py b/tests/integ_tests/tensor_search/test_boost_field_scores.py
@@ -5,7 +5,7 @@
 from marqo.api.exceptions import IndexNotFoundError, InvalidArgError
 from marqo.tensor_search import tensor_search
 from integ_tests.marqo_test import MarqoTestCase
-from tests.utils.transition import add_docs_caller
+from integ_tests.utils.transition import add_docs_caller
 
 
 @unittest.skip

diff --git a/tests/integ_tests/tensor_search/test_context_vectors_search.py b/tests/integ_tests/tensor_search/test_context_vectors_search.py
@@ -9,7 +9,7 @@
 from marqo.tensor_search import tensor_search
 from marqo.tensor_search.models.search import SearchContext
 from integ_tests.marqo_test import MarqoTestCase
-from tests.utils.transition import *
+from integ_tests.utils.transition import *
 
 
 class TestContextVectors(MarqoTestCase):

diff --git a/tests/integ_tests/tensor_search/test_model_auth_cuda.py b/tests/integ_tests/tensor_search/test_model_auth_cuda.py
@@ -10,7 +10,7 @@
 from marqo.core.inference.download_model_from_s3 import get_s3_model_absolute_cache_path
 from marqo.tensor_search.models.external_apis.s3 import S3Location
 from unittest import mock
-from tests.tensor_search.test_model_auth import _delete_file, _get_base_index_settings
+from integ_tests.tensor_search.test_model_auth import _delete_file, _get_base_index_settings
 import unittest
 import os
 import torch

diff --git a/tests/integ_tests/tensor_search/test_pagination.py b/tests/integ_tests/tensor_search/test_pagination.py
@@ -18,7 +18,7 @@
 from marqo.tensor_search.enums import SearchMethod, EnvVars
 from marqo.core.models.add_docs_params import AddDocsParams
 from integ_tests.marqo_test import MarqoTestCase
-from tests.utils.transition import add_docs_caller
+from integ_tests.utils.transition import add_docs_caller
 from marqo.core.models.hybrid_parameters import RetrievalMethod, RankingMethod, HybridParameters
 
 

diff --git a/tests/integ_tests/tensor_search/test_score_modifiers_search.py b/tests/integ_tests/tensor_search/test_score_modifiers_search.py
@@ -1,7 +1,7 @@
 import copy
 import unittest
 from unittest import mock
-from tests.utils.transition import add_docs_caller
+from integ_tests.utils.transition import add_docs_caller
 from marqo.api.exceptions import IndexNotFoundError, InvalidArgError
 from marqo.tensor_search import tensor_search
 from marqo.tensor_search.models.api_models import ScoreModifierLists

diff --git a/tests/integ_tests/tensor_search/test_search.py b/tests/integ_tests/tensor_search/test_search.py
@@ -19,7 +19,7 @@
 from marqo.tensor_search.enums import TensorField, SearchMethod, EnvVars
 from marqo.core.models.add_docs_params import AddDocsParams
 from integ_tests.marqo_test import MarqoTestCase, TestImageUrls
-from tests.utils.transition import add_docs_caller
+from integ_tests.utils.transition import add_docs_caller
 from marqo.core.utils.prefix import determine_text_prefix
 from marqo.core.models.marqo_index import FieldType, UnstructuredMarqoIndex, TextPreProcessing, \
     ImagePreProcessing, Model, DistanceMetric, VectorNumericType, HnswConfig, TextSplitMethod