feat: fix inheritance test

Author: adubovik

aidial_sdk/chat_completion/form.py

@@ -169,8 +169,8 @@ def _create_class(cls: Type[_Model]) -> Type[_Model]:
         }
 
         # Inject model config extensions
+        model_config = ModelConfigWrapper.create(cls, namespace)
         if chat_message_input_disabled is not None:
-            model_config = ModelConfigWrapper.create(cls, namespace)
             model_config["chat_message_input_disabled"] = (
                 chat_message_input_disabled
             )

aidial_sdk/utils/_pydantic.py

@@ -90,12 +90,10 @@ def create(
         cls, base_cls: Optional[Type[_Model]], namespace: Dict[str, Any]
     ) -> ModelConfigBase:
         if (config_cls := namespace.get("Config")) is None:
-            if base_cls:
-                conf_base_cls = getattr(cls, "Config", None)
-            else:
-                conf_base_cls = None
+            conf_base_cls = (
+                None if base_cls is None else getattr(base_cls, "Config", None)
+            )
 
-            # FIXME: add tests to confirm that the inheritance works
             config_cls = type("Config", (conf_base_cls or object,), {})
 
             if module := namespace.get("__module__"):
@@ -128,8 +126,15 @@ def schema_extra_field(self) -> str:
     def create(
         cls, base_cls: Optional[Type[_Model]], namespace: Dict[str, Any]
     ) -> ModelConfigBase:
-        # FIXME: merge with the existing "base_cls.model_config"
-        model_config = namespace["model_config"] = (
-            namespace.get("model_config") or {}
+        base_model_config = (
+            {} if base_cls is None else getattr(base_cls, "model_config", {})
         )
+
+        curr_model_config = namespace.get("model_config") or {}
+
+        model_config = namespace["model_config"] = {
+            **base_model_config,
+            **curr_model_config,
+        }
+
         return cls(model_config)

examples/tic_tac_toe/app/main.py

@@ -67,11 +67,12 @@ class InitConfiguration(BaseModel, metaclass=FormMetaclass):
 # The form defines the move the user in making during the tic-tac-toe game.
 # The bot suggest a list of available moves to the user.
 # The user pick one of the move by its index in the list and returns this data structure to the application.
-# Note that the form doesn't have any buttons, since the moves are determined dynamically. Nor does it have a DIAL specific configuration, since it inherits
-# from vanilla Pydantic BaseModel that it's aware of any DIAL specific features.
-# The buttons and configuration will be added to the model dynamically
-# in the `chat_completion`` handler via the class decorator "form".
+# Note that the form doesn't have any buttons, since the moves are determined dynamically.
+# The buttons will be added to the model dynamically
+# in the `chat_completion` handler via the class decorator "form".
 class MoveForm(BaseModel):
+    model_config = ConfigDict(chat_message_input_disabled=True)
+
     move: int
 
 
@@ -142,9 +143,7 @@ async def chat_completion(
                 )
 
                 # Use the form decorator to add buttons to the form.
-                _MoveForm = form(
-                    chat_message_input_disabled=True, move=move_selector
-                )(MoveForm)
+                _MoveForm = form(move=move_selector)(MoveForm)
 
                 # Save the form schema in the bot message
                 choice.set_form_schema(_MoveForm.model_json_schema())

tests/test_form.py

@@ -239,11 +239,6 @@ def test_configuration_parsing_two_buttons_success():
 
 
 def test_dynamic_configuration_input_disabled_static():
-    """
-    This test checks that DIAL specific features
-    aren't inherited from the vanilla BaseModel class.
-    """
-
     class Conf(BaseModel):
         if PYDANTIC_V2:
             model_config = ConfigDict(chat_message_input_disabled=True)
@@ -254,13 +249,12 @@ class Config:
 
     conf = form()(Conf)
 
-    assert model_json_schema(conf).get("dial:chatMessageInputDisabled") is None
+    assert model_json_schema(conf).get("dial:chatMessageInputDisabled") is True
 
 
 def test_dynamic_configuration_input_disabled_dynamic():
     class Conf(BaseModel):
         if PYDANTIC_V2:
-            # FIXME: fix type ignore
             model_config = ConfigDict(extra="forbid")  # type: ignore
         else:
 
@@ -275,7 +269,6 @@ class Config:
 def test_dynamic_configuration_input_disabled_omitted():
     class Conf(BaseModel):
         if PYDANTIC_V2:
-            # FIXME: fix type ignore
             model_config = ConfigDict(extra="forbid")  # type: ignore
         else: