apply feedback

integrations/amazon_bedrock/src/haystack_integrations/components/generators/amazon_bedrock/generator.py

@@ -271,12 +271,17 @@ def run(
         return {"replies": replies}
 
     @classmethod
-    def get_model_adapter(cls, model: str, model_family: Optional[str]) -> Type[BedrockModelAdapter]:
+    def get_model_adapter(cls, model: str, model_family: Optional[str] = None) -> Type[BedrockModelAdapter]:
         """
         Gets the model adapter for the given model.
 
+        If `model_family` is provided, the adapter for the model family is returned.
+        If `model_family` is not provided, the adapter is auto-detected based on the model name.
+
         :param model: The model name.
+        :param model_family: The model family.
         :returns: The model adapter class, or None if no adapter is found.
+        :raises AmazonBedrockConfigurationError: If the model family is not supported or the model cannot be auto-detected.
         """
         if model_family:
             if model_family not in cls.SUPPORTED_MODEL_FAMILIES:

integrations/amazon_bedrock/tests/test_generator.py

@@ -306,7 +306,7 @@ def test_get_model_adapter(model: str, expected_model_adapter: Optional[Type[Bed
     """
     Test that the correct model adapter is returned for a given model
     """
-    model_adapter = AmazonBedrockGenerator.get_model_adapter(model=model, model_family=None)
+    model_adapter = AmazonBedrockGenerator.get_model_adapter(model=model)
     assert model_adapter == expected_model_adapter
 
 
@@ -345,7 +345,7 @@ def test_get_model_adapter_auto_detect_family_fails():
     Test that an error is raised when auto-detection of model_family fails
     """
     with pytest.raises(AmazonBedrockConfigurationError):
-        AmazonBedrockGenerator.get_model_adapter(model="arn:123435423", model_family=None)
+        AmazonBedrockGenerator.get_model_adapter(model="arn:123435423")
 
 
 def test_get_model_adapter_model_family_over_auto_detection():