[Fix] rust-server: Honour cache_salt and require_reasoning on /generate (#44533)
Co-authored-by: metamergebot <metamergebot@users.noreply.github.com> Co-authored-by: shodoco <shodoco@users.noreply.github.com>
This commit is contained in:
co-authored by
metamergebot
shodoco
parent
453b251dbd
commit
553068af25
@@ -259,6 +259,10 @@ class GenerateRequest(msgspec.Struct, kw_only=True, frozen=True):
|
||||
audio_data: Optional[MediaInput] = None
|
||||
extra_key: Optional[StringOrList] = None
|
||||
priority: Optional[int] = None
|
||||
cache_salt: Optional[StringOrList] = None
|
||||
require_reasoning: Optional[bool] = None
|
||||
lora_path: Optional[Any] = None
|
||||
session_params: Optional[Any] = None
|
||||
|
||||
@classmethod
|
||||
def from_json_value(cls, value: Any) -> "GenerateRequest":
|
||||
@@ -1104,6 +1108,14 @@ def decode_GenerateRequest(value: Any) -> GenerateRequest:
|
||||
kw["extra_key"] = None if x is None else decode_StringOrList(x)
|
||||
elif key == "priority":
|
||||
kw["priority"] = None if x is None else _expect_int(x, expected="i64")
|
||||
elif key == "cache_salt":
|
||||
kw["cache_salt"] = None if x is None else decode_StringOrList(x)
|
||||
elif key == "require_reasoning":
|
||||
kw["require_reasoning"] = None if x is None else _expect_bool(x, expected="a boolean")
|
||||
elif key == "lora_path":
|
||||
kw["lora_path"] = x
|
||||
elif key == "session_params":
|
||||
kw["session_params"] = x
|
||||
return GenerateRequest(**kw)
|
||||
|
||||
|
||||
@@ -1157,6 +1169,14 @@ def encode_GenerateRequest(v: GenerateRequest) -> Dict[str, Any]:
|
||||
d["extra_key"] = encode_StringOrList(v.extra_key)
|
||||
if v.priority is not None:
|
||||
d["priority"] = v.priority
|
||||
if v.cache_salt is not None:
|
||||
d["cache_salt"] = encode_StringOrList(v.cache_salt)
|
||||
if v.require_reasoning is not None:
|
||||
d["require_reasoning"] = v.require_reasoning
|
||||
if v.lora_path is not None:
|
||||
d["lora_path"] = v.lora_path
|
||||
if v.session_params is not None:
|
||||
d["session_params"] = v.session_params
|
||||
return d
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user