together 1.5.24__py3-none-any.whl → 1.5.26__py3-none-any.whl

together/resources/evaluation.py

@@ -27,9 +27,11 @@ class Evaluation:
     def create(
         self,
         type: str,
-        judge_model_name: str,
+        judge_model: str,
+        judge_model_source: str,
         judge_system_template: str,
         input_data_file_path: str,
+        judge_external_api_token: Optional[str] = None,
         # Classify-specific parameters
         labels: Optional[List[str]] = None,
         pass_labels: Optional[List[str]] = None,
@@ -48,9 +50,11 @@ class Evaluation:
 
         Args:
             type: The type of evaluation ("classify", "score", or "compare")
-            judge_model_name: Name of the judge model
+            judge_model: Name or URL of the judge model
+            judge_model_source: Source of the judge model ("serverless", "dedicated", or "external")
             judge_system_template: System template for the judge
             input_data_file_path: Path to input data file
+            judge_external_api_token: Optional external API token for the judge model
             labels: List of classification labels (required for classify)
             pass_labels: List of labels considered as passing (required for classify)
             min_score: Minimum score value (required for score)
@@ -67,10 +71,17 @@ class Evaluation:
             client=self._client,
         )
 
+        if judge_model_source == "external" and not judge_external_api_token:
+            raise ValueError(
+                "judge_external_api_token is required when judge_model_source is 'external'"
+            )
+
         # Build judge config
         judge_config = JudgeModelConfig(
-            model_name=judge_model_name,
+            model=judge_model,
+            model_source=judge_model_source,
             system_template=judge_system_template,
+            external_api_token=judge_external_api_token,
         )
         parameters: Union[ClassifyParameters, ScoreParameters, CompareParameters]
         # Build parameters based on type
@@ -112,7 +123,8 @@ class Evaluation:
                 elif isinstance(model_to_evaluate, dict):
                     # Validate that all required fields are present for model config
                     required_fields = [
-                        "model_name",
+                        "model",
+                        "model_source",
                         "max_tokens",
                         "temperature",
                         "system_template",
@@ -128,6 +140,12 @@ class Evaluation:
                             f"All model config parameters are required when using detailed configuration. "
                             f"Missing: {', '.join(missing_fields)}"
                         )
+                    if model_to_evaluate.get(
+                        "model_source"
+                    ) == "external" and not model_to_evaluate.get("external_api_token"):
+                        raise ValueError(
+                            "external_api_token is required when model_source is 'external' for model_to_evaluate"
+                        )
                     parameters.model_to_evaluate = ModelRequest(**model_to_evaluate)
 
         elif type == "score":
@@ -163,7 +181,8 @@ class Evaluation:
                 elif isinstance(model_to_evaluate, dict):
                     # Validate that all required fields are present for model config
                     required_fields = [
-                        "model_name",
+                        "model",
+                        "model_source",
                         "max_tokens",
                         "temperature",
                         "system_template",
@@ -179,6 +198,12 @@ class Evaluation:
                             f"All model config parameters are required when using detailed configuration. "
                             f"Missing: {', '.join(missing_fields)}"
                         )
+                    if model_to_evaluate.get(
+                        "model_source"
+                    ) == "external" and not model_to_evaluate.get("external_api_token"):
+                        raise ValueError(
+                            "external_api_token is required when model_source is 'external' for model_to_evaluate"
+                        )
                     parameters.model_to_evaluate = ModelRequest(**model_to_evaluate)
 
         elif type == "compare":
@@ -223,7 +248,8 @@ class Evaluation:
             elif isinstance(model_a, dict):
                 # Validate that all required fields are present for model config
                 required_fields = [
-                    "model_name",
+                    "model",
+                    "model_source",
                     "max_tokens",
                     "temperature",
                     "system_template",
@@ -237,6 +263,12 @@ class Evaluation:
                         f"All model config parameters are required for model_a when using detailed configuration. "
                         f"Missing: {', '.join(missing_fields)}"
                     )
