-
Notifications
You must be signed in to change notification settings - Fork 2k
Add token streaming support for XMLAdapter #8478
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.
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
base: main
Are you sure you want to change the base?
Add token streaming support for XMLAdapter #8478
Conversation
dspy/streaming/streaming_listener.py
Outdated
start_identifier = self.xml_adapter_start_identifier | ||
end_identifier = self.xml_adapter_end_identifier | ||
|
||
start_indicator = "<" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we also make start_indicator an instance variable like we do for start_identifier and end_identifier?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I mentioned above, maybe it's better to move the logic into each adapter class and remove if-else branch
start_identifier = settings.adapter.get_start_identifier(self.signature_field_name)
end_identifier= settings.adapter.get_end_identifier(self.signature_field_name)
start_indicator= settings.adapter.get_start_indicator()
dspy/streaming/streaming_listener.py
Outdated
elif isinstance(settings.adapter, ChatAdapter) or settings.adapter is None: | ||
start_identifier = self.chat_adapter_start_identifier | ||
end_identifier = self.chat_adapter_end_identifier | ||
|
||
start_indicator = "[" | ||
else: | ||
raise ValueError( | ||
f"Unsupported adapter for streaming: {settings.adapter}, please use either ChatAdapter or " | ||
f"Unsupported adapter for streaming: {settings.adapter}, please use either ChatAdapter, XMLAdapter or " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Can we define const for a list of adapters that support streaming?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sg!
@@ -51,6 +52,9 @@ def __init__( | |||
self.chat_adapter_start_identifier = f"[[ ## {self.signature_field_name} ## ]]" | |||
self.chat_adapter_end_identifier = re.compile(r"\[\[ ## (\w+) ## \]\]") | |||
|
|||
self.xml_adapter_start_identifier = f"<{self.signature_field_name}>" | |||
self.xml_adapter_end_identifier = re.compile(rf"</{self.signature_field_name}>") | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we already have three adapters, shall we define a mapping for adapter-specific parameters? Alternatively, we can move the identifier into each adapter class for better encapsulation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shall we define a mapping for adapter-specific parameters?
Yes, good call!
we can move the identifier into each adapter class for better encapsulation
This is a little subtle, thestart_identifier
/end_identifier
is not a feature of the adapter, but a feature of the stream listener. The boundary is a bit vague though - adapter can fully function withoutstart_identifier
/end_identifier
, and different listeners could introduce differentstart_identifier
/end_identifier
for the same adapter, so it belongs more to the stream listeners.
dspy/streaming/streaming_listener.py
Outdated
elif isinstance(settings.adapter, ChatAdapter) or settings.adapter is None: | ||
boundary_index = last_tokens.find("[[") | ||
return last_tokens[:boundary_index] | ||
boundary_index = last_tokens.find(f"</{self.signature_field_name}>") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
q: why do we need this change for ChatAdapter
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch, it's a codex mess
dspy/streaming/streaming_listener.py
Outdated
else: | ||
raise ValueError( | ||
f"Unsupported adapter for streaming: {settings.adapter}, please use either ChatAdapter or " | ||
f"Unsupported adapter for streaming: {settings.adapter}, please use either ChatAdapter, XMLAdapter or " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Support XMLAdapter in
StreamListener
Note
This PR is generated by OpenAI codex, I am testing how deep it can understand DSPy codebase with this specific use case.
It passes on my tests: