kiln-ai 0.19.0__py3-none-any.whl → 0.21.0__py3-none-any.whl

kiln_ai/adapters/ml_model_list.py

@@ -5,6 +5,7 @@ from pydantic import BaseModel
 
 from kiln_ai.datamodel.datamodel_enums import (
     ChatStrategy,
+    KilnMimeType,
     ModelProviderName,
     StructuredOutputMode,
 )
@@ -39,6 +40,8 @@ class ModelFamily(str, Enum):
     ernie = "ernie"
     minimax = "minimax"
     pangu = "pangu"
+    bytedance = "bytedance"
+    stepfun = "stepfun"
 
 
 # Where models have instruct and raw versions, instruct is default and raw is specified
@@ -93,6 +96,7 @@ class ModelName(str, Enum):
     gemma_2_2b = "gemma_2_2b"
     gemma_2_9b = "gemma_2_9b"
     gemma_2_27b = "gemma_2_27b"
+    gemma_3_0p27b = "gemma_3_0p27b"
     gemma_3_1b = "gemma_3_1b"
     gemma_3_4b = "gemma_3_4b"
     gemma_3_12b = "gemma_3_12b"
@@ -119,6 +123,7 @@ class ModelName(str, Enum):
     qwen_2p5_14b = "qwen_2p5_14b"
     qwen_2p5_72b = "qwen_2p5_72b"
     qwq_32b = "qwq_32b"
+    deepseek_3_1 = "deepseek_3_1"
     deepseek_3 = "deepseek_3"
     deepseek_r1 = "deepseek_r1"
     deepseek_r1_0528 = "deepseek_r1_0528"
@@ -134,6 +139,9 @@ class ModelName(str, Enum):
     grok_3 = "grok_3"
     grok_3_mini = "grok_3_mini"
     grok_4 = "grok_4"
+    qwen_3_next_80b_a3b = "qwen_3_next_80b_a3b"
+    qwen_3_next_80b_a3b_thinking = "qwen_3_next_80b_a3b_thinking"
+    qwen_3_max = "qwen_3_max"
     qwen_3_0p6b = "qwen_3_0p6b"
     qwen_3_0p6b_no_thinking = "qwen_3_0p6b_no_thinking"
     qwen_3_1p7b = "qwen_3_1p7b"
@@ -156,7 +164,10 @@ class ModelName(str, Enum):
     qwen_3_235b_a22b_no_thinking = "qwen_3_235b_a22b_no_thinking"
     qwen_long_l1_32b = "qwen_long_l1_32b"
     kimi_k2 = "kimi_k2"
+    kimi_k2_0905 = "kimi_k2_0905"
     kimi_dev_72b = "kimi_dev_72b"
+    glm_4_5 = "glm_4_5"
+    glm_4_5_air = "glm_4_5_air"
     glm_4_1v_9b_thinking = "glm_4_1v_9b_thinking"
     glm_z1_32b_0414 = "glm_z1_32b_0414"
     glm_z1_9b_0414 = "glm_z1_9b_0414"
@@ -165,6 +176,8 @@ class ModelName(str, Enum):
     hunyuan_a13b_no_thinking = "hunyuan_a13b_no_thinking"
     minimax_m1_80k = "minimax_m1_80k"
     pangu_pro_moe_72b_a16b = "pangu_pro_moe_72b_a16b"
+    bytedance_seed_oss_36b = "bytedance_seed_oss_36b"
+    stepfun_step3 = "stepfun_step3"
 
 
 class ModelParserID(str, Enum):
@@ -198,6 +211,10 @@ class KilnModelProvider(BaseModel):
         parser: A parser to use for the model, if applicable
         reasoning_capable: Whether the model is designed to output thinking in a structured format (eg <think></think>). If so we don't use COT across 2 calls, and ask for thinking and final response in the same call.
         tuned_chat_strategy: Used when a model is finetuned with a specific chat strategy, and it's best to use it at call time.
