Make imports consistent

Author: farshidz

tests/__init__.py

@@ -6,7 +6,7 @@
 from marqo.core.distributed_lock.zookeeper_distributed_lock import get_deployment_lock
 from marqo.core.distributed_lock.zookeeper_distributed_lock import ZookeeperDistributedLock
 from marqo.core.exceptions import BackendCommunicationError
-from integ_tests.marqo_test import MarqoTestCase
+from tests.integ_tests.marqo_test import MarqoTestCase
 from marqo.core.exceptions import ZookeeperLockNotAcquiredError
 
 

tests/integ_tests/core/distributed_lock/test_distributed_lock.py

@@ -3,7 +3,7 @@
 from marqo.core.models.marqo_get_documents_by_id_response import (MarqoGetDocumentsByIdsResponse,
                                                                   MarqoGetDocumentsByIdsItem)
 from marqo.core.models.marqo_update_documents_response import MarqoUpdateDocumentsResponse, MarqoUpdateDocumentsItem
-from integ_tests.marqo_test import MarqoTestCase
+from tests.integ_tests.marqo_test import MarqoTestCase
 
 
 class TestDocumentsCommon(MarqoTestCase):

tests/integ_tests/core/document/test_documents_common.py

@@ -6,7 +6,7 @@
 
 import numpy as np
 
-from integ_tests.marqo_test import MarqoTestCase, TestImageUrls
+from tests.integ_tests.marqo_test import MarqoTestCase, TestImageUrls
 from marqo.api.exceptions import BadRequestError
 from marqo.api.models.update_documents import UpdateDocumentsBodyParams
 from marqo.core.models.add_docs_params import AddDocsParams

tests/integ_tests/core/document/test_partial_document_update.py

@@ -3,7 +3,7 @@
 from typing import Tuple
 
 import pytest
-from integ_tests.marqo_test import MarqoTestCase
+from tests.integ_tests.marqo_test import MarqoTestCase
 
 from marqo.api.exceptions import InvalidFieldNameError
 from marqo.core.models.add_docs_params import AddDocsParams

tests/integ_tests/core/document/test_partial_update_semi_structured.py

@@ -1,5 +1,5 @@
 from marqo.core.models.marqo_index import *
-from integ_tests.marqo_test import MarqoTestCase
+from tests.integ_tests.marqo_test import MarqoTestCase
 
 
 class TestUpdate(MarqoTestCase):

tests/integ_tests/core/document/tests_remove_duplicate_documents.py

@@ -6,7 +6,7 @@
 from marqo.core.models.marqo_index import *
 from marqo.core.models.marqo_index_request import FieldRequest
 from marqo.tensor_search.models.index_settings import IndexSettings
-from integ_tests.marqo_test import MarqoTestCase
+from tests.integ_tests.marqo_test import MarqoTestCase
 
 
 class TestGetSettings(MarqoTestCase):

tests/integ_tests/core/index_management/test_get_settings.py

@@ -30,7 +30,7 @@
 from marqo.s2_inference.s2_inference import get_model_properties_from_registry
 from marqo.vespa.exceptions import VespaActivationConflictError
 from marqo.vespa.models import VespaDocument
-from integ_tests.marqo_test import MarqoTestCase
+from tests.integ_tests.marqo_test import MarqoTestCase
 
 
 class TestIndexManagement(MarqoTestCase):

tests/integ_tests/core/index_management/test_index_management.py

@@ -6,7 +6,7 @@
 from marqo.core.exceptions import OperationConflictError
 from marqo.core.index_management.vespa_application_package import IndexSettingStore
 from marqo.core.models.marqo_index import Field, FieldType, MarqoIndex, Model
-from integ_tests.marqo_test import MarqoTestCase
+from tests.integ_tests.marqo_test import MarqoTestCase
 
 
 @pytest.mark.unittest

tests/integ_tests/core/index_management/test_index_setting_store.py

@@ -6,7 +6,7 @@
 from marqo.core.models.add_docs_params import AddDocsParams
 from marqo.tensor_search.api import create_index
 from marqo.tensor_search.models.index_settings import IndexSettings
-from integ_tests.marqo_test import MarqoTestCase, TestImageUrls
+from tests.integ_tests.marqo_test import MarqoTestCase, TestImageUrls