API + Model: Fix application of defaults

use_as_default was not being properly applied into model overrides.
For compartmentalization's sake, apply all overrides in a single function
to avoid clutter.

In addition, fix where the traditional /v1/model/load endpoint checks
for draft options. These can be applied via an inline config, so let
any failures fallthrough.

Signed-off-by: kingbri <8082010+kingbri1@users.noreply.github.com>

endpoints/core/router.py

@@ -193,18 +193,6 @@ async def load_model(data: ModelLoadRequest) -> ModelLoadResponse:
     model_path = pathlib.Path(config.model.model_dir)
     model_path = model_path / data.model_name
 
-    draft_model_path = None
-    if data.draft_model:
-        if not data.draft_model.draft_model_name:
-            error_message = handle_request_error(
-                "Could not find the draft model name for model load.",
-                exc_info=False,
-            ).error.message
-
-            raise HTTPException(400, error_message)
-
-        draft_model_path = config.draft_model.draft_model_dir
-
     if not model_path.exists():
         error_message = handle_request_error(
             "Could not find the model path for load. Check model name or config.yml?",
@@ -213,9 +201,7 @@ async def load_model(data: ModelLoadRequest) -> ModelLoadResponse:
 
         raise HTTPException(400, error_message)
 
-    return EventSourceResponse(
-        stream_model_load(data, model_path, draft_model_path), ping=maxsize
-    )
+    return EventSourceResponse(stream_model_load(data, model_path), ping=maxsize)
 
 
 # Unload model endpoint

endpoints/core/utils/model.py

@@ -77,16 +77,16 @@ def get_dummy_models():
 async def stream_model_load(
     data: ModelLoadRequest,
     model_path: pathlib.Path,
-    draft_model_path: str,
 ):
     """Request generation wrapper for the loading process."""
 
     # Get trimmed load data
     load_data = data.model_dump(exclude_none=True)
 
-    # Set the draft model path if it exists
-    if draft_model_path:
-        load_data["draft_model"]["draft_model_dir"] = draft_model_path
+    # Set the draft model directory
+    load_data.setdefault("draft_model", {})["draft_model_dir"] = (
+        config.draft_model.draft_model_dir
+    )
 
     load_status = model.load_model_gen(
         model_path, skip_wait=data.skip_queue, **load_data