From a3c780ae581107dc6f74ed1ca019e7a63494ade1 Mon Sep 17 00:00:00 2001 From: kingbri <8082010+kingbri1@users.noreply.github.com> Date: Sun, 25 May 2025 22:15:21 -0400 Subject: [PATCH] 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> --- endpoints/core/types/model.py | 22 +++++----------------- endpoints/core/types/template.py | 7 ++----- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/endpoints/core/types/model.py b/endpoints/core/types/model.py index e01b603..8e50622 100644 --- a/endpoints/core/types/model.py +++ b/endpoints/core/types/model.py @@ -1,6 +1,6 @@ """Contains model card types.""" -from pydantic import AliasChoices, BaseModel, Field, ConfigDict +from pydantic import BaseModel, Field, ConfigDict from time import time from typing import List, Literal, Optional, Union @@ -50,10 +50,7 @@ class DraftModelLoadRequest(BaseModel): """Represents a draft model load request.""" # Required - draft_model_name: str = Field( - alias=AliasChoices("draft_model_name", "name"), - description="Aliases: name", - ) + draft_model_name: str # Config arguments draft_rope_scale: Optional[float] = None @@ -75,10 +72,7 @@ class ModelLoadRequest(BaseModel): model_config = ConfigDict(protected_namespaces=[]) # Required - model_name: str = Field( - alias=AliasChoices("model_name", "name"), - description="Aliases: name", - ) + model_name: str # Config arguments backend: Optional[str] = Field( @@ -118,18 +112,12 @@ class ModelLoadRequest(BaseModel): vision: Optional[bool] = None # Non-config arguments - draft_model: Optional[DraftModelLoadRequest] = Field( - default=None, - alias=AliasChoices("draft_model", "draft"), - ) + draft_model: Optional[DraftModelLoadRequest] = None skip_queue: Optional[bool] = False class EmbeddingModelLoadRequest(BaseModel): - embedding_model_name: str = Field( - alias=AliasChoices("embedding_model_name", "name"), - description="Aliases: name", - ) + embedding_model_name: str # Set default from the config embeddings_device: Optional[str] = Field(config.embeddings.embeddings_device) diff --git a/endpoints/core/types/template.py b/endpoints/core/types/template.py index 010c9db..a82ef48 100644 --- a/endpoints/core/types/template.py +++ b/endpoints/core/types/template.py @@ -1,4 +1,4 @@ -from pydantic import AliasChoices, BaseModel, Field +from pydantic import BaseModel, Field from typing import List @@ -12,7 +12,4 @@ class TemplateList(BaseModel): class TemplateSwitchRequest(BaseModel): """Request to switch a template.""" - prompt_template_name: str = Field( - alias=AliasChoices("prompt_template_name", "name"), - description="Aliases: name", - ) + prompt_template_name: str