together 1.5.7__py3-none-any.whl → 1.5.8__py3-none-any.whl

together/resources/finetune.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import re
 from pathlib import Path
-from typing import List, Literal
+from typing import Dict, List, Literal
 
 from rich import print as rprint
 
@@ -30,16 +30,8 @@ from together.types import (
     TrainingMethodSFT,
     TrainingType,
 )
-from together.types.finetune import (
-    DownloadCheckpointType,
-    FinetuneEvent,
-    FinetuneEventType,
-)
-from together.utils import (
-    get_event_step,
-    log_warn_once,
-    normalize_key,
-)
+from together.types.finetune import DownloadCheckpointType
+from together.utils import log_warn_once, normalize_key
 
 
 _FT_JOB_WITH_STEP_REGEX = r"^ft-[\dabcdef-]+:\d+$"
@@ -222,68 +214,38 @@ def create_finetune_request(
     return finetune_request
 
 
-def _process_checkpoints_from_events(
-    events: List[FinetuneEvent], id: str
+def _parse_raw_checkpoints(
+    checkpoints: List[Dict[str, str]], id: str
 ) -> List[FinetuneCheckpoint]:
     """
-    Helper function to process events and create checkpoint list.
+    Helper function to process raw checkpoints and create checkpoint list.
 
     Args:
-        events (List[FinetuneEvent]): List of fine-tune events to process
+        checkpoints (List[Dict[str, str]]): List of raw checkpoints metadata
         id (str): Fine-tune job ID
 
     Returns:
         List[FinetuneCheckpoint]: List of available checkpoints
     """
-    checkpoints: List[FinetuneCheckpoint] = []
-
-    for event in events:
-        event_type = event.type
-
-        if event_type == FinetuneEventType.CHECKPOINT_SAVE:
-            step = get_event_step(event)
-            checkpoint_name = f"{id}:{step}" if step is not None else id
-
-            checkpoints.append(
-                FinetuneCheckpoint(
-                    type=(
-                        f"Intermediate (step {step})"
-                        if step is not None
-                        else "Intermediate"
-                    ),
-                    timestamp=event.created_at,
-                    name=checkpoint_name,
-                )
-            )
-        elif event_type == FinetuneEventType.JOB_COMPLETE:
-            if hasattr(event, "model_path"):
-                checkpoints.append(
-                    FinetuneCheckpoint(
-                        type=(
-                            "Final Merged"
-                            if hasattr(event, "adapter_path")
-                            else "Final"
-                        ),
-                        timestamp=event.created_at,
-                        name=id,
-                    )
-                )
 
-            if hasattr(event, "adapter_path"):
-                checkpoints.append(
-                    FinetuneCheckpoint(
-                        type=(
-                            "Final Adapter" if hasattr(event, "model_path") else "Final"
-                        ),
-                        timestamp=event.created_at,
-                        name=id,
-                    )
-                )
+    parsed_checkpoints = []
+    for checkpoint in checkpoints:
+        step = checkpoint["step"]
+        checkpoint_type = checkpoint["checkpoint_type"]
+        checkpoint_name = (
+            f"{id}:{step}" if "intermediate" in checkpoint_type.lower() else id
+        )
 
-    # Sort by timestamp (newest first)
-    checkpoints.sort(key=lambda x: x.timestamp, reverse=True)
+        parsed_checkpoints.append(
+            FinetuneCheckpoint(
+                type=checkpoint_type,
+                timestamp=checkpoint["created_at"],
+                name=checkpoint_name,
+            )
+        )
 
-    return checkpoints
+    parsed_checkpoints.sort(key=lambda x: x.timestamp, reverse=True)
+    return parsed_checkpoints
 
 
 class FineTuning:
@@ -561,8 +523,21 @@ class FineTuning:
         Returns:
             List[FinetuneCheckpoint]: List of available checkpoints
         """
-        events = self.list_events(id).data or []
-        return _process_checkpoints_from_events(events, id)
+        requestor = api_requestor.APIRequestor(
+            client=self._client,
+        )
+
+        response, _, _ = requestor.request(
+            options=TogetherRequest(
+                method="GET",
+                url=f"fine-tunes/{id}/checkpoints",
+            ),
+            stream=False,
+        )
+        assert isinstance(response, TogetherResponse)
+
+        raw_checkpoints = response.data["data"]
+        return _parse_raw_checkpoints(raw_checkpoints, id)
 
     def download(
         self,
@@ -936,11 +911,9 @@ class AsyncFineTuning:
             ),
             stream=False,
         )
+        assert isinstance(events_response, TogetherResponse)
 
-        # FIXME: API returns "data" field with no object type (should be "list")
-        events_list = FinetuneListEvents(object="list", **events_response.data)
-
-        return events_list
+        return FinetuneListEvents(**events_response.data)
 
     async def list_checkpoints(self, id: str) -> List[FinetuneCheckpoint]:
         """
@@ -950,11 +923,23 @@ class AsyncFineTuning:
             id (str): Unique identifier of the fine-tune job to list checkpoints for
 
         Returns:
-            List[FinetuneCheckpoint]: Object containing list of available checkpoints
+            List[FinetuneCheckpoint]: List of available checkpoints
         """
-        events_list = await self.list_events(id)
-        events = events_list.data or []
-        return _process_checkpoints_from_events(events, id)
+        requestor = api_requestor.APIRequestor(
+            client=self._client,
+        )
+
+        response, _, _ = await requestor.arequest(
+            options=TogetherRequest(
+                method="GET",
+                url=f"fine-tunes/{id}/checkpoints",
+            ),
+            stream=False,
+        )
+        assert isinstance(response, TogetherResponse)
+
+        raw_checkpoints = response.data["data"]
+        return _parse_raw_checkpoints(raw_checkpoints, id)
 
     async def download(
         self, id: str, *, output: str | None = None, checkpoint_step: int = -1

together/types/chat_completions.py

@@ -98,6 +98,7 @@ class ToolChoice(BaseModel):
 
 class ToolChoiceEnum(str, Enum):
     Auto = "auto"
+    Required = "required"
 
 
 class ChatCompletionRequest(BaseModel):

{together-1.5.7.dist-info → together-1.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: together
-Version: 1.5.7
+Version: 1.5.8
 Summary: Python client for Together's Cloud Platform!
 License: Apache-2.0
 Author: Together AI

{together-1.5.7.dist-info → together-1.5.8.dist-info}/RECORD

@@ -34,7 +34,7 @@ together/resources/completions.py,sha256=5Wa-ZjPCxRcam6CDe7KgGYlTA7yJZMmd5TrRgGC
 together/resources/embeddings.py,sha256=PTvLb82yjG_-iQOyuhsilp77Fr7gZ0o6WD2KeRnKoxs,2675
 together/resources/endpoints.py,sha256=NNjp-wyzOotzlscGGrANhOHxQBjHTN8f5kTQTH_CLvE,17177
 together/resources/files.py,sha256=bnPbaF25e4InBRPvHwXHXT-oSX1Z1sZRsnQW5wq82U4,4990
-together/resources/finetune.py,sha256=7rcGfZqre1szzlh1MwseLlghZ9vRHwHAdeITvP2ohJY,36942
+together/resources/finetune.py,sha256=6Al4QfqNid_1blWShl1RR9uis0xwrGruITc5Uxr_jkA,36367
 together/resources/images.py,sha256=LQUjKPaFxWTqOAPnyF1Pp7Rz4NLOYhmoKwshpYiprEM,4923
 together/resources/models.py,sha256=qgmAXv61Cq4oLxytenEZBywA8shldDHYxJ_EAu_4JWQ,3864
 together/resources/rerank.py,sha256=3Ju_aRSyZ1s_3zCSNZnSnEJErUVmt2xa3M8z1nvejMA,3931
@@ -42,7 +42,7 @@ together/together_response.py,sha256=a3dgKMPDrlfKQwxYENfNt2T4l2vSZxRWMixhHSy-q3E
 together/types/__init__.py,sha256=VgIbE2AOK9c2TQUzkbRbyRkdia2COXJXl_wxPaoxR-M,2688
 together/types/abstract.py,sha256=1lFQI_3WjsR_t1128AeKW0aTk6EiM6Gh1J3ZuyLLPao,642
 together/types/audio_speech.py,sha256=jlj8BZf3dkIDARF1P11fuenVLj4try8Yx4RN-EAkhOU,2609
-together/types/chat_completions.py,sha256=ggwt1LlBXTB_hZKbtLsjg8j-gXxO8pUUQfTrxUmRXHU,5078
+together/types/chat_completions.py,sha256=qpBCMXEWtRwW_fmiu6cecm3d4h6mcK8gvr-8JkbAopQ,5104
 together/types/code_interpreter.py,sha256=cjF8TKgRkJllHS4i24dWQZBGTRsG557eHSewOiip0Kk,1770
 together/types/common.py,sha256=kxZ-N9xtBsGYZBmbIWnZ0rfT3Pn8PFB7sAbp3iv96pw,1525
 together/types/completions.py,sha256=o3FR5ixsTUj-a3pmOUzbSQg-hESVhpqrC9UD__VCqr4,2971
@@ -60,8 +60,8 @@ together/utils/api_helpers.py,sha256=2K0O6qeEQ2zVFvi5NBN5m2kjZJaS3-JfKFecQ7SmGaw
 together/utils/files.py,sha256=rfp10qU0urtWOXXFeasFtO9xp-1KIhM3S43JxcnHmL0,16438
 together/utils/tools.py,sha256=H2MTJhEqtBllaDvOyZehIO_IVNK3P17rSDeILtJIVag,2964
 together/version.py,sha256=p03ivHyE0SyWU4jAnRTBi_sOwywVWoZPU4g2gzRgG-Y,126
-together-1.5.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-together-1.5.7.dist-info/METADATA,sha256=c8znCsq8LslEJ8Y7Kep9Ld_fIUsL2hpKjgZGv21Yrk4,15415
-together-1.5.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-together-1.5.7.dist-info/entry_points.txt,sha256=G-b5NKW6lUUf1V1fH8IPTBb7jXnK7lhbX9H1zTEJXPs,50
-together-1.5.7.dist-info/RECORD,,
+together-1.5.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+together-1.5.8.dist-info/METADATA,sha256=lsO8JDj10zXplEJu-tVmwkMXNFLOE6RDQ6GQLYhBCXs,15415
+together-1.5.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+together-1.5.8.dist-info/entry_points.txt,sha256=G-b5NKW6lUUf1V1fH8IPTBb7jXnK7lhbX9H1zTEJXPs,50
+together-1.5.8.dist-info/RECORD,,

{together-1.5.7.dist-info → together-1.5.8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any