Restructure independent model to patch draft model config

Signed-off-by: Fynn Schmitt-Ulms <[email protected]>

Author: fynnsu

src/speculators/config.py

@@ -253,14 +253,12 @@ def __pydantic_schema_base_type__(cls) -> type["SpeculatorModelConfig"]:
     schema_discriminator: ClassVar[str] = "speculators_model_type"
 
     # PretrainedConfig class attributes
-    model_type: ClassVar[str] = "speculator_model"  # type: ignore[misc]
     base_config_key: ClassVar[str] = ""  # type: ignore[misc]
     sub_configs: ClassVar[dict[str, PretrainedConfig]] = {}  # type: ignore[misc]
     is_composition: ClassVar[bool] = False  # type: ignore[misc]
     attribute_map: ClassVar[dict[str, str]] = {}  # type: ignore[misc]
     base_model_tp_plan: ClassVar[Optional[dict[str, Any]]] = None  # type: ignore[misc]
     base_model_pp_plan: ClassVar[Optional[dict[str, tuple[list[str]]]]] = None  # type: ignore[misc]
-    _auto_class: ClassVar[Optional[str]] = ""  # type: ignore[misc]
 
     # Speculator model instance attributes
     speculators_model_type: str = Field(
@@ -271,7 +269,7 @@ def __pydantic_schema_base_type__(cls) -> type["SpeculatorModelConfig"]:
         default=version("speculators"),
         description="Version of the speculators library",
     )
-    speculators_config: SpeculatorsConfig = Field(  # type: ignore[assignment]
+    speculators_config: Optional[SpeculatorsConfig] = Field(  # type: ignore[assignment]
         default=None,
         description=(
             "The speculators config describing what the model implements and creation. "
@@ -283,6 +281,9 @@ def __init__(self, **kwargs):
         # initialize the Pydantic arguments first to set all valid fields
         PydanticClassRegistryMixin.__init__(self, **kwargs)
 
+        # Set model_type to speculator_model if not already set
+        self.model_type = kwargs.setdefault("model_type", "speculator_model")
+
         # reset kwargs handled by Pydantic so PretrainedConfig doesn't override
         for field in self.__class__.model_fields:
             kwargs[field] = getattr(self, field)
@@ -308,14 +309,12 @@ def to_dict(self) -> dict[str, Any]:
             "auto_package",
             "registry_auto_discovery",
             "schema_discriminator",
-            "model_type",
             "base_config_key",
             "sub_configs",
             "is_composition",
             "attribute_map",
             "base_model_tp_plan",
             "base_model_pp_plan",
-            "_auto_class",
         ):
             config_dict.pop(key, None)