+        supports_doc_extraction: Whether the provider is meant to support document extraction
+        suggested_for_doc_extraction: Whether the model is suggested for document extraction
+        multimodal_capable: Whether the model supports multimodal inputs (e.g. images, audio, video, PDFs, etc.)
+        multimodal_mime_types: The mime types that the model supports for multimodal inputs (e.g. image/jpeg, video/mp4, application/pdf, etc.)
     """
 
     name: ModelProviderName
@@ -213,9 +230,14 @@ class KilnModelProvider(BaseModel):
     reasoning_capable: bool = False
     supports_logprobs: bool = False
     suggested_for_evals: bool = False
+    supports_function_calling: bool = True
     uncensored: bool = False
     suggested_for_uncensored_data_gen: bool = False
     tuned_chat_strategy: ChatStrategy | None = None
+    supports_doc_extraction: bool = False
+    suggested_for_doc_extraction: bool = False
+    multimodal_capable: bool = False
+    multimodal_mime_types: List[str] | None = None
 
     # We need a more generalized way to handle custom provider parameters.
     # Making them quite declarative here for now, isolating provider specific logic
@@ -270,6 +292,22 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 suggested_for_data_gen=True,
                 suggested_for_evals=True,
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="openai/gpt-5",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                suggested_for_data_gen=True,
+                suggested_for_evals=True,
             ),
         ],
     ),
@@ -285,6 +323,22 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 suggested_for_evals=True,
                 suggested_for_data_gen=True,
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="openai/gpt-5-mini",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                suggested_for_evals=True,
+                suggested_for_data_gen=True,
             ),
         ],
     ),
@@ -298,6 +352,20 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.openai,
                 model_id="gpt-5-nano",
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="openai/gpt-5-nano",
+                structured_output_mode=StructuredOutputMode.json_schema,
             ),
         ],
     ),
@@ -312,6 +380,7 @@ built_in_models: List[KilnModel] = [
                 model_id="gpt-5-chat-latest",
                 # Oddly no json_schema support for this model.
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -328,6 +397,16 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 supports_logprobs=True,
                 suggested_for_evals=True,
+                suggested_for_data_gen=True,
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
@@ -335,11 +414,31 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 supports_logprobs=True,
                 suggested_for_evals=True,
+                suggested_for_data_gen=True,
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
             ),
             KilnModelProvider(
                 name=ModelProviderName.azure_openai,
                 model_id="gpt-4.1",
                 suggested_for_evals=True,
+                suggested_for_data_gen=True,
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
             ),
         ],
     ),
@@ -788,26 +887,25 @@ built_in_models: List[KilnModel] = [
             ),
         ],
     ),
-    # Claude 3.5 Sonnet
+    # Claude Sonnet 4
     KilnModel(
         family=ModelFamily.claude,
-        name=ModelName.claude_3_5_sonnet,
-        friendly_name="Claude 3.5 Sonnet",
+        name=ModelName.claude_sonnet_4,
+        friendly_name="Claude 4 Sonnet",
         providers=[
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
+                model_id="anthropic/claude-sonnet-4",
                 structured_output_mode=StructuredOutputMode.function_calling,
-                model_id="anthropic/claude-3.5-sonnet",
+                suggested_for_data_gen=True,
+                suggested_for_evals=True,
             ),
             KilnModelProvider(
                 name=ModelProviderName.anthropic,
-                model_id="claude-3-5-sonnet-20241022",
+                model_id="claude-sonnet-4-20250514",
                 structured_output_mode=StructuredOutputMode.function_calling,
-            ),
-            KilnModelProvider(
-                name=ModelProviderName.vertex,
-                model_id="claude-3-5-sonnet",
-                structured_output_mode=StructuredOutputMode.function_calling_weak,
+                suggested_for_data_gen=True,
+                suggested_for_evals=True,
             ),
         ],
     ),
@@ -852,25 +950,26 @@ built_in_models: List[KilnModel] = [
             ),
         ],
     ),
-    # Claude Sonnet 4
+    # Claude 3.5 Sonnet
     KilnModel(
         family=ModelFamily.claude,
-        name=ModelName.claude_sonnet_4,
-        friendly_name="Claude Sonnet 4",
+        name=ModelName.claude_3_5_sonnet,
+        friendly_name="Claude 3.5 Sonnet",
         providers=[
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
-                model_id="anthropic/claude-sonnet-4",
                 structured_output_mode=StructuredOutputMode.function_calling,
-                suggested_for_data_gen=True,
-                suggested_for_evals=True,
+                model_id="anthropic/claude-3.5-sonnet",
             ),
             KilnModelProvider(
                 name=ModelProviderName.anthropic,
-                model_id="claude-sonnet-4-20250514",
+                model_id="claude-3-5-sonnet-20241022",
                 structured_output_mode=StructuredOutputMode.function_calling,
-                suggested_for_data_gen=True,
-                suggested_for_evals=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.vertex,
+                model_id="claude-3-5-sonnet",
+                structured_output_mode=StructuredOutputMode.function_calling_weak,
             ),
         ],
     ),
@@ -905,6 +1004,20 @@ built_in_models: List[KilnModel] = [
                 suggested_for_data_gen=True,
                 suggested_for_evals=True,
                 reasoning_capable=True,
+                supports_doc_extraction=True,
+                suggested_for_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    KilnMimeType.CSV,
+                    KilnMimeType.TXT,
+                    KilnMimeType.HTML,
+                    KilnMimeType.MD,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
                 gemini_reasoning_enabled=True,
                 thinking_level="medium",
             ),
@@ -914,6 +1027,27 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 suggested_for_data_gen=True,
                 suggested_for_evals=True,
+                supports_doc_extraction=True,
+                suggested_for_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    KilnMimeType.CSV,
+                    KilnMimeType.TXT,
+                    KilnMimeType.HTML,
+                    KilnMimeType.MD,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                    # audio
+                    KilnMimeType.MP3,
+                    KilnMimeType.WAV,
+                    KilnMimeType.OGG,
+                    # video
+                    KilnMimeType.MP4,
+                    KilnMimeType.MOV,
+                ],
                 reasoning_capable=True,
                 gemini_reasoning_enabled=True,
                 thinking_level="medium",
@@ -941,6 +1075,20 @@ built_in_models: List[KilnModel] = [
                 model_id="google/gemini-2.5-flash",
                 structured_output_mode=StructuredOutputMode.json_schema,
                 reasoning_capable=True,
+                supports_doc_extraction=True,
+                suggested_for_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    KilnMimeType.CSV,
+                    KilnMimeType.TXT,
+                    KilnMimeType.HTML,
+                    KilnMimeType.MD,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
                 gemini_reasoning_enabled=True,
             ),
             KilnModelProvider(
@@ -949,6 +1097,27 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 reasoning_capable=True,
                 thinking_level="medium",
+                supports_doc_extraction=True,
+                suggested_for_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    KilnMimeType.CSV,
+                    KilnMimeType.TXT,
+                    KilnMimeType.HTML,
+                    KilnMimeType.MD,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                    # audio
+                    KilnMimeType.MP3,
+                    KilnMimeType.WAV,
+                    KilnMimeType.OGG,
+                    # video
+                    KilnMimeType.MP4,
+                    KilnMimeType.MOV,
+                ],
             ),
             KilnModelProvider(
                 name=ModelProviderName.vertex,
@@ -968,11 +1137,44 @@ built_in_models: List[KilnModel] = [
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
                 model_id="google/gemini-2.0-flash-001",
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    KilnMimeType.CSV,
+                    KilnMimeType.TXT,
+                    KilnMimeType.HTML,
+                    KilnMimeType.MD,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
                 structured_output_mode=StructuredOutputMode.json_schema,
             ),
             KilnModelProvider(
                 name=ModelProviderName.gemini_api,
                 model_id="gemini-2.0-flash",
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    KilnMimeType.CSV,
+                    KilnMimeType.TXT,
+                    KilnMimeType.HTML,
+                    KilnMimeType.MD,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                    # audio
+                    KilnMimeType.MP3,
+                    KilnMimeType.WAV,
+                    KilnMimeType.OGG,
+                    # video
+                    KilnMimeType.MP4,
+                    KilnMimeType.MOV,
+                ],
                 structured_output_mode=StructuredOutputMode.json_schema,
             ),
             KilnModelProvider(
@@ -992,11 +1194,44 @@ built_in_models: List[KilnModel] = [
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
                 model_id="google/gemini-2.0-flash-lite-001",
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    KilnMimeType.CSV,
+                    KilnMimeType.TXT,
+                    KilnMimeType.HTML,
+                    KilnMimeType.MD,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                ],
                 structured_output_mode=StructuredOutputMode.json_schema,
             ),
             KilnModelProvider(
                 name=ModelProviderName.gemini_api,
                 model_id="gemini-2.0-flash-lite",
+                supports_doc_extraction=True,
+                multimodal_capable=True,
+                multimodal_mime_types=[
+                    # documents
+                    KilnMimeType.PDF,
+                    KilnMimeType.CSV,
+                    KilnMimeType.TXT,
+                    KilnMimeType.HTML,
+                    KilnMimeType.MD,
+                    # images
+                    KilnMimeType.JPG,
+                    KilnMimeType.PNG,
+                    # audio
+                    KilnMimeType.MP3,
+                    KilnMimeType.WAV,
+                    KilnMimeType.OGG,
+                    # video
+                    KilnMimeType.MP4,
+                    KilnMimeType.MOV,
+                ],
                 structured_output_mode=StructuredOutputMode.json_schema,
             ),
             KilnModelProvider(
@@ -1084,6 +1319,7 @@ built_in_models: List[KilnModel] = [
                 supports_structured_output=False,
                 supports_data_gen=False,
                 model_id="nvidia/llama-3.1-nemotron-70b-instruct",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1097,16 +1333,19 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.openrouter,
                 model_id="meta-llama/llama-4-maverick",
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.fireworks_ai,
                 model_id="accounts/fireworks/models/llama4-maverick-instruct-basic",
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
                 model_id="meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8",
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.cerebras,
@@ -1125,16 +1364,19 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.openrouter,
                 model_id="meta-llama/llama-4-scout",
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.fireworks_ai,
                 model_id="accounts/fireworks/models/llama4-scout-instruct-basic",
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
                 model_id="meta-llama/Llama-4-Scout-17B-16E-Instruct",
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.cerebras,
@@ -1152,24 +1394,28 @@ built_in_models: List[KilnModel] = [
             KilnModelProvider(
                 name=ModelProviderName.groq,
                 model_id="llama-3.1-8b-instant",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.amazon_bedrock,
                 structured_output_mode=StructuredOutputMode.json_schema,
                 supports_structured_output=False,
                 model_id="meta.llama3-1-8b-instruct-v1:0",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 structured_output_mode=StructuredOutputMode.json_schema,
                 model_id="llama3.1:8b",
                 ollama_model_aliases=["llama3.1"],  # 8b is default
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
                 supports_data_gen=False,
                 structured_output_mode=StructuredOutputMode.function_calling,
                 model_id="meta-llama/llama-3.1-8b-instruct",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.fireworks_ai,
@@ -1177,6 +1423,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 supports_data_gen=False,
                 model_id="accounts/fireworks/models/llama-v3p1-8b-instruct",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
@@ -1184,6 +1431,7 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=False,
                 structured_output_mode=StructuredOutputMode.function_calling_weak,
                 provider_finetune_id="meta-llama/Meta-Llama-3.1-8B-Instruct-Reference",
+                # Constrained decode? They make function calling work when no one else does!
             ),
             KilnModelProvider(
                 name=ModelProviderName.cerebras,
@@ -1191,6 +1439,13 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.function_calling,
                 supports_data_gen=False,
                 suggested_for_evals=False,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                structured_output_mode=StructuredOutputMode.json_schema,
+                model_id="ai/llama3.1:8B-Q4_K_M",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1205,6 +1460,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 supports_data_gen=False,
                 model_id="meta.llama3-1-70b-instruct-v1:0",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
@@ -1213,11 +1469,13 @@ built_in_models: List[KilnModel] = [
                 model_id="meta-llama/llama-3.1-70b-instruct",
                 supports_logprobs=True,
                 logprobs_openrouter_options=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 structured_output_mode=StructuredOutputMode.json_schema,
                 model_id="llama3.1:70b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.fireworks_ai,
@@ -1255,6 +1513,7 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.openrouter,
                 structured_output_mode=StructuredOutputMode.function_calling,
                 model_id="meta-llama/llama-3.1-405b-instruct",
+                supports_function_calling=False,  # Not reliable
             ),
             KilnModelProvider(
                 name=ModelProviderName.fireworks_ai,
@@ -1307,6 +1566,12 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.openrouter,
                 model_id="mistralai/mistral-nemo",
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
+                supports_function_calling=False,  # Not reliable
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/mistral-nemo:12B-Q4_K_M",
+                structured_output_mode=StructuredOutputMode.json_schema,
             ),
         ],
     ),
@@ -1351,12 +1616,21 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=False,
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 model_id="meta-llama/llama-3.2-1b-instruct",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 supports_structured_output=False,
                 supports_data_gen=False,
                 model_id="llama3.2:1b",
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                supports_structured_output=False,
+                supports_data_gen=False,
+                model_id="ai/llama3.2:1B-F16",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1372,11 +1646,13 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=False,
                 structured_output_mode=StructuredOutputMode.json_schema,
                 model_id="meta-llama/llama-3.2-3b-instruct",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 supports_data_gen=False,
                 model_id="llama3.2",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
@@ -1384,6 +1660,13 @@ built_in_models: List[KilnModel] = [
                 supports_structured_output=False,
                 supports_data_gen=False,
             ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/llama3.2:3B-Q4_K_M",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_data_gen=False,
+                supports_function_calling=False,
+            ),
         ],
     ),
     # Llama 3.2 11B
@@ -1399,17 +1682,20 @@ built_in_models: List[KilnModel] = [
                 supports_structured_output=False,
                 supports_data_gen=False,
                 model_id="meta-llama/llama-3.2-11b-vision-instruct",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 structured_output_mode=StructuredOutputMode.json_schema,
                 model_id="llama3.2-vision",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
                 model_id="meta-llama/Llama-3.2-11B-Vision-Instruct-Turbo",
                 supports_structured_output=False,
                 supports_data_gen=False,
+                supports_function_calling=False,  # weird 3b works and 11b doesn't but... vision?
             ),
         ],
     ),
@@ -1423,17 +1709,20 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.openrouter,
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 model_id="meta-llama/llama-3.2-90b-vision-instruct",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 structured_output_mode=StructuredOutputMode.json_schema,
                 model_id="llama3.2-vision:90b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
                 model_id="meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo",
                 supports_structured_output=False,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1450,23 +1739,27 @@ built_in_models: List[KilnModel] = [
                 # Openrouter not working with json_schema or tools. JSON_schema sometimes works so force that, but not consistently so still not recommended.
                 supports_structured_output=False,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.groq,
                 supports_structured_output=True,
                 supports_data_gen=True,
                 model_id="llama-3.3-70b-versatile",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 structured_output_mode=StructuredOutputMode.json_schema,
                 model_id="llama3.3",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.fireworks_ai,
                 # Tool calling forces schema -- fireworks doesn't support json_schema, just json_mode
                 structured_output_mode=StructuredOutputMode.function_calling_weak,
                 model_id="accounts/fireworks/models/llama-v3p3-70b-instruct",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.vertex,
@@ -1474,11 +1767,19 @@ built_in_models: List[KilnModel] = [
                 # Doesn't work yet; needs debugging
                 supports_structured_output=False,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
                 model_id="meta-llama/Llama-3.3-70B-Instruct-Turbo",
                 structured_output_mode=StructuredOutputMode.function_calling_weak,
+                # Tools work. Probably constrained decode? Nice
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                structured_output_mode=StructuredOutputMode.json_schema,
+                model_id="ai/llama3.3:70B-Q4_K_M",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1494,6 +1795,7 @@ built_in_models: List[KilnModel] = [
                 supports_structured_output=False,
                 supports_data_gen=False,
                 model_id="phi3.5",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
@@ -1501,6 +1803,7 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=False,
                 model_id="microsoft/phi-3.5-mini-128k-instruct",
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1514,6 +1817,7 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.ollama,
                 structured_output_mode=StructuredOutputMode.json_schema,
                 model_id="phi4",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
@@ -1521,6 +1825,13 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 supports_data_gen=False,
                 model_id="microsoft/phi-4",
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                structured_output_mode=StructuredOutputMode.json_schema,
+                model_id="ai/phi4:14B-Q4_K_M",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1535,6 +1846,7 @@ built_in_models: List[KilnModel] = [
                 model_id="microsoft/phi-4-multimodal-instruct",
                 supports_structured_output=False,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1547,6 +1859,7 @@ built_in_models: List[KilnModel] = [
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 model_id="phi4-mini",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1560,6 +1873,7 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.ollama,
                 supports_data_gen=False,
                 model_id="gemma2:2b",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1573,6 +1887,7 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.ollama,
                 supports_data_gen=False,
                 model_id="gemma2:9b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
@@ -1581,6 +1896,7 @@ built_in_models: List[KilnModel] = [
                 supports_structured_output=False,
                 supports_data_gen=False,
                 model_id="google/gemma-2-9b-it",
+                supports_function_calling=False,
             ),
             # fireworks AI errors - not allowing system role. Exclude until resolved.
         ],
@@ -1595,15 +1911,32 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.ollama,
                 supports_data_gen=False,
                 model_id="gemma2:27b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 supports_data_gen=False,
                 model_id="google/gemma-2-27b-it",
+                supports_function_calling=False,
             ),
         ],
     ),
+    # Gemma 3 270M
+    KilnModel(
+        family=ModelFamily.gemma,
+        name=ModelName.gemma_3_0p27b,
+        friendly_name="Gemma 3 270M",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/gemma3:270M-F16",
+                supports_structured_output=False,
+                supports_data_gen=False,
+                supports_function_calling=False,
+            )
+        ],
+    ),
     # Gemma 3 1B
     KilnModel(
         family=ModelFamily.gemma,
@@ -1615,6 +1948,14 @@ built_in_models: List[KilnModel] = [
                 model_id="gemma3:1b",
                 supports_structured_output=False,
                 supports_data_gen=False,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/gemma3:1B-F16",
+                supports_structured_output=False,
+                supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1628,11 +1969,18 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.ollama,
                 model_id="gemma3:4b",
                 ollama_model_aliases=["gemma3"],
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 model_id="google/gemma-3-4b-it",
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/gemma3:4B-Q4_K_M",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1645,11 +1993,13 @@ built_in_models: List[KilnModel] = [
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 model_id="gemma3:12b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 model_id="google/gemma-3-12b-it",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1662,11 +2012,13 @@ built_in_models: List[KilnModel] = [
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 model_id="gemma3:27b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 model_id="google/gemma-3-27b-it",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1681,12 +2033,14 @@ built_in_models: List[KilnModel] = [
                 model_id="gemma3n:e2b",
                 structured_output_mode=StructuredOutputMode.json_schema,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.gemini_api,
                 model_id="gemma-3n-e2b-it",
                 supports_structured_output=False,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1701,18 +2055,28 @@ built_in_models: List[KilnModel] = [
                 model_id="google/gemma-3n-e4b-it",
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 model_id="gemma3n:e4b",
                 supports_data_gen=False,
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.gemini_api,
                 model_id="gemma-3n-e4b-it",
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 supports_data_gen=False,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/gemma3n:4B-Q4_K_M",
+                supports_data_gen=False,
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1727,10 +2091,12 @@ built_in_models: List[KilnModel] = [
                 model_id="mistralai/mixtral-8x7b-instruct",
                 supports_data_gen=False,
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 model_id="mixtral",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1748,13 +2114,7 @@ built_in_models: List[KilnModel] = [
                 r1_openrouter_options=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 parser=ModelParserID.r1_thinking,
-            ),
-            KilnModelProvider(
-                name=ModelProviderName.fireworks_ai,
-                model_id="accounts/fireworks/models/qwq-32b",
-                reasoning_capable=True,
-                parser=ModelParserID.r1_thinking,
-                structured_output_mode=StructuredOutputMode.json_instructions,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -1762,6 +2122,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 parser=ModelParserID.r1_thinking,
                 structured_output_mode=StructuredOutputMode.json_instructions,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
@@ -1769,6 +2130,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 parser=ModelParserID.r1_thinking,
                 reasoning_capable=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -1776,6 +2138,14 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 reasoning_capable=True,
             ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/qwq:32B-Q4_K_M",
+                reasoning_capable=True,
+                parser=ModelParserID.r1_thinking,
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                supports_function_calling=False,
+            ),
         ],
     ),
     # Qwen 2.5 7B
@@ -1788,10 +2158,17 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.openrouter,
                 model_id="qwen/qwen-2.5-7b-instruct",
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 model_id="qwen2.5",
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/qwen2.5:7B-Q4_K_M",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1809,6 +2186,7 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.ollama,
                 model_id="qwen2.5:14b",
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1830,12 +2208,6 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.ollama,
                 model_id="qwen2.5:72b",
             ),
-            KilnModelProvider(
-                name=ModelProviderName.fireworks_ai,
-                model_id="accounts/fireworks/models/qwen2p5-72b-instruct",
-                # Tool calling forces schema -- fireworks doesn't support json_schema, just json_mode
-                structured_output_mode=StructuredOutputMode.function_calling_weak,
-            ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
                 provider_finetune_id="Qwen/Qwen2.5-72B-Instruct",
@@ -1853,11 +2225,13 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instruction_and_object,
                 model_id="mistralai/mistral-small-24b-instruct-2501",
                 uncensored=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 model_id="mistral-small:24b",
                 uncensored=True,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1892,6 +2266,7 @@ built_in_models: List[KilnModel] = [
                 parser=ModelParserID.r1_thinking,
                 reasoning_capable=True,
                 supports_data_gen=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -1900,6 +2275,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 reasoning_capable=True,
                 supports_data_gen=True,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -1916,6 +2292,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 r1_openrouter_options=True,
                 require_openrouter_reasoning=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -1924,6 +2301,33 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 reasoning_optional_for_structured_output=True,
                 supports_data_gen=False,
+                supports_function_calling=False,
+            ),
+        ],
+    ),
+    # DeepSeek 3.1
+    KilnModel(
+        family=ModelFamily.deepseek,
+        name=ModelName.deepseek_3_1,
+        friendly_name="DeepSeek 3.1",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="deepseek/deepseek-chat-v3.1",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_data_gen=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.fireworks_ai,
+                model_id="accounts/fireworks/models/deepseek-v3p1",
+                structured_output_mode=StructuredOutputMode.json_instruction_and_object,
+                supports_data_gen=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.siliconflow_cn,
+                model_id="Pro/deepseek-ai/DeepSeek-V3.1",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_data_gen=True,
             ),
         ],
     ),
@@ -1978,6 +2382,7 @@ built_in_models: List[KilnModel] = [
                 parser=ModelParserID.r1_thinking,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 reasoning_capable=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 # I want your RAM
@@ -2003,6 +2408,7 @@ built_in_models: List[KilnModel] = [
                 r1_openrouter_options=True,
                 parser=ModelParserID.r1_thinking,
                 require_openrouter_reasoning=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2010,12 +2416,14 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 model_id="deepseek-r1:32b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
                 model_id="deepseek-ai/DeepSeek-R1-Distill-Qwen-32B",
                 structured_output_mode=StructuredOutputMode.json_schema,
                 reasoning_capable=True,
+                supports_function_calling=False,
                 reasoning_optional_for_structured_output=True,
             ),
         ],
@@ -2034,6 +2442,7 @@ built_in_models: List[KilnModel] = [
                 r1_openrouter_options=True,
                 require_openrouter_reasoning=True,
                 parser=ModelParserID.r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2042,12 +2451,23 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 model_id="deepseek-r1:70b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
                 model_id="deepseek-ai/DeepSeek-R1-Distill-Llama-70B",
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 parser=ModelParserID.r1_thinking,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                supports_data_gen=False,
+                parser=ModelParserID.r1_thinking,
+                reasoning_capable=True,
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                model_id="ai/deepseek-r1-distill-llama:70B-Q4_K_M",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2067,6 +2487,7 @@ built_in_models: List[KilnModel] = [
                 require_openrouter_reasoning=True,
                 openrouter_skip_required_parameters=True,
                 parser=ModelParserID.r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2075,12 +2496,14 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 model_id="deepseek-r1:14b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
                 model_id="deepseek-ai/DeepSeek-R1-Distill-Qwen-14B",
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 parser=ModelParserID.r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -2089,6 +2512,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 reasoning_optional_for_structured_output=True,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2110,6 +2534,7 @@ built_in_models: List[KilnModel] = [
                 require_openrouter_reasoning=True,
                 openrouter_skip_required_parameters=True,
                 parser=ModelParserID.r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2120,6 +2545,18 @@ built_in_models: List[KilnModel] = [
                 # Best mode, but fails to often to enable without warning
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 model_id="deepseek-r1:8b",
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                supports_structured_output=False,
+                supports_data_gen=False,
+                parser=ModelParserID.r1_thinking,
+                reasoning_capable=True,
+                # Best mode, but fails to often to enable without warning
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                model_id="ai/deepseek-r1-distill-llama:8B-Q4_K_M",
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2139,6 +2576,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 r1_openrouter_options=True,
                 require_openrouter_reasoning=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2149,6 +2587,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 model_id="deepseek-r1:7b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -2159,6 +2598,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 reasoning_capable=True,
                 reasoning_optional_for_structured_output=True,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2179,6 +2619,7 @@ built_in_models: List[KilnModel] = [
                 require_openrouter_reasoning=True,
                 openrouter_skip_required_parameters=True,
                 parser=ModelParserID.r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2188,6 +2629,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 model_id="deepseek-r1:1.5b",
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.together_ai,
@@ -2196,6 +2638,7 @@ built_in_models: List[KilnModel] = [
                 parser=ModelParserID.r1_thinking,
                 supports_structured_output=False,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2212,6 +2655,7 @@ built_in_models: List[KilnModel] = [
                 model_id="dolphin-mixtral:8x22b",
                 uncensored=True,
                 suggested_for_uncensored_data_gen=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
@@ -2220,6 +2664,7 @@ built_in_models: List[KilnModel] = [
                 model_id="cognitivecomputations/dolphin-mixtral-8x22b",
                 uncensored=True,
                 suggested_for_uncensored_data_gen=True,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2289,6 +2734,53 @@ built_in_models: List[KilnModel] = [
             ),
         ],
     ),
+    # Qwen 3 Next 80B A3B
+    KilnModel(
+        family=ModelFamily.qwen,
+        name=ModelName.qwen_3_next_80b_a3b,
+        friendly_name="Qwen 3 Next 80B A3B (Instruct)",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="qwen/qwen3-next-80b-a3b-instruct",
+                structured_output_mode=StructuredOutputMode.json_instruction_and_object,
+                supports_data_gen=True,
+                supports_function_calling=True,
+            ),
+        ],
+    ),
+    # Qwen 3 Next 80B A3B (Thinking)
+    KilnModel(
+        family=ModelFamily.qwen,
+        name=ModelName.qwen_3_next_80b_a3b_thinking,
+        friendly_name="Qwen 3 Next 80B A3B (Thinking)",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="qwen/qwen3-next-80b-a3b-thinking",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                supports_data_gen=True,
+                supports_function_calling=True,
+                reasoning_capable=True,
+                require_openrouter_reasoning=True,
+            ),
+        ],
+    ),
+    # Qwen 3 Max
+    KilnModel(
+        family=ModelFamily.qwen,
+        name=ModelName.qwen_3_max,
+        friendly_name="Qwen 3 Max",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="qwen/qwen3-max",
+                structured_output_mode=StructuredOutputMode.json_instruction_and_object,
+                supports_data_gen=True,
+                supports_function_calling=True,
+            ),
+        ],
+    ),
     # Qwen 3 0.6B
     KilnModel(
         family=ModelFamily.qwen,
@@ -2304,6 +2796,7 @@ built_in_models: List[KilnModel] = [
                 r1_openrouter_options=True,
                 parser=ModelParserID.r1_thinking,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2311,6 +2804,15 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=False,
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/qwen3:0.6B-F16",
+                supports_data_gen=False,
+                reasoning_capable=True,
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2330,6 +2832,7 @@ built_in_models: List[KilnModel] = [
                 r1_openrouter_options=True,
                 parser=ModelParserID.r1_thinking,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2337,6 +2840,7 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=False,
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2353,6 +2857,7 @@ built_in_models: List[KilnModel] = [
                 formatter=ModelFormatterID.qwen3_style_no_think,
                 supports_data_gen=False,
                 parser=ModelParserID.optional_r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2360,6 +2865,7 @@ built_in_models: List[KilnModel] = [
                 formatter=ModelFormatterID.qwen3_style_no_think,
                 supports_data_gen=False,
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2378,6 +2884,7 @@ built_in_models: List[KilnModel] = [
                 r1_openrouter_options=True,
                 parser=ModelParserID.r1_thinking,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2385,6 +2892,7 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=False,
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2401,6 +2909,7 @@ built_in_models: List[KilnModel] = [
                 formatter=ModelFormatterID.qwen3_style_no_think,
                 supports_data_gen=False,
                 parser=ModelParserID.optional_r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2408,6 +2917,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 formatter=ModelFormatterID.qwen3_style_no_think,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2427,6 +2937,7 @@ built_in_models: List[KilnModel] = [
                 r1_openrouter_options=True,
                 parser=ModelParserID.r1_thinking,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2434,6 +2945,7 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=False,
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -2443,6 +2955,15 @@ built_in_models: List[KilnModel] = [
                 siliconflow_enable_thinking=True,
                 reasoning_optional_for_structured_output=True,
                 supports_data_gen=False,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/qwen3:8B-Q4_K_M",
+                supports_data_gen=False,
+                reasoning_capable=True,
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2459,6 +2980,7 @@ built_in_models: List[KilnModel] = [
                 formatter=ModelFormatterID.qwen3_style_no_think,
                 supports_data_gen=False,
                 parser=ModelParserID.optional_r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2466,6 +2988,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 formatter=ModelFormatterID.qwen3_style_no_think,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -2473,6 +2996,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 siliconflow_enable_thinking=False,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2491,6 +3015,7 @@ built_in_models: List[KilnModel] = [
                 r1_openrouter_options=True,
                 parser=ModelParserID.r1_thinking,
                 supports_data_gen=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2498,6 +3023,7 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=True,
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -2507,6 +3033,15 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 siliconflow_enable_thinking=True,
                 reasoning_optional_for_structured_output=True,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/qwen3:14B-Q6_K",
+                supports_data_gen=True,
+                reasoning_capable=True,
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2553,6 +3088,12 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_schema,
             ),
+            KilnModelProvider(
+                name=ModelProviderName.docker_model_runner,
+                model_id="ai/qwen3:30B-A3B-Q4_K_M",
+                reasoning_capable=True,
+                structured_output_mode=StructuredOutputMode.json_schema,
+            ),
         ],
     ),
     # Qwen 3 30B (3B Active)
@@ -2658,7 +3199,8 @@ built_in_models: List[KilnModel] = [
                 supports_data_gen=True,
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
-                parser=ModelParserID.r1_thinking,
+                # This model doesn't return reasoning content after a tool call so we need to allow optional reasoning.
+                parser=ModelParserID.optional_r1_thinking,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
@@ -2669,6 +3211,8 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 parser=ModelParserID.r1_thinking,
                 supports_data_gen=True,
+                # Not reliable, even for simple functions
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
@@ -2691,7 +3235,8 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 supports_data_gen=True,
                 reasoning_capable=True,
-                parser=ModelParserID.r1_thinking,
+                # This model doesn't return reasoning content after a tool call so we need to allow optional reasoning.
+                parser=ModelParserID.optional_r1_thinking,
             ),
         ],
     ),
@@ -2765,6 +3310,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 parser=ModelParserID.r1_thinking,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2806,6 +3352,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 parser=ModelParserID.r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -2849,6 +3396,7 @@ built_in_models: List[KilnModel] = [
                 model_id="Qwen/Qwen3-235B-A22B-Instruct-2507-tput",
                 supports_data_gen=True,
                 structured_output_mode=StructuredOutputMode.json_instructions,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2889,6 +3437,7 @@ built_in_models: List[KilnModel] = [
                 formatter=ModelFormatterID.qwen3_style_no_think,
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 parser=ModelParserID.optional_r1_thinking,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
@@ -2911,6 +3460,68 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 reasoning_capable=True,
                 reasoning_optional_for_structured_output=True,
+                supports_function_calling=False,
+            ),
+        ],
+    ),
+    # GLM 4.5
+    KilnModel(
+        family=ModelFamily.glm,
+        name=ModelName.glm_4_5,
+        friendly_name="GLM 4.5",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="z-ai/glm-4.5",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.fireworks_ai,
+                model_id="accounts/fireworks/models/glm-4p5",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.siliconflow_cn,
+                model_id="zai-org/GLM-4.5",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+                reasoning_optional_for_structured_output=True,
+            ),
+        ],
+    ),
+    # GLM 4.5 AIR
+    KilnModel(
+        family=ModelFamily.glm,
+        name=ModelName.glm_4_5_air,
+        friendly_name="GLM 4.5 AIR",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="z-ai/glm-4.5-air",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.fireworks_ai,
+                model_id="accounts/fireworks/models/glm-4p5-air",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.together_ai,
+                model_id="zai-org/GLM-4.5-Air-FP8",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+                parser=ModelParserID.r1_thinking,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.siliconflow_cn,
+                model_id="zai-org/GLM-4.5-Air",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+                reasoning_optional_for_structured_output=True,
             ),
         ],
     ),
@@ -2923,8 +3534,9 @@ built_in_models: List[KilnModel] = [
             KilnModelProvider(
                 name=ModelProviderName.fireworks_ai,
                 model_id="accounts/fireworks/models/kimi-k2-instruct",
-                structured_output_mode=StructuredOutputMode.json_instruction_and_object,
-                # Ignoring json mode for now, so not suggested for evals
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_data_gen=True,
+                suggested_for_evals=True,
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
@@ -2944,7 +3556,7 @@ built_in_models: List[KilnModel] = [
                 name=ModelProviderName.groq,
                 model_id="moonshotai/kimi-k2-instruct",
                 supports_data_gen=True,
-                structured_output_mode=StructuredOutputMode.function_calling,
+                structured_output_mode=StructuredOutputMode.json_schema,
                 suggested_for_evals=True,
             ),
             KilnModelProvider(
@@ -2956,6 +3568,51 @@ built_in_models: List[KilnModel] = [
             ),
         ],
     ),
+    # Kimi K2 Instruct 0905
+    KilnModel(
+        family=ModelFamily.kimi,
+        name=ModelName.kimi_k2_0905,
+        friendly_name="Kimi K2 0905",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="moonshotai/kimi-k2-0905",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_data_gen=True,
+                suggested_for_evals=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.fireworks_ai,
+                model_id="accounts/fireworks/models/kimi-k2-instruct-0905",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_data_gen=True,
+                suggested_for_evals=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.together_ai,
+                model_id="moonshotai/Kimi-K2-Instruct-0905",
+                structured_output_mode=StructuredOutputMode.json_instruction_and_object,
+                supports_data_gen=True,
+                suggested_for_evals=True,
+                # this model on this provider currently fails the tool call test, but might work in the future
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.groq,
+                model_id="moonshotai/kimi-k2-instruct-0905",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_data_gen=True,
+                suggested_for_evals=True,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.siliconflow_cn,
+                model_id="Pro/moonshotai/Kimi-K2-Instruct-0905",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                supports_data_gen=True,
+                suggested_for_evals=True,
+            ),
+        ],
+    ),
     KilnModel(
         family=ModelFamily.kimi,
         name=ModelName.kimi_dev_72b,
@@ -2967,6 +3624,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_schema,
                 reasoning_capable=True,
                 reasoning_optional_for_structured_output=True,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2982,6 +3640,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 reasoning_capable=True,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -2998,6 +3657,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 reasoning_optional_for_structured_output=True,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -3014,6 +3674,7 @@ built_in_models: List[KilnModel] = [
                 reasoning_capable=True,
                 reasoning_optional_for_structured_output=True,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -3029,12 +3690,14 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 supports_data_gen=True,
                 r1_openrouter_options=True,
+                supports_function_calling=False,
             ),
             KilnModelProvider(
                 name=ModelProviderName.siliconflow_cn,
                 model_id="baidu/ERNIE-4.5-300B-A47B",
                 structured_output_mode=StructuredOutputMode.json_schema,
                 supports_data_gen=True,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -3055,6 +3718,7 @@ built_in_models: List[KilnModel] = [
                 siliconflow_enable_thinking=True,
                 reasoning_optional_for_structured_output=True,
                 supports_data_gen=False,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -3078,6 +3742,7 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 reasoning_capable=True,
                 supports_data_gen=True,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -3093,6 +3758,54 @@ built_in_models: List[KilnModel] = [
                 structured_output_mode=StructuredOutputMode.json_instructions,
                 reasoning_capable=True,
                 supports_data_gen=True,
+                supports_function_calling=False,
+            ),
+        ],
+    ),
+    # Bytedance
+    KilnModel(
+        family=ModelFamily.bytedance,
+        name=ModelName.bytedance_seed_oss_36b,
+        friendly_name="ByteDance Seed OSS 36B",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="bytedance/seed-oss-36b-instruct",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                reasoning_capable=True,
+                supports_data_gen=True,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.siliconflow_cn,
+                model_id="ByteDance-Seed/Seed-OSS-36B-Instruct",
+                structured_output_mode=StructuredOutputMode.json_schema,
+                reasoning_capable=True,
+                supports_data_gen=True,
+                supports_function_calling=False,
+                reasoning_optional_for_structured_output=True,
+            ),
+        ],
+    ),
+    # StepFun
+    KilnModel(
+        family=ModelFamily.stepfun,
+        name=ModelName.stepfun_step3,
+        friendly_name="StepFun Step3",
+        providers=[
+            KilnModelProvider(
+                name=ModelProviderName.openrouter,
+                model_id="stepfun-ai/step3",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+                supports_function_calling=False,
+            ),
+            KilnModelProvider(
+                name=ModelProviderName.siliconflow_cn,
+                model_id="stepfun-ai/step3",
+                structured_output_mode=StructuredOutputMode.json_instructions,
+                reasoning_capable=True,
+                supports_function_calling=False,
             ),
         ],
     ),
@@ -3106,6 +3819,17 @@ def get_model_by_name(name: ModelName) -> KilnModel:
     raise ValueError(f"Model {name} not found in the list of built-in models")
 
 
+def built_in_models_from_provider(
+    provider_name: ModelProviderName, model_name: str
+) -> KilnModelProvider | None:
+    for model in built_in_models:
+        if model.name == model_name:
+            for p in model.providers:
+                if p.name == provider_name:
+                    return p
+    return None
+
+
 def default_structured_output_mode_for_model_provider(
     model_name: str,
     provider: ModelProviderName,