Fix checking of supported models

Author: TimPansino

tests/external_botocore/test_bedrock_chat_completion_invoke_model.py

@@ -14,6 +14,7 @@
 import json
 import os
 from io import BytesIO
+from pprint import pformat
 
 import boto3
 import botocore.eventstream
@@ -814,9 +815,17 @@ def test_bedrock_chat_completion_functions_marked_as_wrapped_for_sdk_compatibili
     assert bedrock_server._nr_wrapped
 
 
-def test_chat_models_instrumented():
-    SUPPORTED_MODELS = [model for model, _, _, _ in MODEL_EXTRACTORS if "embed" not in model]
+SUPPORTED_MODELS = [model for model, _, _, _ in MODEL_EXTRACTORS if "embed" not in model]
+
+
+def _is_supported_model(model):
+    for supported_model in SUPPORTED_MODELS:
+        if supported_model in model:
+            return True
+    return False
 
+
+def test_chat_models_instrumented():
     _id = os.environ.get("AWS_ACCESS_KEY_ID")
     key = os.environ.get("AWS_SECRET_ACCESS_KEY")
     if not _id or not key:
@@ -825,10 +834,6 @@ def test_chat_models_instrumented():
     client = boto3.client("bedrock", "us-east-1")
     response = client.list_foundation_models(byOutputModality="TEXT")
     models = [model["modelId"] for model in response["modelSummaries"]]
-    not_supported = []
-    for model in models:
-        is_supported = any(model.startswith(supported_model) for supported_model in SUPPORTED_MODELS)
-        if not is_supported:
-            not_supported.append(model)
+    not_supported = [model for model in models if not _is_supported_model(model)]
 
-    assert not not_supported, f"The following unsupported models were found: {not_supported}"
+    assert not not_supported, f"The following unsupported models were found: {pformat(not_supported)}"