Small style changes

Author: VProv

src/together/resources/finetune.py

@@ -29,6 +29,12 @@
 from together.utils import log_warn_once, normalize_key
 
 
+AVAILABLE_TRAINING_METHODS = {
+    TrainingMethodSFT().method,
+    TrainingMethodDPO().method,
+}
+
+
 def createFinetuneRequest(
     model_limits: FinetuneTrainingLimits,
     training_file: str,
@@ -105,10 +111,6 @@ def createFinetuneRequest(
     if weight_decay is not None and (weight_decay < 0):
         raise ValueError("Weight decay should be non-negative")
 
-    AVAILABLE_TRAINING_METHODS = {
-        TrainingMethodSFT().method,
-        TrainingMethodDPO().method,
-    }
     if training_method not in AVAILABLE_TRAINING_METHODS:
         raise ValueError(
             f"training_method must be one of {', '.join(AVAILABLE_TRAINING_METHODS)}"

src/together/utils/files.py

@@ -96,9 +96,7 @@ def check_file(
     return report_dict
 
 
-def validate_messages(
-    messages: List[Dict[str, str | bool]], idx: int
-) -> None:
+def validate_messages(messages: List[Dict[str, str | bool]], idx: int) -> None:
     """Validate the messages column."""
     if not isinstance(messages, list):
         raise InvalidFileFormatError(
@@ -227,7 +225,6 @@ def validate_preference_openai(example: Dict[str, Any], idx: int = 0) -> None:
                 line_number=idx + 1,
                 error_source="key_value",
             )
-        
 
     validate_messages(example["preferred_output"], idx)
     validate_messages(example["non_preferred_output"], idx)

tests/unit/test_preference_openai.py

@@ -5,7 +5,7 @@
 from together.constants import MIN_SAMPLES
 from together.utils.files import check_file
 
-# Test data for preference OpenAI format
+
 _TEST_PREFERENCE_OPENAI_CONTENT = [
     {
         "input": {
@@ -70,16 +70,25 @@ def test_check_jsonl_valid_preference_openai(tmp_path: Path):
     assert report["has_min_samples"]
 
 
-# Define test cases for missing fields
 MISSING_FIELDS_TEST_CASES = [
     pytest.param("input", "Missing input field", id="missing_input"),
-    pytest.param("preferred_output", "Missing preferred_output field", id="missing_preferred_output"),
-    pytest.param("non_preferred_output", "Missing non_preferred_output field", id="missing_non_preferred_output"),
+    pytest.param(
+        "preferred_output",
+        "Missing preferred_output field",
+        id="missing_preferred_output",
+    ),
+    pytest.param(
+        "non_preferred_output",
+        "Missing non_preferred_output field",
+        id="missing_non_preferred_output",
+    ),
 ]
 
 
 @pytest.mark.parametrize("field_to_remove, description", MISSING_FIELDS_TEST_CASES)
-def test_check_jsonl_invalid_preference_openai_missing_fields(tmp_path: Path, field_to_remove, description):
+def test_check_jsonl_invalid_preference_openai_missing_fields(
+    tmp_path: Path, field_to_remove, description
+):
     """Test missing required fields in OpenAI preference format."""
     file = tmp_path / f"invalid_preference_openai_missing_{field_to_remove}.jsonl"
     content = [item.copy() for item in _TEST_PREFERENCE_OPENAI_CONTENT]
@@ -95,69 +104,58 @@ def test_check_jsonl_invalid_preference_openai_missing_fields(tmp_path: Path, fi
     assert not report["is_check_passed"], f"Test should fail when {description}"
 
 
-# Define test cases for structural issues
 STRUCTURAL_ISSUE_TEST_CASES = [
     pytest.param(
         "empty_messages",
         lambda item: item.update({"input": {"messages": []}}),
         "Empty messages array",
-        id="empty_messages"
+        id="empty_messages",
     ),
     pytest.param(
         "missing_role_preferred",
         lambda item: item.update(
             {"preferred_output": [{"content": "Missing role field"}]}
         ),
         "Missing role in preferred_output",
-        id="missing_role_preferred"
+        id="missing_role_preferred",
     ),
     pytest.param(
         "missing_role_non_preferred",
         lambda item: item.update(
             {"non_preferred_output": [{"content": "Missing role field"}]}
         ),
         "Missing role in non_preferred_output",
-        id="missing_role_non_preferred"
+        id="missing_role_non_preferred",
     ),
     pytest.param(
         "missing_content_preferred",
-        lambda item: item.update(
-            {"preferred_output": [{"role": "assistant"}]}
-        ),
+        lambda item: item.update({"preferred_output": [{"role": "assistant"}]}),
         "Missing content in preferred_output",
-        id="missing_content_preferred"
+        id="missing_content_preferred",
     ),
     pytest.param(
         "missing_content_non_preferred",
-        lambda item: item.update(
-            {"non_preferred_output": [{"role": "assistant"}]}
-        ),
+        lambda item: item.update({"non_preferred_output": [{"role": "assistant"}]}),
         "Missing content in non_preferred_output",
-        id="missing_content_non_preferred"
+        id="missing_content_non_preferred",
     ),
     pytest.param(
         "wrong_output_format_preferred",
-        lambda item: item.update(
-            {"preferred_output": "Not an array but a string"}
-        ),
+        lambda item: item.update({"preferred_output": "Not an array but a string"}),
         "Wrong format for preferred_output",
-        id="wrong_output_format_preferred"
+        id="wrong_output_format_preferred",
     ),
     pytest.param(
         "wrong_output_format_non_preferred",
-        lambda item: item.update(
-            {"non_preferred_output": "Not an array but a string"}
-        ),
+        lambda item: item.update({"non_preferred_output": "Not an array but a string"}),
         "Wrong format for non_preferred_output",
-        id="wrong_output_format_non_preferred"
+        id="wrong_output_format_non_preferred",
     ),
     pytest.param(
         "missing_content",
-        lambda item: item.update(
-            {"input": {"messages": [{"role": "user"}]}}
-        ),
+        lambda item: item.update({"input": {"messages": [{"role": "user"}]}}),
         "Missing content in messages",
-        id="missing_content"
+        id="missing_content",
     ),
     pytest.param(
         "multiple_preferred_outputs",
@@ -170,7 +168,7 @@ def test_check_jsonl_invalid_preference_openai_missing_fields(tmp_path: Path, fi
             }
         ),
         "Multiple messages in preferred_output",
-        id="multiple_preferred_outputs"
+        id="multiple_preferred_outputs",
     ),
     pytest.param(
         "multiple_non_preferred_outputs",
@@ -183,88 +181,114 @@ def test_check_jsonl_invalid_preference_openai_missing_fields(tmp_path: Path, fi
             }
         ),
         "Multiple messages in non_preferred_output",
-        id="multiple_non_preferred_outputs"
+        id="multiple_non_preferred_outputs",
     ),
     pytest.param(
         "empty_preferred_output",
         lambda item: item.update({"preferred_output": []}),
         "Empty preferred_output array",
-        id="empty_preferred_output"
+        id="empty_preferred_output",
     ),
     pytest.param(
         "empty_non_preferred_output",
         lambda item: item.update({"non_preferred_output": []}),
         "Empty non_preferred_output array",
-        id="empty_non_preferred_output"
+        id="empty_non_preferred_output",
     ),
     pytest.param(
         "non_string_content_in_messages",
-        lambda item: item.update({"input": {"messages": [{"role": "user", "content": 123}]}}),
+        lambda item: item.update(
+            {"input": {"messages": [{"role": "user", "content": 123}]}}
+        ),
         "Non-string content in messages",
-        id="non_string_content_in_messages"
+        id="non_string_content_in_messages",
     ),
     pytest.param(
         "invalid_role_in_messages",
-        lambda item: item.update({"input": {"messages": [{"role": "invalid_role", "content": "Hello"}]}}),
+        lambda item: item.update(
+            {"input": {"messages": [{"role": "invalid_role", "content": "Hello"}]}}
+        ),
         "Invalid role in messages",
-        id="invalid_role_in_messages"
+        id="invalid_role_in_messages",
     ),
     pytest.param(
         "non_alternating_roles",
-        lambda item: item.update({"input": {"messages": [
-            {"role": "user", "content": "Hello"},
-            {"role": "user", "content": "How are you?"}
-        ]}}),
+        lambda item: item.update(
+            {
+                "input": {
+                    "messages": [
+                        {"role": "user", "content": "Hello"},
+                        {"role": "user", "content": "How are you?"},
+                    ]
+                }
+            }
+        ),
         "Non-alternating roles in messages",
-        id="non_alternating_roles"
+        id="non_alternating_roles",
     ),
     pytest.param(
         "invalid_weight_type",
-        lambda item: item.update({"input": {"messages": [
-            {"role": "user", "content": "Hello", "weight": "not_an_integer"}
-        ]}}),
+        lambda item: item.update(
+            {
+                "input": {
+                    "messages": [
+                        {"role": "user", "content": "Hello", "weight": "not_an_integer"}
+                    ]
+                }
+            }
+        ),
         "Invalid weight type",
-        id="invalid_weight_type"
+        id="invalid_weight_type",
     ),
     pytest.param(
         "invalid_weight_value",
-        lambda item: item.update({"input": {"messages": [
-            {"role": "user", "content": "Hello", "weight": 2}
-        ]}}),
+        lambda item: item.update(
+            {"input": {"messages": [{"role": "user", "content": "Hello", "weight": 2}]}}
+        ),
         "Invalid weight value",
-        id="invalid_weight_value"
+        id="invalid_weight_value",
     ),
     pytest.param(
         "non_dict_message",
-        lambda item: item.update({"input": {"messages": [
-            "Not a dictionary"
-        ]}}),
+        lambda item: item.update({"input": {"messages": ["Not a dictionary"]}}),
         "Non-dictionary message",
-        id="non_dict_message"
+        id="non_dict_message",
     ),
     pytest.param(
         "non_dict_input",
         lambda item: item.update({"input": "Not a dictionary"}),
         "Non-dictionary input",
-        id="non_dict_input"
+        id="non_dict_input",
     ),
     pytest.param(
         "missing_messages_in_input",
         lambda item: item.update({"input": {}}),
         "Missing messages in input",
-        id="missing_messages_in_input"
+        id="missing_messages_in_input",
     ),
     pytest.param(
         "non_assistant_role_in_preferred",
-        lambda item: item.update({"preferred_output": [{"role": "user", "content": "This should be assistant"}]}),
+        lambda item: item.update(
+            {
+                "preferred_output": [
+                    {"role": "user", "content": "This should be assistant"}
+                ]
+            }
+        ),
         "Non-assistant role in preferred output",
-        id="non_assistant_role_in_preferred"
+        id="non_assistant_role_in_preferred",
     ),
     pytest.param(
         "non_assistant_role_in_non_preferred",
-        lambda item: item.update({"non_preferred_output": [{"role": "user", "content": "This should be assistant"}]}),
+        lambda item: item.update(
+            {
+                "non_preferred_output": [
+                    {"role": "user", "content": "This should be assistant"}
+                ]
+            }
+        ),
         "Non-assistant role in non-preferred output",
-        id="non_assistant_role_in_non_preferred"
+        id="non_assistant_role_in_non_preferred",
     ),
 ]