rebase and fix some small breakage due to model -> model_id fix

llama_stack/providers/tests/agents/conftest.py

@@ -46,6 +46,16 @@ DEFAULT_PROVIDER_COMBINATIONS = [
         id="together",
         marks=pytest.mark.together,
     ),
+    pytest.param(
+        {
+            "inference": "fireworks",
+            "safety": "llama_guard",
+            "memory": "faiss",
+            "agents": "meta_reference",
+        },
+        id="fireworks",
+        marks=pytest.mark.fireworks,
+    ),
     pytest.param(
         {
             "inference": "remote",
@@ -60,7 +70,7 @@ DEFAULT_PROVIDER_COMBINATIONS = [
 
 
 def pytest_configure(config):
-    for mark in ["meta_reference", "ollama", "together", "remote"]:
+    for mark in ["meta_reference", "ollama", "together", "fireworks", "remote"]:
         config.addinivalue_line(
             "markers",
             f"{mark}: marks tests as {mark} specific",

llama_stack/providers/tests/inference/test_text_inference.py

@@ -147,9 +147,9 @@ class TestInference:
 
         user_input = "Michael Jordan was born in 1963. He played basketball for the Chicago Bulls. He retired in 2003."
         response = await inference_impl.completion(
+            model_id=inference_model,
             content=user_input,
             stream=False,
-            model=inference_model,
             sampling_params=SamplingParams(
                 max_tokens=50,
             ),

llama_stack/providers/tests/inference/test_vision_inference.py

@@ -55,7 +55,7 @@ class TestVisionModelInference:
             )
 
         response = await inference_impl.chat_completion(
-            model=inference_model,
+            model_id=inference_model,
             messages=[
                 UserMessage(content="You are a helpful assistant."),
                 UserMessage(content=[image, "Describe this image in two sentences."]),
@@ -102,7 +102,7 @@ class TestVisionModelInference:
             response = [
                 r
                 async for r in await inference_impl.chat_completion(
-                    model=inference_model,
+                    model_id=inference_model,
                     messages=[
                         UserMessage(content="You are a helpful assistant."),
                         UserMessage(