From fa4c6ccfa7e471baf01045d9e48b118594a92b50 Mon Sep 17 00:00:00 2001 From: Amna Mubashar Date: Thu, 1 Aug 2024 18:31:21 +0200 Subject: [PATCH 1/2] Small improvement for resolving connection string (#937) --- .../document_stores/mongodb_atlas/document_store.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/integrations/mongodb_atlas/src/haystack_integrations/document_stores/mongodb_atlas/document_store.py b/integrations/mongodb_atlas/src/haystack_integrations/document_stores/mongodb_atlas/document_store.py index 88eec4aed..93eb87005 100644 --- a/integrations/mongodb_atlas/src/haystack_integrations/document_stores/mongodb_atlas/document_store.py +++ b/integrations/mongodb_atlas/src/haystack_integrations/document_stores/mongodb_atlas/document_store.py @@ -82,7 +82,6 @@ def __init__( msg = f'Invalid collection name: "{collection_name}". It can only contain letters, numbers, -, or _.' raise ValueError(msg) - self.resolved_connection_string = mongo_connection_string.resolve_value() self.mongo_connection_string = mongo_connection_string self.database_name = database_name @@ -95,7 +94,7 @@ def __init__( def connection(self) -> MongoClient: if self._connection is None: self._connection = MongoClient( - self.resolved_connection_string, driver=DriverInfo(name="MongoDBAtlasHaystackIntegration") + self.mongo_connection_string.resolve_value(), driver=DriverInfo(name="MongoDBAtlasHaystackIntegration") ) return self._connection From 7fbc7062f1205a4f65ca59956f4f2f1bb5a37423 Mon Sep 17 00:00:00 2001 From: Stefano Fiorucci Date: Fri, 2 Aug 2024 11:44:10 +0200 Subject: [PATCH 2/2] update docker compose to v2 (#941) --- .github/workflows/elasticsearch.yml | 2 +- .github/workflows/opensearch.yml | 2 +- .github/workflows/weaviate.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml index dbf5e648f..4cf34b301 100644 --- a/.github/workflows/elasticsearch.yml +++ b/.github/workflows/elasticsearch.yml @@ -48,7 +48,7 @@ jobs: run: hatch run lint:all - name: Run ElasticSearch container - run: docker-compose up -d + run: docker compose up -d - name: Generate docs if: matrix.python-version == '3.9' && runner.os == 'Linux' diff --git a/.github/workflows/opensearch.yml b/.github/workflows/opensearch.yml index 0b49cc721..46ce2e6a5 100644 --- a/.github/workflows/opensearch.yml +++ b/.github/workflows/opensearch.yml @@ -48,7 +48,7 @@ jobs: run: hatch run lint:all - name: Run opensearch container - run: docker-compose up -d + run: docker compose up -d - name: Generate docs if: matrix.python-version == '3.9' && runner.os == 'Linux' diff --git a/.github/workflows/weaviate.yml b/.github/workflows/weaviate.yml index 984100271..8e1bbbc4f 100644 --- a/.github/workflows/weaviate.yml +++ b/.github/workflows/weaviate.yml @@ -47,7 +47,7 @@ jobs: run: hatch run lint:all - name: Run Weaviate container - run: docker-compose up -d + run: docker compose up -d - name: Generate docs if: matrix.python-version == '3.9' && runner.os == 'Linux'