Merge conflicts

llama_stack/cli/model/prompt_format.py

@@ -50,12 +50,6 @@ class ModelPromptFormat(Subcommand):
             action="store_true",
             help="List all available models",
         )
-        self.parser.add_argument(
-            "-l",
-            "--list",
-            action="store_true",
-            help="List all available models",
-        )
 
     def _run_model_template_cmd(self, args: argparse.Namespace) -> None:
         import importlib.resources

llama_stack/providers/remote/safety/nvidia/nvidia.py

@@ -5,7 +5,7 @@
 # the root directory of this source tree.
 
 import logging
-from typing import Any, Dict, List
+from typing import Any, List, Optional
 
 import requests
 
@@ -42,10 +42,7 @@ class NVIDIASafetyAdapter(Safety, ShieldsProtocolPrivate):
             raise ValueError("Shield model not provided.")
 
     async def run_shield(
-        self,
-        shield_id: str,
-        messages: List[Message],
-        params: Dict[str, Any] = None,
+        self, shield_id: str, messages: List[Message], params: Optional[dict[str, Any]] = None
     ) -> RunShieldResponse:
         """
         Run a safety shield check against the provided messages.
@@ -53,6 +50,7 @@ class NVIDIASafetyAdapter(Safety, ShieldsProtocolPrivate):
         Args:
             shield_id (str): The unique identifier for the shield to be used.
             messages (List[Message]): A list of Message objects representing the conversation history.
+            params (Optional[dict[str, Any]]): Additional parameters for the shield check.
 
         Returns:
             RunShieldResponse: The response containing safety violation details if any.