diff --git a/integrations/weaviate/src/haystack_integrations/document_stores/weaviate/document_store.py b/integrations/weaviate/src/haystack_integrations/document_stores/weaviate/document_store.py index 3c4e68bb8..5bacac010 100644 --- a/integrations/weaviate/src/haystack_integrations/document_stores/weaviate/document_store.py +++ b/integrations/weaviate/src/haystack_integrations/document_stores/weaviate/document_store.py @@ -172,30 +172,22 @@ def client(self): if self._client: return self._client - if self._url and self._url.startswith("http") and self._url.endswith(".weaviate.network"): - self._client = weaviate.connect_to_wcs( - self._url, - auth_credentials=self._auth_client_secret.resolve_value() if self._auth_client_secret else None, - headers=self._additional_headers, - additional_config=self._additional_config, - ) - else: - # proxies, timeout_config, trust_env are part of additional_config now - # startup_period has been removed - self._client = weaviate.WeaviateClient( - connection_params=( - weaviate.connect.base.ConnectionParams.from_url( - url=self._url, grpc_port=self._grpc_port, grpc_secure=self._grpc_secure - ) - if self._url - else None - ), - auth_client_secret=self._auth_client_secret.resolve_value() if self._auth_client_secret else None, - additional_config=self._additional_config, - additional_headers=self._additional_headers, - embedded_options=self._embedded_options, - skip_init_checks=False, - ) + # proxies, timeout_config, trust_env are part of additional_config now + # startup_period has been removed + self._client = weaviate.WeaviateClient( + connection_params=( + weaviate.connect.base.ConnectionParams.from_url( + url=self._url, grpc_port=self._grpc_port, grpc_secure=self._grpc_secure + ) + if self._url + else None + ), + auth_client_secret=self._auth_client_secret.resolve_value() if self._auth_client_secret else None, + additional_config=self._additional_config, + additional_headers=self._additional_headers, + embedded_options=self._embedded_options, + skip_init_checks=False, + ) self._client.connect() diff --git a/integrations/weaviate/tests/test_document_store.py b/integrations/weaviate/tests/test_document_store.py index 31ff6e7b3..a4d275a22 100644 --- a/integrations/weaviate/tests/test_document_store.py +++ b/integrations/weaviate/tests/test_document_store.py @@ -1,5 +1,4 @@ import base64 -import os import random from typing import List from unittest.mock import MagicMock, patch @@ -17,7 +16,6 @@ FilterDocumentsTest, WriteDocumentsTest, ) -from haystack.utils.auth import Secret from haystack_integrations.document_stores.weaviate.auth import AuthApiKey from haystack_integrations.document_stores.weaviate.document_store import ( DOCUMENT_COLLECTION_PROPERTIES, @@ -28,6 +26,8 @@ from numpy import float32 as np_float32 from pandas import DataFrame from weaviate.collections.classes.data import DataObject + +# from weaviate.auth import AuthApiKey as WeaviateAuthApiKey from weaviate.config import AdditionalConfig, ConnectionConfig, Proxies, Timeout from weaviate.embedded import ( DEFAULT_BINARY_PATH, @@ -697,24 +697,3 @@ def test_schema_class_name_conversion_preserves_pascal_case(self): collection_settings=collection_settings, ) assert doc_score._collection_settings["class"] == "Lower_case_name" - - @pytest.mark.skipif( - not os.environ.get("WEAVIATE_API_KEY", None) and not os.environ.get("WEAVIATE_CLOUD_CLUSTER_URL", None), - reason="Both WEAVIATE_API_KEY and WEAVIATE_CLOUD_CLUSTER_URL are not set. Skipping test.", - ) - def test_connect_to_weaviate_cloud(self): - document_store = WeaviateDocumentStore( - url=os.environ.get("WEAVIATE_CLOUD_CLUSTER_URL"), - auth_client_secret=AuthApiKey(api_key=Secret.from_env_var("WEAVIATE_API_KEY")), - ) - assert document_store.client - - def test_connect_to_local(self): - document_store = WeaviateDocumentStore( - url="http://localhost:8080", - ) - assert document_store.client - - def test_connect_to_embedded(self): - document_store = WeaviateDocumentStore(embedded_options=EmbeddedOptions()) - assert document_store.client