Merge conflicts

This commit is contained in:
Self Denial 2024-03-21 00:14:13 -06:00
commit f74f2ea765
30 changed files with 2318 additions and 257 deletions

View file

@ -712,7 +712,7 @@ class GenerateChatCompletionForm(BaseModel):
format: Optional[str] = None
options: Optional[dict] = None
template: Optional[str] = None
stream: Optional[bool] = True
stream: Optional[bool] = None
keep_alive: Optional[Union[int, str]] = None