Tested Ollama models (at least the one my MBP can run).

Had to update ollama and langchain-ollama, but several addtional local models now work with structured data.
Kiln-AI · Jan 29, 2025 · b2737d0 · b2737d0
1 parent c972e9a
commit b2737d0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 26 deletions.
diff --git a/libs/core/kiln_ai/adapters/ml_model_list.py b/libs/core/kiln_ai/adapters/ml_model_list.py
@@ -309,8 +309,7 @@ class KilnModel(BaseModel):
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
-                # TODO: test this
-                supports_data_gen=False,
+                structured_output_mode=StructuredOutputMode.json_schema,
                 provider_options={
                     "model": "llama3.1:8b",
                     "model_aliases": ["llama3.1"],  # 8b is default
@@ -357,7 +356,6 @@ class KilnModel(BaseModel):
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
-                # TODO: test this
                 structured_output_mode=StructuredOutputMode.json_schema,
                 provider_options={"model": "llama3.1:70b"},
             ),
@@ -506,10 +504,7 @@ class KilnModel(BaseModel):
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
-                # TODO: test this
                 structured_output_mode=StructuredOutputMode.json_schema,
-                supports_structured_output=False,
-                supports_data_gen=False,
                 provider_options={"model": "llama3.2-vision"},
             ),
             KilnModelProvider(
@@ -535,7 +530,6 @@ class KilnModel(BaseModel):
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
-                # TODO: test this
                 structured_output_mode=StructuredOutputMode.json_schema,
                 provider_options={"model": "llama3.2-vision:90b"},
             ),
@@ -571,7 +565,6 @@ class KilnModel(BaseModel):
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
-                # TODO: test this
                 structured_output_mode=StructuredOutputMode.json_schema,
                 provider_options={"model": "llama3.3"},
             ),
@@ -596,7 +589,7 @@ class KilnModel(BaseModel):
         providers=[
             KilnModelProvider(
                 name=ModelProviderName.ollama,
-                # TODO: test this
+                structured_output_mode=StructuredOutputMode.json_schema,
                 supports_structured_output=False,
                 supports_data_gen=False,
                 provider_options={"model": "phi3.5"},
@@ -643,14 +636,15 @@ class KilnModel(BaseModel):
         providers=[
             KilnModelProvider(
                 name=ModelProviderName.ollama,
-                # TODO: test this
+                structured_output_mode=StructuredOutputMode.json_schema,
                 supports_data_gen=False,
                 provider_options={
                     "model": "gemma2:9b",
                 },
             ),
             KilnModelProvider(
                 name=ModelProviderName.openrouter,
+                structured_output_mode=StructuredOutputMode.json_schema,
                 supports_data_gen=False,
                 provider_options={"model": "google/gemma-2-9b-it"},
             ),
@@ -691,9 +685,7 @@ class KilnModel(BaseModel):
             ),
             KilnModelProvider(
                 name=ModelProviderName.ollama,
-                # TODO: test this
-                supports_structured_output=False,
-                supports_data_gen=False,
+                structured_output_mode=StructuredOutputMode.json_schema,
                 provider_options={"model": "mixtral"},
             ),
         ],
@@ -712,7 +704,6 @@ class KilnModel(BaseModel):
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 provider_options={"model": "qwen2.5"},
-                # TODO: test this
                 structured_output_mode=StructuredOutputMode.json_schema,
             ),
         ],
@@ -734,7 +725,6 @@ class KilnModel(BaseModel):
             KilnModelProvider(
                 name=ModelProviderName.ollama,
                 provider_options={"model": "qwen2.5:72b"},
-                # TODO: test this
                 structured_output_mode=StructuredOutputMode.json_schema,
             ),
             KilnModelProvider(

diff --git a/libs/core/pyproject.toml b/libs/core/pyproject.toml
@@ -22,7 +22,7 @@ dependencies = [
     "langchain-aws>=0.2.4",
     "langchain-fireworks>=0.2.5",
     "langchain-groq>=0.2.0",
-    "langchain-ollama>=0.2.0",
+    "langchain-ollama>=0.2.2",
     "langchain-openai>=0.2.4",
     "langchain>=0.3.5",
     "openai>=1.53.0",

diff --git a/uv.lock b/uv.lock