Skip to content

fix: load_from_deepset_cloud without name in yaml #6478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
silvanocerza merged 3 commits into from
Dec 4, 2023
Merged

fix: load_from_deepset_cloud without name in yaml #6478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bff7a5c
fix: load_from_deepset_cloud without name in yaml
tstadel Dec 4, 2023
8ad09b1
fix tests
tstadel Dec 4, 2023
f656308
add reno
tstadel Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion haystack/pipelines/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def load_from_deepset_cloud(
params["api_key"] = api_key
component_config["params"] = params

del pipeline_config["name"] # Would fail validation otherwise
pipeline_config.pop("name", None) # Would fail validation otherwise
pipeline = cls.load_from_config(
pipeline_config=pipeline_config,
pipeline_name=pipeline_name,
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/fix-load-from-deepset-cloud-8a86053ccb246494.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
Fix `Pipeline.load_from_deepset_cloud` to work with the latest version of deepset Cloud.
5 changes: 3 additions & 2 deletions test/pipelines/test_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,8 +1026,9 @@ def dc_document_store_matcher(request: PreparedRequest) -> Tuple[bool, str]:
matches = False
reason = "No DeepsetCloudDocumentStore found."
request_body = request.body or ""
json_body = yaml.safe_load(request_body)
components = json_body["components"]
json_body = json.loads(request_body)
config = yaml.safe_load(json_body["config"])
components = config["components"]
for component in components:
if component["type"].endswith("DocumentStore"):
if component["type"] == "DeepsetCloudDocumentStore":
Expand Down