Commit 01eb23c
authored
fix(openai): avoid setting max_tokens and max_completion_tokens together (#906)
Fixes #905
## Summary
- Add `GenerateOptions.maxCompletionTokens`
- Update `OpenAIChatFormatter` to set `max_tokens` and
`max_completion_tokens` independently, without mirroring
## Behavior
- If only `maxTokens` is set -> only `max_tokens` is sent
- If only `maxCompletionTokens` is set -> only `max_completion_tokens`
is sent
- If both are set -> both fields are sent as-is (SDK does not enforce
exclusivity; provider can decide)
## Notes
- Affects `OpenAIChatFormatter` and its subclasses (e.g.
`OpenAIMultiAgentFormatter`, `DeepSeekFormatter`, `GLMFormatter`)
- Other providers (Gemini/DashScope/Anthropic/Ollama, etc.) continue to
use `maxTokens` only1 parent 5d4fad6 commit 01eb23c
2 files changed
Lines changed: 54 additions & 7 deletions
File tree
- agentscope-core/src/main/java/io/agentscope/core
- formatter/openai
- model
Lines changed: 17 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
| 104 | + | |
111 | 105 | | |
112 | 106 | | |
113 | 107 | | |
| |||
123 | 117 | | |
124 | 118 | | |
125 | 119 | | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
126 | 136 | | |
127 | 137 | | |
128 | 138 | | |
| |||
Lines changed: 37 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
| |||
65 | 66 | | |
66 | 67 | | |
67 | 68 | | |
| 69 | + | |
68 | 70 | | |
69 | 71 | | |
70 | 72 | | |
| |||
184 | 186 | | |
185 | 187 | | |
186 | 188 | | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
187 | 203 | | |
188 | 204 | | |
189 | 205 | | |
| |||
388 | 404 | | |
389 | 405 | | |
390 | 406 | | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
391 | 411 | | |
392 | 412 | | |
393 | 413 | | |
| |||
450 | 470 | | |
451 | 471 | | |
452 | 472 | | |
| 473 | + | |
453 | 474 | | |
454 | 475 | | |
455 | 476 | | |
| |||
560 | 581 | | |
561 | 582 | | |
562 | 583 | | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
563 | 600 | | |
564 | 601 | | |
565 | 602 | | |
| |||
0 commit comments