security + refactor: harden scaffold, clean code, re-export FastMCP

packages/mcp-forge-aws/src/mcp_forge_aws/bedrock_llm.py

@@ -70,15 +70,9 @@ async def invoke(
         Supports both text and multimodal content blocks in messages.
         """
         bedrock_messages = [
-            {"role": m.role, "content": m.content if isinstance(m.content, str) else m.content}
-            for m in messages
+            {"role": m.role, "content": m.content} for m in messages
         ]
 
-        # Convert plain string content to Messages API format
-        for msg in bedrock_messages:
-            if isinstance(msg["content"], str):
-                msg["content"] = msg["content"]
-
         body = {
             "anthropic_version": "bedrock-2023-05-31",
             "max_tokens": max_tokens,

packages/mcp-forge-aws/src/mcp_forge_aws/cloudwatch.py

@@ -25,7 +25,7 @@
 from typing import Any
 
 import boto3
-from botocore.exceptions import ClientError
+from botocore.exceptions import BotoCoreError, ClientError
 
 from mcp_forge_core.providers.telemetry import BaseTelemetryProvider
 
@@ -97,15 +97,12 @@ async def emit_metric(
             )
 
         try:
-            loop = asyncio.get_running_loop()
-            await loop.run_in_executor(
-                None,
-                lambda: self._get_client().put_metric_data(
-                    Namespace=self._namespace,
-                    MetricData=[metric_data],
-                ),
+            await asyncio.to_thread(
+                self._get_client().put_metric_data,
+                Namespace=self._namespace,
+                MetricData=[metric_data],
             )
-        except (ClientError, Exception) as e:
+        except (ClientError, BotoCoreError) as e:
             logger.warning("Failed to emit metric %s: %s", name, e)
 
     def __repr__(self) -> str:

packages/mcp-forge-aws/src/mcp_forge_aws/dynamodb_cache.py

@@ -23,6 +23,7 @@
 from typing import Any
 
 import boto3
+from botocore.exceptions import BotoCoreError, ClientError
 
 from mcp_forge_core.providers.cache import BaseCacheProvider
 
@@ -76,7 +77,7 @@ async def get(self, key: str) -> dict | None:
                 ttl_val = int(item.get("ttl", {}).get("N", "0"))
                 if ttl_val > time.time():
                     return json.loads(item[self._data_field]["S"])
-        except Exception as e:
+        except (ClientError, BotoCoreError) as e:
             logger.warning("Cache get failed (non-fatal): %s", e)
         return None
 
@@ -93,7 +94,7 @@ async def put(self, key: str, data: dict, ttl_seconds: int | None = None) -> Non
                     "ttl": {"N": str(int(time.time()) + ttl)},
                 },
             )
-        except Exception as e:
+        except (ClientError, BotoCoreError) as e:
             logger.warning("Cache put failed (non-fatal): %s", e)
 
     async def delete(self, key: str) -> bool:
@@ -106,7 +107,7 @@ async def delete(self, key: str) -> bool:
                 ReturnValues="ALL_OLD",
             )
             return "Attributes" in response
-        except Exception as e:
+        except (ClientError, BotoCoreError) as e:
             logger.warning("Cache delete failed (non-fatal): %s", e)
             return False