yujunjun/haystack
1
0
Fork 0
mirror of https://github.com/deepset-ai/haystack.git synced 2025-12-24 13:38:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: deserialize Document Stores using specific from_dict class methods (#8207)

Browse Source 
* use from_dict

* unused import

* improve logic

* improve reno
This commit is contained in:
Stefano Fiorucci 2024-08-14 10:56:32 +02:00 committed by GitHub
parent 5ac56ebdaf
commit 109e98aa44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
haystack/components/caching/cache_checker.py
View File

@ -82,7 +82,10 @@ class CacheChecker:
doc_store_class = import_class_by_name(doc_store_data["type"])
except ImportError as e:
raise DeserializationError(f"Class '{doc_store_data['type']}' not correctly imported") from e
data["init_parameters"]["document_store"] = default_from_dict(doc_store_class, doc_store_data)
if hasattr(doc_store_class, "from_dict"):
data["init_parameters"]["document_store"] = doc_store_class.from_dict(doc_store_data)
else:
data["init_parameters"]["document_store"] = default_from_dict(doc_store_class, doc_store_data)
return default_from_dict(cls, data)

5
haystack/components/retrievers/filter_retriever.py
View File

@ -88,7 +88,10 @@ class FilterRetriever:
doc_store_class = import_class_by_name(doc_store_data["type"])
except ImportError as e:
raise DeserializationError(f"Class '{doc_store_data['type']}' not correctly imported") from e
data["init_parameters"]["document_store"] = default_from_dict(doc_store_class, doc_store_data)
if hasattr(doc_store_class, "from_dict"):
data["init_parameters"]["document_store"] = doc_store_class.from_dict(doc_store_data)
else:
data["init_parameters"]["document_store"] = default_from_dict(doc_store_class, doc_store_data)
return default_from_dict(cls, data)

5
haystack/components/retrievers/sentence_window_retriever.py
View File

@ -131,7 +131,10 @@ class SentenceWindowRetriever:
except ImportError as e:
raise DeserializationError(f"Class '{doc_store_data['type']}' not correctly imported") from e
data["init_parameters"]["document_store"] = default_from_dict(doc_store_class, doc_store_data)
if hasattr(doc_store_class, "from_dict"):
data["init_parameters"]["document_store"] = doc_store_class.from_dict(doc_store_data)
else:
data["init_parameters"]["document_store"] = default_from_dict(doc_store_class, doc_store_data)
# deserialize the component
return default_from_dict(cls, data)

5
haystack/components/writers/document_writer.py
View File

@ -84,7 +84,10 @@ class DocumentWriter:
doc_store_class = import_class_by_name(doc_store_data["type"])
except ImportError as e:
raise DeserializationError(f"Class '{doc_store_data['type']}' not correctly imported") from e
data["init_parameters"]["document_store"] = default_from_dict(doc_store_class, doc_store_data)
if hasattr(doc_store_class, "from_dict"):
data["init_parameters"]["document_store"] = doc_store_class.from_dict(doc_store_data)
else:
data["init_parameters"]["document_store"] = default_from_dict(doc_store_class, doc_store_data)
data["init_parameters"]["policy"] = DuplicatePolicy[data["init_parameters"]["policy"]]
return default_from_dict(cls, data)

7
releasenotes/notes/use-document-store-from-dict-db7975d0e0e5e451.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
For components that support multiple Document Stores, prioritize using the specific `from_dict` class method
for deserialization when available. Otherwise, fall back to the generic `default_from_dict` method.
This impacts the following generic components: `CacheChecker`, `DocumentWriter`, `FilterRetriever`, and
`SentenceWindowRetriever`.