+                if model_a.get("model_source") == "external" and not model_a.get(
+                    "external_api_token"
+                ):
+                    raise ValueError(
+                        "external_api_token is required when model_source is 'external' for model_a"
+                    )
                 parameters.model_a = ModelRequest(**model_a)
 
             # Handle model_b
@@ -245,7 +277,8 @@ class Evaluation:
             elif isinstance(model_b, dict):
                 # Validate that all required fields are present for model config
                 required_fields = [
-                    "model_name",
+                    "model",
+                    "model_source",
                     "max_tokens",
                     "temperature",
                     "system_template",
@@ -259,6 +292,12 @@ class Evaluation:
                         f"All model config parameters are required for model_b when using detailed configuration. "
                         f"Missing: {', '.join(missing_fields)}"
                     )
+                if model_b.get("model_source") == "external" and not model_b.get(
+                    "external_api_token"
+                ):
+                    raise ValueError(
+                        "external_api_token is required when model_source is 'external' for model_b"
+                    )
                 parameters.model_b = ModelRequest(**model_b)
 
         else:
@@ -379,9 +418,11 @@ class AsyncEvaluation:
     async def create(
         self,
         type: str,
-        judge_model_name: str,
+        judge_model: str,
+        judge_model_source: str,
         judge_system_template: str,
         input_data_file_path: str,
+        judge_external_api_token: Optional[str] = None,
         # Classify-specific parameters
         labels: Optional[List[str]] = None,
         pass_labels: Optional[List[str]] = None,
@@ -400,9 +441,11 @@ class AsyncEvaluation:
 
         Args:
             type: The type of evaluation ("classify", "score", or "compare")
-            judge_model_name: Name of the judge model
+            judge_model: Name or URL of the judge model
+            judge_model_source: Source of the judge model ("serverless", "dedicated", or "external")
             judge_system_template: System template for the judge
             input_data_file_path: Path to input data file
+            judge_external_api_token: Optional external API token for the judge model
             labels: List of classification labels (required for classify)
             pass_labels: List of labels considered as passing (required for classify)
             min_score: Minimum score value (required for score)
@@ -419,10 +462,17 @@ class AsyncEvaluation:
             client=self._client,
         )
 
+        if judge_model_source == "external" and not judge_external_api_token:
+            raise ValueError(
+                "judge_external_api_token is required when judge_model_source is 'external'"
+            )
+
         # Build judge config
         judge_config = JudgeModelConfig(
-            model_name=judge_model_name,
+            model=judge_model,
+            model_source=judge_model_source,
             system_template=judge_system_template,
+            external_api_token=judge_external_api_token,
         )
         parameters: Union[ClassifyParameters, ScoreParameters, CompareParameters]
         # Build parameters based on type
@@ -464,7 +514,8 @@ class AsyncEvaluation:
                 elif isinstance(model_to_evaluate, dict):
                     # Validate that all required fields are present for model config
                     required_fields = [
-                        "model_name",
+                        "model",
+                        "model_source",
                         "max_tokens",
                         "temperature",
                         "system_template",
@@ -480,6 +531,12 @@ class AsyncEvaluation:
                             f"All model config parameters are required when using detailed configuration. "
                             f"Missing: {', '.join(missing_fields)}"
                         )
+                    if model_to_evaluate.get(
+                        "model_source"
+                    ) == "external" and not model_to_evaluate.get("external_api_token"):
+                        raise ValueError(
+                            "external_api_token is required when model_source is 'external' for model_to_evaluate"
+                        )
                     parameters.model_to_evaluate = ModelRequest(**model_to_evaluate)
 
         elif type == "score":
