Merge branch 'main' into remove_dynamic_prompt_builder

deepset-ai · Aug 2, 2024 · dc6501c · dc6501c
2 parents 7e091da + 7fbc706
commit dc6501c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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'

diff --git a/...s/mongodb_atlas/src/haystack_integrations/document_stores/mongodb_atlas/document_store.py b/...s/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