API: Core: Remove load/template aliases

These added extra complexity and should be removed and replaced
with a single parameter.

Changes:
- /v1/model/load must use model_name and draft_model_name
- /v1/model/embedding/load must use embedding_model_name
- /v1/template/switch must use prompt_template_name

Signed-off-by: kingbri <8082010+kingbri1@users.noreply.github.com>
This commit is contained in:
kingbri 2025-05-25 22:15:21 -04:00
parent 0ea56382f0
commit a3c780ae58
2 changed files with 7 additions and 22 deletions

View file

@ -1,6 +1,6 @@
"""Contains model card types.""" """Contains model card types."""
from pydantic import AliasChoices, BaseModel, Field, ConfigDict from pydantic import BaseModel, Field, ConfigDict
from time import time from time import time
from typing import List, Literal, Optional, Union from typing import List, Literal, Optional, Union
@ -50,10 +50,7 @@ class DraftModelLoadRequest(BaseModel):
"""Represents a draft model load request.""" """Represents a draft model load request."""
# Required # Required
draft_model_name: str = Field( draft_model_name: str
alias=AliasChoices("draft_model_name", "name"),
description="Aliases: name",
)
# Config arguments # Config arguments
draft_rope_scale: Optional[float] = None draft_rope_scale: Optional[float] = None
@ -75,10 +72,7 @@ class ModelLoadRequest(BaseModel):
model_config = ConfigDict(protected_namespaces=[]) model_config = ConfigDict(protected_namespaces=[])
# Required # Required
model_name: str = Field( model_name: str
alias=AliasChoices("model_name", "name"),
description="Aliases: name",
)
# Config arguments # Config arguments
backend: Optional[str] = Field( backend: Optional[str] = Field(
@ -118,18 +112,12 @@ class ModelLoadRequest(BaseModel):
vision: Optional[bool] = None vision: Optional[bool] = None
# Non-config arguments # Non-config arguments
draft_model: Optional[DraftModelLoadRequest] = Field( draft_model: Optional[DraftModelLoadRequest] = None
default=None,
alias=AliasChoices("draft_model", "draft"),
)
skip_queue: Optional[bool] = False skip_queue: Optional[bool] = False
class EmbeddingModelLoadRequest(BaseModel): class EmbeddingModelLoadRequest(BaseModel):
embedding_model_name: str = Field( embedding_model_name: str
alias=AliasChoices("embedding_model_name", "name"),
description="Aliases: name",
)
# Set default from the config # Set default from the config
embeddings_device: Optional[str] = Field(config.embeddings.embeddings_device) embeddings_device: Optional[str] = Field(config.embeddings.embeddings_device)

View file

@ -1,4 +1,4 @@
from pydantic import AliasChoices, BaseModel, Field from pydantic import BaseModel, Field
from typing import List from typing import List
@ -12,7 +12,4 @@ class TemplateList(BaseModel):
class TemplateSwitchRequest(BaseModel): class TemplateSwitchRequest(BaseModel):
"""Request to switch a template.""" """Request to switch a template."""
prompt_template_name: str = Field( prompt_template_name: str
alias=AliasChoices("prompt_template_name", "name"),
description="Aliases: name",
)