@@ -515,7 +572,8 @@ class AsyncEvaluation:
                 elif isinstance(model_to_evaluate, dict):
                     # Validate that all required fields are present for model config
                     required_fields = [
-                        "model_name",
+                        "model",
+                        "model_source",
                         "max_tokens",
                         "temperature",
                         "system_template",
@@ -531,6 +589,12 @@ class AsyncEvaluation:
                             f"All model config parameters are required when using detailed configuration. "
                             f"Missing: {', '.join(missing_fields)}"
                         )
+                    if model_to_evaluate.get(
+                        "model_source"
+                    ) == "external" and not model_to_evaluate.get("external_api_token"):
+                        raise ValueError(
+                            "external_api_token is required when model_source is 'external' for model_to_evaluate"
+                        )
                     parameters.model_to_evaluate = ModelRequest(**model_to_evaluate)
 
         elif type == "compare":
@@ -575,7 +639,8 @@ class AsyncEvaluation:
             elif isinstance(model_a, dict):
                 # Validate that all required fields are present for model config
                 required_fields = [
-                    "model_name",
+                    "model",
+                    "model_source",
                     "max_tokens",
                     "temperature",
                     "system_template",
@@ -589,6 +654,12 @@ class AsyncEvaluation:
                         f"All model config parameters are required for model_a when using detailed configuration. "
                         f"Missing: {', '.join(missing_fields)}"
                     )
+                if model_a.get("model_source") == "external" and not model_a.get(
+                    "external_api_token"
+                ):
+                    raise ValueError(
+                        "external_api_token is required when model_source is 'external' for model_a"
+                    )
                 parameters.model_a = ModelRequest(**model_a)
 
             # Handle model_b
@@ -597,7 +668,8 @@ class AsyncEvaluation:
             elif isinstance(model_b, dict):
                 # Validate that all required fields are present for model config
                 required_fields = [
-                    "model_name",
+                    "model",
+                    "model_source",
                     "max_tokens",
                     "temperature",
                     "system_template",
@@ -611,6 +683,12 @@ class AsyncEvaluation:
                         f"All model config parameters are required for model_b when using detailed configuration. "
                         f"Missing: {', '.join(missing_fields)}"
                     )
+                if model_b.get("model_source") == "external" and not model_b.get(
+                    "external_api_token"
+                ):
+                    raise ValueError(
+                        "external_api_token is required when model_source is 'external' for model_b"
+                    )
                 parameters.model_b = ModelRequest(**model_b)
 
         else:

together/resources/files.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
+import os
 from pathlib import Path
 from pprint import pformat
 
 from together.abstract import api_requestor
+from together.constants import MULTIPART_THRESHOLD_GB, NUM_BYTES_IN_GB
 from together.error import FileTypeError
-from together.filemanager import DownloadManager, UploadManager
+from together.filemanager import DownloadManager, UploadManager, MultipartUploadManager
 from together.together_response import TogetherResponse
 from together.types import (
     FileDeleteResponse,
@@ -30,7 +32,6 @@ class Files:
         purpose: FilePurpose | str = FilePurpose.FineTune,
         check: bool = True,
     ) -> FileResponse:
-        upload_manager = UploadManager(self._client)
 
         if check and purpose == FilePurpose.FineTune:
             report_dict = check_file(file)
@@ -47,7 +48,15 @@ class Files:
 
         assert isinstance(purpose, FilePurpose)
 
