kiln-ai 0.15.0__py3-none-any.whl → 0.17.0__py3-none-any.whl

kiln_ai/adapters/fine_tune/test_fireworks_tinetune.py

@@ -13,11 +13,11 @@ from kiln_ai.adapters.fine_tune.dataset_formatter import DatasetFormat, DatasetF
 from kiln_ai.adapters.fine_tune.fireworks_finetune import FireworksFinetune
 from kiln_ai.datamodel import (
     DatasetSplit,
-    FinetuneDataStrategy,
     StructuredOutputMode,
     Task,
 )
 from kiln_ai.datamodel import Finetune as FinetuneModel
+from kiln_ai.datamodel.datamodel_enums import ChatStrategy
 from kiln_ai.datamodel.dataset_split import Train80Test20SplitDefinition
 from kiln_ai.utils.config import Config
 
@@ -232,8 +232,8 @@ def mock_task():
 @pytest.mark.parametrize(
     "data_strategy,thinking_instructions",
     [
-        (FinetuneDataStrategy.final_and_intermediate, "thinking instructions"),
-        (FinetuneDataStrategy.final_only, None),
+        (ChatStrategy.two_message_cot, "thinking instructions"),
+        (ChatStrategy.single_turn, None),
     ],
 )
 async def test_generate_and_upload_jsonl_success(

kiln_ai/adapters/fine_tune/test_openai_finetune.py

@@ -12,11 +12,11 @@ from kiln_ai.adapters.fine_tune.dataset_formatter import DatasetFormat, DatasetF
 from kiln_ai.adapters.fine_tune.openai_finetune import OpenAIFinetune
 from kiln_ai.datamodel import (
     DatasetSplit,
-    FinetuneDataStrategy,
     StructuredOutputMode,
     Task,
 )
 from kiln_ai.datamodel import Finetune as FinetuneModel
+from kiln_ai.datamodel.datamodel_enums import ChatStrategy
 from kiln_ai.datamodel.dataset_split import Train80Test20SplitDefinition
 from kiln_ai.utils.config import Config
 
@@ -35,7 +35,7 @@ def openai_finetune(tmp_path):
             system_message="Test system message",
             fine_tune_model_id="ft-123",
             path=tmp_file,
-            data_strategy=FinetuneDataStrategy.final_only,
+            data_strategy=ChatStrategy.single_turn,
         ),
     )
     return finetune
@@ -247,7 +247,7 @@ async def test_generate_and_upload_jsonl_success(
         mock_formatter.dump_to_file.assert_called_once_with(
             "train",
             DatasetFormat.OPENAI_CHAT_JSONL,
-            FinetuneDataStrategy.final_only,
+            ChatStrategy.single_turn,
         )
 
         # Verify file was opened and uploaded
@@ -299,7 +299,7 @@ async def test_generate_and_upload_jsonl_schema_success(
         mock_formatter.dump_to_file.assert_called_once_with(
             "train",
             DatasetFormat.OPENAI_CHAT_JSON_SCHEMA_JSONL,
-            FinetuneDataStrategy.final_only,
+            ChatStrategy.single_turn,
         )
 
         # Verify file was opened and uploaded
@@ -555,8 +555,8 @@ async def test_status_updates_latest_status(openai_finetune, mock_response):
 @pytest.mark.parametrize(
     "data_strategy,thinking_instructions",
     [
-        (FinetuneDataStrategy.final_and_intermediate, "Custom thinking instructions"),
-        (FinetuneDataStrategy.final_only, None),
+        (ChatStrategy.two_message_cot, "Custom thinking instructions"),
+        (ChatStrategy.single_turn, None),
     ],
 )
 async def test_generate_and_upload_jsonl_with_data_strategy(

kiln_ai/adapters/fine_tune/test_together_finetune.py

@@ -183,6 +183,7 @@ async def test_status_job_states(
     # Mock the retrieve method of the fine_tuning object
     mock_job = MagicMock()
     mock_job.status = together_status
+    mock_job.output_name = None
     mock_together_client.fine_tuning.retrieve.return_value = mock_job
 
     status = await together_finetune.status()

kiln_ai/adapters/fine_tune/test_vertex_finetune.py

@@ -12,11 +12,11 @@ from kiln_ai.adapters.fine_tune.dataset_formatter import DatasetFormat, DatasetF
 from kiln_ai.adapters.fine_tune.vertex_finetune import VertexFinetune
 from kiln_ai.datamodel import (
     DatasetSplit,
-    FinetuneDataStrategy,
     StructuredOutputMode,
     Task,
 )
 from kiln_ai.datamodel import Finetune as FinetuneModel
+from kiln_ai.datamodel.datamodel_enums import ChatStrategy
 from kiln_ai.datamodel.dataset_split import Train80Test20SplitDefinition
 from kiln_ai.utils.config import Config
 
@@ -35,7 +35,7 @@ def vertex_finetune(tmp_path):
             system_message="Test system message",
             fine_tune_model_id="ft-123",
             path=tmp_file,
-            data_strategy=FinetuneDataStrategy.final_only,
+            data_strategy=ChatStrategy.single_turn,
         ),
     )
     return finetune
@@ -252,8 +252,8 @@ async def test_status_model_id_update_exception(vertex_finetune, mock_response):
 @pytest.mark.parametrize(
     "data_strategy,thinking_instructions",
     [
-        (FinetuneDataStrategy.final_and_intermediate, "Custom thinking instructions"),
-        (FinetuneDataStrategy.final_only, None),
+        (ChatStrategy.two_message_cot, "Custom thinking instructions"),
+        (ChatStrategy.single_turn, None),
     ],
 )
 async def test_generate_and_upload_jsonl(

kiln_ai/adapters/fine_tune/together_finetune.py

@@ -66,6 +66,12 @@ class TogetherFinetune(BaseFinetuneAdapter):
             # retrieve the fine-tuning job
             together_finetune = self.client.fine_tuning.retrieve(id=fine_tuning_job_id)
 
+            # update the fine tune model ID if it has changed (sometimes it's not set at training time)
+            if self.datamodel.fine_tune_model_id != together_finetune.output_name:
+                self.datamodel.fine_tune_model_id = together_finetune.output_name
+                if self.datamodel.path:
+                    self.datamodel.save_to_file()
+
             status = together_finetune.status
             if status in _pending_statuses:
                 return FineTuneStatus(
@@ -135,8 +141,13 @@ class TogetherFinetune(BaseFinetuneAdapter):
             **self._build_finetune_parameters(),
         )
 
-        # 2 different IDs, output_name is the name of the model that results from the fine-tune job, the finetune_job_id is the ID of the fine-tune job
+        # 2 different IDs, output_name is the name of the model that results from the fine-tune job, while the id is the ID of the fine-tune job itself
+        if not together_finetune.id:
+            raise ValueError(
+                "Together failed to return a fine-tune job ID. While tuning job was dispatched, Kiln never received the ID so won't be able to reference it. Check for errors before dispatching more jobs."
+            )
         self.datamodel.provider_id = together_finetune.id
+        # Output name is sometimes returned here, and save it if it is. But it might be populated later by status call
         self.datamodel.fine_tune_model_id = together_finetune.output_name
 
         if self.datamodel.path: