make options an explicit kwarg

Signed-off-by: Panos Vagenas <[email protected]>

Author: vagenas

docling/models/base_model.py

@@ -14,6 +14,8 @@ class BaseModelWithOptions(Protocol):
     @classmethod
     def get_options_type(cls) -> Type[BaseOptions]: ...
 
+    def __init__(self, *, options: BaseOptions, **kwargs): ...
+
 
 class BasePageModel(ABC):
     @abstractmethod

docling/models/base_ocr_model.py

@@ -22,6 +22,7 @@
 class BaseOcrModel(BasePageModel, BaseModelWithOptions):
     def __init__(
         self,
+        *,
         enabled: bool,
         artifacts_path: Optional[Path],
         options: OcrOptions,

docling/models/factories/base_factory.py

@@ -39,10 +39,10 @@ def get_enum(self) -> enum.Enum:
     def classes(self):
         return self._classes
 
-    def create_instance(self, options: BaseOptions, *args, **kwargs) -> A:
+    def create_instance(self, options: BaseOptions, **kwargs) -> A:
         try:
             _cls = self._classes[type(options)]
-            return _cls(*args, **kwargs)
+            return _cls(options=options, **kwargs)
         except KeyError:
             raise RuntimeError(self._err_msg_on_class_not_found(options.kind))
 

docling/models/picture_description_base_model.py

@@ -32,6 +32,7 @@ class PictureDescriptionBaseModel(
 
     def __init__(
         self,
+        *,
         enabled: bool,
         enable_remote_services: bool,
         artifacts_path: Optional[Union[Path, str]],