Skip to content
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

chore: Use serialize_callable instead of serialize_callback_handler in Ollama #461

Merged
merged 3 commits into from
Feb 23, 2024
Merged

chore: Use serialize_callable instead of serialize_callback_handler in Ollama #461

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dc9f76
change function
ZanSara Feb 21, 2024
2fd4e04
Merge branch 'main' into ollama_callable_serialization
ZanSara Feb 22, 2024
90cbfe0
ruff
ZanSara Feb 22, 2024
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
6 changes: 3 additions & 3 deletions integrations/ollama/src/haystack_integrations/components/generators/ollama/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import requests
from haystack import component, default_from_dict, default_to_dict
from haystack.components.generators.utils import deserialize_callback_handler, serialize_callback_handler
from haystack.dataclasses import StreamingChunk
from haystack.utils.callable_serialization import deserialize_callable, serialize_callable
from requests import Response


Expand Down Expand Up @@ -57,7 +57,7 @@ def to_dict(self) -> Dict[str, Any]:
Serialize this component to a dictionary.
:return: The serialized component as a dictionary.
"""
callback_name = serialize_callback_handler(self.streaming_callback) if self.streaming_callback else None
callback_name = serialize_callable(self.streaming_callback) if self.streaming_callback else None
return default_to_dict(
self,
timeout=self.timeout,
Expand All @@ -80,7 +80,7 @@ def from_dict(cls, data: Dict[str, Any]) -> "OllamaGenerator":
init_params = data.get("init_parameters", {})
serialized_callback_handler = init_params.get("streaming_callback")
if serialized_callback_handler:
data["init_parameters"]["streaming_callback"] = deserialize_callback_handler(serialized_callback_handler)
data["init_parameters"]["streaming_callback"] = deserialize_callable(serialized_callback_handler)
return default_from_dict(cls, data)

def _create_json_payload(self, prompt: str, stream: bool, generation_kwargs=None) -> Dict[str, Any]:
Expand Down