-        return upload_manager.upload("files", file, purpose=purpose, redirect=True)
+        file_size = os.stat(file).st_size
+        file_size_gb = file_size / NUM_BYTES_IN_GB
+
+        if file_size_gb > MULTIPART_THRESHOLD_GB:
+            multipart_manager = MultipartUploadManager(self._client)
+            return multipart_manager.upload("files", file, purpose)
+        else:
+            upload_manager = UploadManager(self._client)
+            return upload_manager.upload("files", file, purpose=purpose, redirect=True)
 
     def list(self) -> FileList:
         requestor = api_requestor.APIRequestor(

together/resources/finetune.py

@@ -13,6 +13,7 @@ from together.types import (
     CosineLRScheduler,
     CosineLRSchedulerArgs,
     FinetuneCheckpoint,
+    FinetuneDeleteResponse,
     FinetuneDownloadResult,
     FinetuneList,
     FinetuneListEvents,
@@ -570,6 +571,37 @@ class FineTuning:
 
         return FinetuneResponse(**response.data)
 
+    def delete(self, id: str, force: bool = False) -> FinetuneDeleteResponse:
+        """
+        Method to delete a fine-tuning job
+
+        Args:
+            id (str): Fine-tune ID to delete. A string that starts with `ft-`.
+            force (bool, optional): Force deletion. Defaults to False.
+
+        Returns:
+            FinetuneDeleteResponse: Object containing deletion confirmation message.
+        """
+
+        requestor = api_requestor.APIRequestor(
+            client=self._client,
+        )
+
+        params = {"force": str(force).lower()}
+
+        response, _, _ = requestor.request(
+            options=TogetherRequest(
+                method="DELETE",
+                url=f"fine-tunes/{id}",
+                params=params,
+            ),
+            stream=False,
+        )
+
+        assert isinstance(response, TogetherResponse)
+
+        return FinetuneDeleteResponse(**response.data)
+
     def list_events(self, id: str) -> FinetuneListEvents:
         """
         Lists events of a fine-tune job
@@ -1007,6 +1039,37 @@ class AsyncFineTuning:
 
         return FinetuneResponse(**response.data)
 
+    async def delete(self, id: str, force: bool = False) -> FinetuneDeleteResponse:
+        """
+        Async method to delete a fine-tuning job
+
+        Args:
+            id (str): Fine-tune ID to delete. A string that starts with `ft-`.
+            force (bool, optional): Force deletion. Defaults to False.
+
+        Returns:
+            FinetuneDeleteResponse: Object containing deletion confirmation message.
+        """
+
+        requestor = api_requestor.APIRequestor(
+            client=self._client,
+        )
+
+        params = {"force": str(force).lower()}
+
+        response, _, _ = await requestor.arequest(
+            options=TogetherRequest(
+                method="DELETE",
+                url=f"fine-tunes/{id}",
+                params=params,
+            ),
+            stream=False,
+        )
+
+        assert isinstance(response, TogetherResponse)
+
+        return FinetuneDeleteResponse(**response.data)
+
     async def list_events(self, id: str) -> FinetuneListEvents:
         """
         List fine-tuning events

together/resources/models.py

@@ -6,6 +6,8 @@ from together.abstract import api_requestor
 from together.together_response import TogetherResponse
 from together.types import (
     ModelObject,
+    ModelUploadRequest,
+    ModelUploadResponse,
     TogetherClient,
     TogetherRequest,
 )
@@ -85,6 +87,64 @@ class Models(ModelsBase):
 
         return models
 
+    def upload(
+        self,
+        *,
+        model_name: str,
+        model_source: str,
+        model_type: str = "model",
+        hf_token: str | None = None,
+        description: str | None = None,
+        base_model: str | None = None,
+        lora_model: str | None = None,
+    ) -> ModelUploadResponse:
+        """
+        Upload a custom model or adapter from Hugging Face or S3.
+
+        Args:
+            model_name (str): The name to give to your uploaded model
+            model_source (str): The source location of the model (Hugging Face repo or S3 path)
+            model_type (str, optional): Whether the model is a full model or an adapter. Defaults to "model".
+            hf_token (str, optional): Hugging Face token (if uploading from Hugging Face)
+            description (str, optional): A description of your model
+            base_model (str, optional): The base model to use for an adapter if setting it to run against a serverless pool. Only used for model_type "adapter".
+            lora_model (str, optional): The lora pool to use for an adapter if setting it to run against, say, a dedicated pool. Only used for model_type "adapter".
+
+        Returns:
+            ModelUploadResponse: Object containing upload job information
+        """
+        requestor = api_requestor.APIRequestor(
+            client=self._client,
+        )
+
+        data = {
+            "model_name": model_name,
+            "model_source": model_source,
+            "model_type": model_type,
+        }
+
+        if hf_token is not None:
+            data["hf_token"] = hf_token
+        if description is not None:
+            data["description"] = description
+        if base_model is not None:
+            data["base_model"] = base_model
+        if lora_model is not None:
+            data["lora_model"] = lora_model
+
+        response, _, _ = requestor.request(
+            options=TogetherRequest(
+                method="POST",
+                url="models",
+                params=data,
+            ),
+            stream=False,
+        )
+
+        assert isinstance(response, TogetherResponse)
+
+        return ModelUploadResponse.from_api_response(response.data)
+
 
 class AsyncModels(ModelsBase):
     async def list(
@@ -132,3 +192,61 @@ class AsyncModels(ModelsBase):
         models.sort(key=lambda x: x.id.lower())
 
         return models
+
+    async def upload(
+        self,
+        *,
+        model_name: str,
+        model_source: str,
+        model_type: str = "model",
+        hf_token: str | None = None,
+        description: str | None = None,
+        base_model: str | None = None,
+        lora_model: str | None = None,
+    ) -> ModelUploadResponse:
+        """
+        Upload a custom model or adapter from Hugging Face or S3.
+
+        Args:
+            model_name (str): The name to give to your uploaded model
+            model_source (str): The source location of the model (Hugging Face repo or S3 path)
+            model_type (str, optional): Whether the model is a full model or an adapter. Defaults to "model".
+            hf_token (str, optional): Hugging Face token (if uploading from Hugging Face)
+            description (str, optional): A description of your model
+            base_model (str, optional): The base model to use for an adapter if setting it to run against a serverless pool. Only used for model_type "adapter".
+            lora_model (str, optional): The lora pool to use for an adapter if setting it to run against, say, a dedicated pool. Only used for model_type "adapter".
+
+        Returns:
+            ModelUploadResponse: Object containing upload job information
+        """
+        requestor = api_requestor.APIRequestor(
+            client=self._client,
+        )
+
+        data = {
+            "model_name": model_name,
+            "model_source": model_source,
+            "model_type": model_type,
+        }
+
+        if hf_token is not None:
+            data["hf_token"] = hf_token
+        if description is not None:
+            data["description"] = description
+        if base_model is not None:
+            data["base_model"] = base_model
+        if lora_model is not None:
+            data["lora_model"] = lora_model
+
+        response, _, _ = await requestor.arequest(
+            options=TogetherRequest(
+                method="POST",
+                url="models",
+                params=data,
+            ),
+            stream=False,
+        )
+
+        assert isinstance(response, TogetherResponse)
+
+        return ModelUploadResponse.from_api_response(response.data)

together/types/__init__.py

@@ -52,13 +52,14 @@ from together.types.finetune import (
     FinetuneListEvents,
     FinetuneRequest,
     FinetuneResponse,
+    FinetuneDeleteResponse,
     FinetuneTrainingLimits,
     FullTrainingType,
     LoRATrainingType,
     TrainingType,
 )
 from together.types.images import ImageRequest, ImageResponse
-from together.types.models import ModelObject
+from together.types.models import ModelObject, ModelUploadRequest, ModelUploadResponse
 from together.types.rerank import RerankRequest, RerankResponse
 from together.types.batch import BatchJob, BatchJobStatus, BatchEndpoint
 from together.types.evaluation import (
@@ -92,6 +93,7 @@ __all__ = [
     "FinetuneResponse",
     "FinetuneList",
     "FinetuneListEvents",
+    "FinetuneDeleteResponse",
     "FinetuneDownloadResult",
     "FinetuneLRScheduler",
     "LinearLRScheduler",
@@ -108,6 +110,8 @@ __all__ = [
     "ImageRequest",
     "ImageResponse",
     "ModelObject",
+    "ModelUploadRequest",
+    "ModelUploadResponse",
     "TrainingType",
     "FullTrainingType",
     "LoRATrainingType",

together/types/batch.py

@@ -20,6 +20,7 @@ class BatchJobStatus(str, Enum):
     FAILED = "FAILED"
     EXPIRED = "EXPIRED"
     CANCELLED = "CANCELLED"
+    CANCELING = "CANCELING"
 
 
 class BatchEndpoint(str, Enum):

together/types/evaluation.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from datetime import datetime
 from enum import Enum
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 
 from pydantic import BaseModel, Field
 
@@ -23,16 +23,20 @@ class EvaluationStatus(str, Enum):
 
 
 class JudgeModelConfig(BaseModel):
-    model_name: str
+    model: str
+    model_source: Literal["serverless", "dedicated", "external"]
     system_template: str
+    external_api_token: Optional[str] = None
 
 
 class ModelRequest(BaseModel):
-    model_name: str
+    model: str
+    model_source: Literal["serverless", "dedicated", "external"]
     max_tokens: int
     temperature: float
     system_template: str
     input_template: str
+    external_api_token: Optional[str] = None
 
 
 class ClassifyParameters(BaseModel):

together/types/files.py

@@ -52,7 +52,7 @@ class FileResponse(BaseModel):
     """
 
     id: str
-    object: Literal[ObjectType.File]
+    object: str
     # created timestamp
     created_at: int | None = None
     type: FileType | None = None

together/types/finetune.py

@@ -322,6 +322,11 @@ class FinetuneListEvents(BaseModel):
     data: List[FinetuneEvent] | None = None
 
 
+class FinetuneDeleteResponse(BaseModel):
+    # delete message
+    message: str
+
+
 class FinetuneDownloadResult(BaseModel):
     # object type
     object: Literal["local"] | None = None

together/types/models.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import Literal
+from typing import Any, Dict, Literal, Optional
 
 from together.types.abstract import BaseModel
 from together.types.common import ObjectType
@@ -44,3 +44,52 @@ class ModelObject(BaseModel):
     license: str | None = None
     context_length: int | None = None
     pricing: PricingObject
+
+
+class ModelUploadRequest(BaseModel):
+    model_name: str
+    model_source: str
+    model_type: Literal["model", "adapter"] = "model"
+    hf_token: Optional[str] = None
+    description: Optional[str] = None
+    base_model: Optional[str] = None
+    lora_model: Optional[str] = None
+
+
+class ModelUploadResponse(BaseModel):
+    job_id: Optional[str] = None
+    model_name: Optional[str] = None
+    model_id: Optional[str] = None
+    model_source: Optional[str] = None
+    message: str
+
+    @classmethod
+    def from_api_response(cls, response_data: Dict[str, Any]) -> "ModelUploadResponse":
+        """Create ModelUploadResponse from API response, handling both flat and nested structures"""
+        # Start with the base response
+        result: Dict[str, Any] = {"message": response_data.get("message", "")}
+
+        # Check if we have nested data
+        if "data" in response_data and response_data["data"] is not None:
+            # Use nested data values
+            nested_data = response_data["data"]
+            result.update(
+                {
+                    "job_id": nested_data.get("job_id"),
+                    "model_name": nested_data.get("model_name"),
+                    "model_id": nested_data.get("model_id"),
+                    "model_source": nested_data.get("model_source"),
+                }
+            )
+        else:
+            # Use top-level values
+            result.update(
+                {
+                    "job_id": response_data.get("job_id"),
+                    "model_name": response_data.get("model_name"),
+                    "model_id": response_data.get("model_id"),
+                    "model_source": response_data.get("model_source"),
+                }
+            )
+
+        return cls(**result)