File tree Expand file tree Collapse file tree 2 files changed +13
-6
lines changed Expand file tree Collapse file tree 2 files changed +13
-6
lines changed Original file line number Diff line number Diff line change 17
17
)
18
18
from .pdl_lazy import PdlConst , PdlLazy , lazy_apply
19
19
from .pdl_schema_utils import pdltype_to_jsonschema
20
- from .pdl_utils import remove_none_values_from_message
20
+ from .pdl_utils import message_post_processing
21
21
22
22
# Load environment variables
23
23
load_dotenv ()
@@ -47,7 +47,7 @@ async def async_generate_text(
47
47
if msg .role is None :
48
48
msg .role = "assistant"
49
49
return (
50
- remove_none_values_from_message (msg .json ()),
50
+ message_post_processing (msg .json ()),
51
51
response .json (), # pyright: ignore
52
52
)
53
53
except httpx .RequestError as exc :
@@ -161,7 +161,7 @@ def generate_text_stream(
161
161
msg = chunk .choices [0 ].delta # pyright: ignore
162
162
if msg .role is None :
163
163
msg .role = "assistant"
164
- yield remove_none_values_from_message (msg .model_dump ())
164
+ yield message_post_processing (msg .model_dump ())
165
165
return result
166
166
167
167
Original file line number Diff line number Diff line change @@ -108,16 +108,23 @@ def get_contribute_value(
108
108
return None
109
109
110
110
111
- def remove_none_values_from_message (message : dict ) -> dict [str , Any ]:
111
+ def message_post_processing (message : dict ) -> dict [str , Any ]:
112
112
ret = {}
113
113
for key , value in message .items ():
114
- if key == "content" :
114
+ if key == "content" and value is not None :
115
+ ret [key ] = value
116
+ elif (
117
+ key == "reasoning_content" and value is not None
118
+ ): # TODO: replacing reasoning_content with content here
119
+ key = "content"
115
120
ret [key ] = value
116
121
if value is not None :
117
122
if isinstance (value , dict ):
118
- ret [key ] = remove_none_values_from_message (value )
123
+ ret [key ] = message_post_processing (value )
119
124
else :
120
125
ret [key ] = value
126
+ if "content" not in ret :
127
+ ret ["content" ] = ""
121
128
return ret
122
129
123
130
You can’t perform that action at this time.
0 commit comments