together 1.4.5__tar.gz → 1.5.2__tar.gz

{together-1.4.5 → together-1.5.2}/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.3
 Name: together
-Version: 1.4.5
+Version: 1.5.2
 Summary: Python client for Together's Cloud Platform!
 License: Apache-2.0
 Author: Together AI
 Author-email: support@together.ai
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -45,7 +44,7 @@ Description-Content-Type: text/markdown
 [![Discord](https://dcbadge.vercel.app/api/server/9Rk6sSeWEG?style=flat&compact=true)](https://discord.com/invite/9Rk6sSeWEG)
 [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/togethercompute.svg?style=social&label=Follow%20%40togethercompute)](https://twitter.com/togethercompute)
 
-The [Together Python API Library](https://pypi.org/project/together/) is the official Python client for Together's API platform, providing a convenient way for interacting with the REST APIs and enables easy integrations with Python 3.8+ applications with easy to use synchronous and asynchronous clients.
+The [Together Python API Library](https://pypi.org/project/together/) is the official Python client for Together's API platform, providing a convenient way for interacting with the REST APIs and enables easy integrations with Python 3.10+ applications with easy to use synchronous and asynchronous clients.
 
 
 

{together-1.4.5 → together-1.5.2}/README.md

@@ -10,7 +10,7 @@
 [![Discord](https://dcbadge.vercel.app/api/server/9Rk6sSeWEG?style=flat&compact=true)](https://discord.com/invite/9Rk6sSeWEG)
 [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/togethercompute.svg?style=social&label=Follow%20%40togethercompute)](https://twitter.com/togethercompute)
 
-The [Together Python API Library](https://pypi.org/project/together/) is the official Python client for Together's API platform, providing a convenient way for interacting with the REST APIs and enables easy integrations with Python 3.8+ applications with easy to use synchronous and asynchronous clients.
+The [Together Python API Library](https://pypi.org/project/together/) is the official Python client for Together's API platform, providing a convenient way for interacting with the REST APIs and enables easy integrations with Python 3.10+ applications with easy to use synchronous and asynchronous clients.
 
 
 

{together-1.4.5 → together-1.5.2}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "together"
-version = "1.4.5"
+version = "1.5.2"
 authors = [
     "Together AI <support@together.ai>"
 ]
@@ -28,7 +28,7 @@ repository = "https://github.com/togethercomputer/together-python"
 homepage = "https://github.com/togethercomputer/together-python"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 typer = ">=0.9,<0.16"
 requests = "^2.31.0"
 rich = "^13.8.1"

{together-1.4.5 → together-1.5.2}/src/together/cli/api/endpoints.py

@@ -127,6 +127,11 @@ def endpoints(ctx: click.Context) -> None:
     is_flag=True,
     help="Create the endpoint in STOPPED state instead of auto-starting it",
 )
+@click.option(
+    "--inactive-timeout",
+    type=int,
+    help="Number of minutes of inactivity after which the endpoint will be automatically stopped. Set to 0 to disable.",
+)
 @click.option(
     "--wait",
     is_flag=True,
@@ -146,6 +151,7 @@ def create(
     no_prompt_cache: bool,
     no_speculative_decoding: bool,
     no_auto_start: bool,
+    inactive_timeout: int | None,
     wait: bool,
 ) -> None:
     """Create a new dedicated inference endpoint."""
@@ -170,6 +176,7 @@ def create(
             disable_prompt_cache=no_prompt_cache,
             disable_speculative_decoding=no_speculative_decoding,
             state="STOPPED" if no_auto_start else "STARTED",
+            inactive_timeout=inactive_timeout,
         )
     except InvalidRequestError as e:
         print_api_error(e)
@@ -194,6 +201,8 @@ def create(
         click.echo("  Speculative decoding: disabled", err=True)
     if no_auto_start:
         click.echo("  Auto-start: disabled", err=True)
+    if inactive_timeout is not None:
+        click.echo(f"  Inactive timeout: {inactive_timeout} minutes", err=True)
 
     click.echo(f"Endpoint created successfully, id: {response.id}", err=True)
 
@@ -371,6 +380,11 @@ def list(
     type=int,
     help="New maximum number of replicas to scale up to",
 )
+@click.option(
+    "--inactive-timeout",
+    type=int,
+    help="Number of minutes of inactivity after which the endpoint will be automatically stopped. Set to 0 to disable.",
+)
 @click.pass_obj
 @handle_api_errors
 def update(
@@ -379,9 +393,10 @@ def update(
     display_name: str | None,
     min_replicas: int | None,
     max_replicas: int | None,
+    inactive_timeout: int | None,
 ) -> None:
     """Update a dedicated inference endpoint's configuration."""
-    if not any([display_name, min_replicas, max_replicas]):
+    if not any([display_name, min_replicas, max_replicas, inactive_timeout]):
         click.echo("Error: At least one update option must be specified", err=True)
         sys.exit(1)
 
@@ -400,6 +415,8 @@ def update(
     if min_replicas is not None and max_replicas is not None:
         kwargs["min_replicas"] = min_replicas
         kwargs["max_replicas"] = max_replicas
+    if inactive_timeout is not None:
+        kwargs["inactive_timeout"] = inactive_timeout
 
     _response = client.endpoints.update(endpoint_id, **kwargs)
 
@@ -410,6 +427,8 @@ def update(
     if min_replicas is not None and max_replicas is not None:
         click.echo(f"  Min replicas: {min_replicas}", err=True)
         click.echo(f"  Max replicas: {max_replicas}", err=True)
+    if inactive_timeout is not None:
+        click.echo(f"  Inactive timeout: {inactive_timeout} minutes", err=True)
 
     click.echo("Successfully updated endpoint", err=True)
     click.echo(endpoint_id)

{together-1.4.5 → together-1.5.2}/src/together/cli/api/finetune.py

@@ -58,30 +58,50 @@ def fine_tuning(ctx: click.Context) -> None:
 @fine_tuning.command()
 @click.pass_context
 @click.option(
-    "--training-file", type=str, required=True, help="Training file ID from Files API"
+    "--training-file",
+    "-t",
+    type=str,
+    required=True,
+    help="Training file ID from Files API",
+)
+@click.option("--model", "-m", type=str, help="Base model name")
+@click.option(
+    "--n-epochs", "-ne", type=int, default=1, help="Number of epochs to train for"
 )
-@click.option("--model", type=str, required=True, help="Base model name")
-@click.option("--n-epochs", type=int, default=1, help="Number of epochs to train for")
 @click.option(
     "--validation-file", type=str, default="", help="Validation file ID from Files API"
 )
 @click.option("--n-evals", type=int, default=0, help="Number of evaluation loops")
 @click.option(
-    "--n-checkpoints", type=int, default=1, help="Number of checkpoints to save"
+    "--n-checkpoints", "-c", type=int, default=1, help="Number of checkpoints to save"
+)
+@click.option(
+    "--batch-size", "-b", type=INT_WITH_MAX, default="max", help="Train batch size"
+)
+@click.option("--learning-rate", "-lr", type=float, default=1e-5, help="Learning rate")
+@click.option(
+    "--lr-scheduler-type",
+    type=click.Choice(["linear", "cosine"]),
+    default="linear",
+    help="Learning rate scheduler type",
 )
-@click.option("--batch-size", type=INT_WITH_MAX, default="max", help="Train batch size")
-@click.option("--learning-rate", type=float, default=1e-5, help="Learning rate")
 @click.option(
     "--min-lr-ratio",
     type=float,
     default=0.0,
     help="The ratio of the final learning rate to the peak learning rate",
 )
+@click.option(
+    "--scheduler-num-cycles",
+    type=float,
+    default=0.5,
+    help="Number or fraction of cycles for the cosine learning rate scheduler.",
+)
 @click.option(
     "--warmup-ratio",
     type=float,
     default=0.0,
-    help="Warmup ratio for learning rate scheduler.",
+    help="Warmup ratio for the learning rate scheduler.",
 )
 @click.option(
     "--max-grad-norm",
@@ -123,7 +143,11 @@ def fine_tuning(ctx: click.Context) -> None:
     help="Beta parameter for DPO training (only used when '--training-method' is 'dpo')",
 )
 @click.option(
-    "--suffix", type=str, default=None, help="Suffix for the fine-tuned model name"
+    "--suffix",
+    "-s",
+    type=str,
+    default=None,
+    help="Suffix for the fine-tuned model name",
 )
 @click.option("--wandb-api-key", type=str, default=None, help="Wandb API key")
 @click.option("--wandb-base-url", type=str, default=None, help="Wandb base URL")
@@ -162,7 +186,9 @@ def create(
     n_checkpoints: int,
     batch_size: int | Literal["max"],
     learning_rate: float,
+    lr_scheduler_type: Literal["linear", "cosine"],
     min_lr_ratio: float,
+    scheduler_num_cycles: float,
     warmup_ratio: float,
     max_grad_norm: float,
     weight_decay: float,
@@ -194,7 +220,9 @@ def create(
         n_checkpoints=n_checkpoints,
         batch_size=batch_size,
         learning_rate=learning_rate,
+        lr_scheduler_type=lr_scheduler_type,
         min_lr_ratio=min_lr_ratio,
+        scheduler_num_cycles=scheduler_num_cycles,
         warmup_ratio=warmup_ratio,
         max_grad_norm=max_grad_norm,
         weight_decay=weight_decay,
@@ -214,8 +242,15 @@ def create(
         from_checkpoint=from_checkpoint,
     )
 
+    if model is None and from_checkpoint is None:
+        raise click.BadParameter("You must specify either a model or a checkpoint")
+
+    model_name = model
+    if from_checkpoint is not None:
+        model_name = from_checkpoint.split(":")[0]
+
     model_limits: FinetuneTrainingLimits = client.fine_tuning.get_model_limits(
-        model=model
+        model=model_name
     )
 
     if lora:
@@ -411,6 +446,7 @@ def list_checkpoints(ctx: click.Context, fine_tune_id: str) -> None:
 @click.argument("fine_tune_id", type=str, required=True)
 @click.option(
     "--output_dir",
+    "-o",
     type=click.Path(exists=True, file_okay=False, resolve_path=True),
     required=False,
     default=None,
@@ -418,6 +454,7 @@ def list_checkpoints(ctx: click.Context, fine_tune_id: str) -> None:
 )
 @click.option(
     "--checkpoint-step",
+    "-s",
     type=int,
     required=False,
     default=None,

{together-1.4.5 → together-1.5.2}/src/together/cli/api/models.py

@@ -1,4 +1,4 @@
-from textwrap import wrap
+import json as json_lib
 
 import click
 from tabulate import tabulate
@@ -15,12 +15,22 @@ def models(ctx: click.Context) -> None:
 
 
 @models.command()
+@click.option(
+    "--type",
+    type=click.Choice(["dedicated"]),
+    help="Filter models by type (dedicated: models that can be deployed as dedicated endpoints)",
+)
+@click.option(
+    "--json",
+    is_flag=True,
+    help="Output in JSON format",
+)
 @click.pass_context
-def list(ctx: click.Context) -> None:
+def list(ctx: click.Context, type: str | None, json: bool) -> None:
     """List models"""
     client: Together = ctx.obj
 
-    response = client.models.list()
+    response = client.models.list(dedicated=(type == "dedicated"))
 
     display_list = []
 
@@ -28,15 +38,18 @@ def list(ctx: click.Context) -> None:
     for model in response:
         display_list.append(
             {
-                "ID": "\n".join(wrap(model.id or "", width=30)),
-                "Name": "\n".join(wrap(model.display_name or "", width=30)),
+                "ID": model.id,
+                "Name": model.display_name,
                 "Organization": model.organization,
                 "Type": model.type,
                 "Context Length": model.context_length,
-                "License": "\n".join(wrap(model.license or "", width=30)),
+                "License": model.license,
                 "Input per 1M token": model.pricing.input,
                 "Output per 1M token": model.pricing.output,
             }
         )
 
-    click.echo(tabulate(display_list, headers="keys", tablefmt="grid"))
+    if json:
+        click.echo(json_lib.dumps(display_list, indent=2))
+    else:
+        click.echo(tabulate(display_list, headers="keys", tablefmt="plain"))

{together-1.4.5 → together-1.5.2}/src/together/resources/endpoints.py

@@ -59,6 +59,7 @@ class Endpoints:
         disable_prompt_cache: bool = False,
         disable_speculative_decoding: bool = False,
         state: Literal["STARTED", "STOPPED"] = "STARTED",
+        inactive_timeout: Optional[int] = None,
     ) -> DedicatedEndpoint:
         """
         Create a new dedicated endpoint.
@@ -72,6 +73,7 @@ class Endpoints:
             disable_prompt_cache (bool, optional): Whether to disable the prompt cache. Defaults to False.
             disable_speculative_decoding (bool, optional): Whether to disable speculative decoding. Defaults to False.
             state (str, optional): The desired state of the endpoint. Defaults to "STARTED".
+            inactive_timeout (int, optional): The number of minutes of inactivity after which the endpoint will be automatically stopped. Set to 0 to disable automatic timeout.
 
         Returns:
             DedicatedEndpoint: Object containing endpoint information
@@ -80,7 +82,7 @@ class Endpoints:
             client=self._client,
         )
 
-        data: Dict[str, Union[str, bool, Dict[str, int]]] = {
+        data: Dict[str, Union[str, bool, Dict[str, int], int]] = {
             "model": model,
             "hardware": hardware,
             "autoscaling": {
@@ -95,6 +97,9 @@ class Endpoints:
         if display_name is not None:
             data["display_name"] = display_name
 
+        if inactive_timeout is not None:
+            data["inactive_timeout"] = inactive_timeout
+
         response, _, _ = requestor.request(
             options=TogetherRequest(
                 method="POST",
@@ -161,6 +166,7 @@ class Endpoints:
         max_replicas: Optional[int] = None,
         state: Optional[Literal["STARTED", "STOPPED"]] = None,
         display_name: Optional[str] = None,
+        inactive_timeout: Optional[int] = None,
     ) -> DedicatedEndpoint:
         """
         Update an endpoint's configuration.
@@ -171,6 +177,7 @@ class Endpoints:
             max_replicas (int, optional): The maximum number of replicas to scale up to
             state (str, optional): The desired state of the endpoint ("STARTED" or "STOPPED")
             display_name (str, optional): A human-readable name for the endpoint
+            inactive_timeout (int, optional): The number of minutes of inactivity after which the endpoint will be automatically stopped. Set to 0 to disable automatic timeout.
 
         Returns:
             DedicatedEndpoint: Object containing endpoint information
@@ -179,7 +186,7 @@ class Endpoints:
             client=self._client,
         )
 
-        data: Dict[str, Union[str, Dict[str, int]]] = {}
+        data: Dict[str, Union[str, Dict[str, int], int]] = {}
 
         if min_replicas is not None or max_replicas is not None:
             current_min = min_replicas
@@ -200,6 +207,9 @@ class Endpoints:
         if display_name is not None:
             data["display_name"] = display_name
 
+        if inactive_timeout is not None:
+            data["inactive_timeout"] = inactive_timeout
+
         response, _, _ = requestor.request(
             options=TogetherRequest(
                 method="PATCH",
@@ -297,6 +307,7 @@ class AsyncEndpoints:
         disable_prompt_cache: bool = False,
         disable_speculative_decoding: bool = False,
         state: Literal["STARTED", "STOPPED"] = "STARTED",
+        inactive_timeout: Optional[int] = None,
     ) -> DedicatedEndpoint:
         """
         Create a new dedicated endpoint.
@@ -310,6 +321,7 @@ class AsyncEndpoints:
             disable_prompt_cache (bool, optional): Whether to disable the prompt cache. Defaults to False.
             disable_speculative_decoding (bool, optional): Whether to disable speculative decoding. Defaults to False.
             state (str, optional): The desired state of the endpoint. Defaults to "STARTED".
+            inactive_timeout (int, optional): The number of minutes of inactivity after which the endpoint will be automatically stopped. Set to 0 to disable automatic timeout.
 
         Returns:
             DedicatedEndpoint: Object containing endpoint information
@@ -318,7 +330,7 @@ class AsyncEndpoints:
             client=self._client,
         )
 
-        data: Dict[str, Union[str, bool, Dict[str, int]]] = {
+        data: Dict[str, Union[str, bool, Dict[str, int], int]] = {
             "model": model,
             "hardware": hardware,
             "autoscaling": {
@@ -333,6 +345,9 @@ class AsyncEndpoints:
         if display_name is not None:
             data["display_name"] = display_name
 
+        if inactive_timeout is not None:
+            data["inactive_timeout"] = inactive_timeout
+
         response, _, _ = await requestor.arequest(
             options=TogetherRequest(
                 method="POST",
@@ -399,6 +414,7 @@ class AsyncEndpoints:
         max_replicas: Optional[int] = None,
         state: Optional[Literal["STARTED", "STOPPED"]] = None,
         display_name: Optional[str] = None,
+        inactive_timeout: Optional[int] = None,
     ) -> DedicatedEndpoint:
         """
         Update an endpoint's configuration.
@@ -409,6 +425,7 @@ class AsyncEndpoints:
             max_replicas (int, optional): The maximum number of replicas to scale up to
             state (str, optional): The desired state of the endpoint ("STARTED" or "STOPPED")
             display_name (str, optional): A human-readable name for the endpoint
+            inactive_timeout (int, optional): The number of minutes of inactivity after which the endpoint will be automatically stopped. Set to 0 to disable automatic timeout.
 
         Returns:
             DedicatedEndpoint: Object containing endpoint information
@@ -417,7 +434,7 @@ class AsyncEndpoints:
             client=self._client,
         )
 
-        data: Dict[str, Union[str, Dict[str, int]]] = {}
+        data: Dict[str, Union[str, Dict[str, int], int]] = {}
 
         if min_replicas is not None or max_replicas is not None:
             current_min = min_replicas
@@ -438,6 +455,9 @@ class AsyncEndpoints:
         if display_name is not None:
             data["display_name"] = display_name
 
+        if inactive_timeout is not None:
+            data["inactive_timeout"] = inactive_timeout
+
         response, _, _ = await requestor.arequest(
             options=TogetherRequest(
                 method="PATCH",

{together-1.4.5 → together-1.5.2}/src/together/resources/finetune.py

@@ -22,7 +22,10 @@ from together.types import (
     TogetherRequest,
     TrainingType,
     FinetuneLRScheduler,
+    FinetuneLinearLRScheduler,
+    FinetuneCosineLRScheduler,
     FinetuneLinearLRSchedulerArgs,
+    FinetuneCosineLRSchedulerArgs,
     TrainingMethodDPO,
     TrainingMethodSFT,
     FinetuneCheckpoint,
@@ -50,14 +53,16 @@ AVAILABLE_TRAINING_METHODS = {
 def createFinetuneRequest(
     model_limits: FinetuneTrainingLimits,
     training_file: str,
-    model: str,
+    model: str | None = None,
     n_epochs: int = 1,
     validation_file: str | None = "",
     n_evals: int | None = 0,
     n_checkpoints: int | None = 1,
     batch_size: int | Literal["max"] = "max",
     learning_rate: float | None = 0.00001,
+    lr_scheduler_type: Literal["linear", "cosine"] = "linear",
     min_lr_ratio: float = 0.0,
+    scheduler_num_cycles: float = 0.5,
     warmup_ratio: float = 0.0,
     max_grad_norm: float = 1.0,
     weight_decay: float = 0.0,
@@ -77,6 +82,11 @@ def createFinetuneRequest(
     from_checkpoint: str | None = None,
 ) -> FinetuneRequest:
 
+    if model is not None and from_checkpoint is not None:
+        raise ValueError(
+            "You must specify either a model or a checkpoint to start a job from, not both"
+        )
+
     if batch_size == "max":
         log_warn_once(
             "Starting from together>=1.3.0, "
@@ -129,10 +139,22 @@ def createFinetuneRequest(
             f"training_method must be one of {', '.join(AVAILABLE_TRAINING_METHODS)}"
         )
 
-    lrScheduler = FinetuneLRScheduler(
-        lr_scheduler_type="linear",
-        lr_scheduler_args=FinetuneLinearLRSchedulerArgs(min_lr_ratio=min_lr_ratio),
-    )
+    # Default to generic lr scheduler
+    lrScheduler: FinetuneLRScheduler = FinetuneLRScheduler(lr_scheduler_type="linear")
+
+    if lr_scheduler_type == "cosine":
+        if scheduler_num_cycles <= 0.0:
+            raise ValueError("Number of cycles should be greater than 0")
+
+        lrScheduler = FinetuneCosineLRScheduler(
+            lr_scheduler_args=FinetuneCosineLRSchedulerArgs(
+                min_lr_ratio=min_lr_ratio, num_cycles=scheduler_num_cycles
+            ),
+        )
+    else:
+        lrScheduler = FinetuneLinearLRScheduler(
+            lr_scheduler_args=FinetuneLinearLRSchedulerArgs(min_lr_ratio=min_lr_ratio),
+        )
 
     training_method_cls: TrainingMethodSFT | TrainingMethodDPO = TrainingMethodSFT()
     if training_method == "dpo":
@@ -237,14 +259,16 @@ class FineTuning:
         self,
         *,
         training_file: str,
-        model: str,
+        model: str | None = None,
         n_epochs: int = 1,
         validation_file: str | None = "",
         n_evals: int | None = 0,
         n_checkpoints: int | None = 1,
         batch_size: int | Literal["max"] = "max",
         learning_rate: float | None = 0.00001,
+        lr_scheduler_type: Literal["linear", "cosine"] = "linear",
         min_lr_ratio: float = 0.0,
+        scheduler_num_cycles: float = 0.5,
         warmup_ratio: float = 0.0,
         max_grad_norm: float = 1.0,
         weight_decay: float = 0.0,
@@ -270,7 +294,7 @@ class FineTuning:
 
         Args:
             training_file (str): File-ID of a file uploaded to the Together API
-            model (str): Name of the base model to run fine-tune job on
+            model (str, optional): Name of the base model to run fine-tune job on
             n_epochs (int, optional): Number of epochs for fine-tuning. Defaults to 1.
             validation file (str, optional): File ID of a file uploaded to the Together API for validation.
             n_evals (int, optional): Number of evaluation loops to run. Defaults to 0.
@@ -279,9 +303,11 @@ class FineTuning:
             batch_size (int or "max"): Batch size for fine-tuning. Defaults to max.
             learning_rate (float, optional): Learning rate multiplier to use for training
                 Defaults to 0.00001.
+            lr_scheduler_type (Literal["linear", "cosine"]): Learning rate scheduler type. Defaults to "linear".
             min_lr_ratio (float, optional): Min learning rate ratio of the initial learning rate for
                 the learning rate scheduler. Defaults to 0.0.
-            warmup_ratio (float, optional): Warmup ratio for learning rate scheduler.
+            scheduler_num_cycles (float, optional): Number or fraction of cycles for the cosine learning rate scheduler. Defaults to 0.5.
+            warmup_ratio (float, optional): Warmup ratio for the learning rate scheduler.
             max_grad_norm (float, optional): Max gradient norm. Defaults to 1.0, set to 0 to disable.
             weight_decay (float, optional): Weight decay. Defaults to 0.0.
             lora (bool, optional): Whether to use LoRA adapters. Defaults to True.
@@ -320,12 +346,24 @@ class FineTuning:
             FinetuneResponse: Object containing information about fine-tuning job.
         """
 
+        if model is None and from_checkpoint is None:
+            raise ValueError("You must specify either a model or a checkpoint")
+
         requestor = api_requestor.APIRequestor(
             client=self._client,
         )
 
         if model_limits is None:
-            model_limits = self.get_model_limits(model=model)
+            # mypy doesn't understand that model or from_checkpoint is not None
+            if model is not None:
+                model_name = model
+            elif from_checkpoint is not None:
+                model_name = from_checkpoint.split(":")[0]
+            else:
+                # this branch is unreachable, but mypy doesn't know that
+                pass
+            model_limits = self.get_model_limits(model=model_name)
+
         finetune_request = createFinetuneRequest(
             model_limits=model_limits,
             training_file=training_file,
@@ -336,7 +374,9 @@ class FineTuning:
             n_checkpoints=n_checkpoints,
             batch_size=batch_size,
             learning_rate=learning_rate,
+            lr_scheduler_type=lr_scheduler_type,
             min_lr_ratio=min_lr_ratio,
+            scheduler_num_cycles=scheduler_num_cycles,
             warmup_ratio=warmup_ratio,
             max_grad_norm=max_grad_norm,
             weight_decay=weight_decay,
@@ -610,14 +650,16 @@ class AsyncFineTuning:
         self,
         *,
         training_file: str,
-        model: str,
+        model: str | None = None,
         n_epochs: int = 1,
         validation_file: str | None = "",
         n_evals: int | None = 0,
         n_checkpoints: int | None = 1,
         batch_size: int | Literal["max"] = "max",
         learning_rate: float | None = 0.00001,
+        lr_scheduler_type: Literal["linear", "cosine"] = "linear",
         min_lr_ratio: float = 0.0,
+        scheduler_num_cycles: float = 0.5,
         warmup_ratio: float = 0.0,
         max_grad_norm: float = 1.0,
         weight_decay: float = 0.0,
@@ -643,7 +685,7 @@ class AsyncFineTuning:
 
         Args:
             training_file (str): File-ID of a file uploaded to the Together API
-            model (str): Name of the base model to run fine-tune job on
+            model (str, optional): Name of the base model to run fine-tune job on
             n_epochs (int, optional): Number of epochs for fine-tuning. Defaults to 1.
             validation file (str, optional): File ID of a file uploaded to the Together API for validation.
             n_evals (int, optional): Number of evaluation loops to run. Defaults to 0.
@@ -652,9 +694,11 @@ class AsyncFineTuning:
             batch_size (int, optional): Batch size for fine-tuning. Defaults to max.
             learning_rate (float, optional): Learning rate multiplier to use for training
                 Defaults to 0.00001.
+            lr_scheduler_type (Literal["linear", "cosine"]): Learning rate scheduler type. Defaults to "linear".
             min_lr_ratio (float, optional): Min learning rate ratio of the initial learning rate for
                 the learning rate scheduler. Defaults to 0.0.
-            warmup_ratio (float, optional): Warmup ratio for learning rate scheduler.
+            scheduler_num_cycles (float, optional): Number or fraction of cycles for the cosine learning rate scheduler. Defaults to 0.5.
+            warmup_ratio (float, optional): Warmup ratio for the learning rate scheduler.
             max_grad_norm (float, optional): Max gradient norm. Defaults to 1.0, set to 0 to disable.
             weight_decay (float, optional): Weight decay. Defaults to 0.0.
             lora (bool, optional): Whether to use LoRA adapters. Defaults to True.
@@ -693,12 +737,23 @@ class AsyncFineTuning:
             FinetuneResponse: Object containing information about fine-tuning job.
         """
 
+        if model is None and from_checkpoint is None:
+            raise ValueError("You must specify either a model or a checkpoint")
+
         requestor = api_requestor.APIRequestor(
             client=self._client,
         )
 
         if model_limits is None:
-            model_limits = await self.get_model_limits(model=model)
+            # mypy doesn't understand that model or from_checkpoint is not None
+            if model is not None:
+                model_name = model
+            elif from_checkpoint is not None:
+                model_name = from_checkpoint.split(":")[0]
+            else:
+                # this branch is unreachable, but mypy doesn't know that
+                pass
+            model_limits = await self.get_model_limits(model=model_name)
 
         finetune_request = createFinetuneRequest(
             model_limits=model_limits,
@@ -710,7 +765,9 @@ class AsyncFineTuning:
             n_checkpoints=n_checkpoints,
             batch_size=batch_size,
             learning_rate=learning_rate,
+            lr_scheduler_type=lr_scheduler_type,
             min_lr_ratio=min_lr_ratio,
+            scheduler_num_cycles=scheduler_num_cycles,
             warmup_ratio=warmup_ratio,
             max_grad_norm=max_grad_norm,
             weight_decay=weight_decay,

together-1.5.2/src/together/resources/models.py

@@ -0,0 +1,134 @@
+from __future__ import annotations
+
+from typing import List
+
+from together.abstract import api_requestor
+from together.together_response import TogetherResponse
+from together.types import (
+    ModelObject,
+    TogetherClient,
+    TogetherRequest,
+)
+
+
+class ModelsBase:
+    def __init__(self, client: TogetherClient) -> None:
+        self._client = client
+
+    def _filter_dedicated_models(
+        self, models: List[ModelObject], dedicated_response: TogetherResponse
+    ) -> List[ModelObject]:
+        """
+        Filter models based on dedicated model response.
+
+        Args:
+            models (List[ModelObject]): List of all models
+            dedicated_response (TogetherResponse): Response from autoscale models endpoint
+
+        Returns:
+            List[ModelObject]: Filtered list of models
+        """
+        assert isinstance(dedicated_response.data, list)
+
+        # Create a set of dedicated model names for efficient lookup
+        dedicated_model_names = {model["name"] for model in dedicated_response.data}
+
+        # Filter models to only include those in dedicated_model_names
+        # Note: The model.id from ModelObject matches the name field in the autoscale response
+        return [model for model in models if model.id in dedicated_model_names]
+
+
+class Models(ModelsBase):
+    def list(
+        self,
+        dedicated: bool = False,
+    ) -> List[ModelObject]:
+        """
+        Method to return list of models on the API
+
+        Args:
+            dedicated (bool, optional): If True, returns only dedicated models. Defaults to False.
+
+        Returns:
+            List[ModelObject]: List of model objects
+        """
+        requestor = api_requestor.APIRequestor(
+            client=self._client,
+        )
+
+        response, _, _ = requestor.request(
+            options=TogetherRequest(
+                method="GET",
+                url="models",
+            ),
+            stream=False,
+        )
+
+        assert isinstance(response, TogetherResponse)
+        assert isinstance(response.data, list)
+
+        models = [ModelObject(**model) for model in response.data]
+
+        if dedicated:
+            # Get dedicated models
+            dedicated_response, _, _ = requestor.request(
+                options=TogetherRequest(
+                    method="GET",
+                    url="autoscale/models",
+                ),
+                stream=False,
+            )
+
+            models = self._filter_dedicated_models(models, dedicated_response)
+
+        models.sort(key=lambda x: x.id.lower())
+
+        return models
+
+
+class AsyncModels(ModelsBase):
+    async def list(
+        self,
+        dedicated: bool = False,
+    ) -> List[ModelObject]:
+        """
+        Async method to return list of models on API
+
+        Args:
+            dedicated (bool, optional): If True, returns only dedicated models. Defaults to False.
+
+        Returns:
+            List[ModelObject]: List of model objects
+        """
+        requestor = api_requestor.APIRequestor(
+            client=self._client,
+        )
+
+        response, _, _ = await requestor.arequest(
+            options=TogetherRequest(
+                method="GET",
+                url="models",
+            ),
+            stream=False,
+        )
+
+        assert isinstance(response, TogetherResponse)
+        assert isinstance(response.data, list)
+
+        models = [ModelObject(**model) for model in response.data]
+
+        if dedicated:
+            # Get dedicated models
+            dedicated_response, _, _ = await requestor.arequest(
+                options=TogetherRequest(
+                    method="GET",
+                    url="autoscale/models",
+                ),
+                stream=False,
+            )
+
+            models = self._filter_dedicated_models(models, dedicated_response)
+
+        models.sort(key=lambda x: x.id.lower())
+
+        return models

{together-1.4.5 → together-1.5.2}/src/together/types/__init__.py

@@ -34,11 +34,14 @@ from together.types.finetune import (
     TrainingMethodDPO,
     TrainingMethodSFT,
     FinetuneCheckpoint,
+    FinetuneCosineLRScheduler,
+    FinetuneCosineLRSchedulerArgs,
     FinetuneDownloadResult,
+    FinetuneLinearLRScheduler,
     FinetuneLinearLRSchedulerArgs,
+    FinetuneLRScheduler,
     FinetuneList,
     FinetuneListEvents,
-    FinetuneLRScheduler,
     FinetuneRequest,
     FinetuneResponse,
     FinetuneTrainingLimits,
@@ -69,7 +72,10 @@ __all__ = [
     "FinetuneListEvents",
     "FinetuneDownloadResult",
     "FinetuneLRScheduler",
+    "FinetuneLinearLRScheduler",
     "FinetuneLinearLRSchedulerArgs",
+    "FinetuneCosineLRScheduler",
+    "FinetuneCosineLRSchedulerArgs",
     "FileRequest",
     "FileResponse",
     "FileList",

{together-1.4.5 → together-1.5.2}/src/together/types/finetune.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import List, Literal
+from typing import List, Literal, Union
 
-from pydantic import StrictBool, Field, validator, field_validator
+from pydantic import StrictBool, Field, validator, field_validator, ValidationInfo
 
 from together.types.abstract import BaseModel
 from together.types.common import (
@@ -176,7 +176,7 @@ class FinetuneRequest(BaseModel):
     # training learning rate
     learning_rate: float
     # learning rate scheduler type and args
-    lr_scheduler: FinetuneLRScheduler | None = None
+    lr_scheduler: FinetuneLinearLRScheduler | FinetuneCosineLRScheduler | None = None
     # learning rate warmup ratio
     warmup_ratio: float
     # max gradient norm
@@ -239,7 +239,7 @@ class FinetuneResponse(BaseModel):
     # training learning rate
     learning_rate: float | None = None
     # learning rate scheduler type and args
-    lr_scheduler: FinetuneLRScheduler | None = None
+    lr_scheduler: FinetuneLinearLRScheduler | FinetuneCosineLRScheduler | None = None
     # learning rate warmup ratio
     warmup_ratio: float | None = None
     # max gradient norm
@@ -345,13 +345,27 @@ class FinetuneTrainingLimits(BaseModel):
     lora_training: FinetuneLoraTrainingLimits | None = None
 
 
+class FinetuneLinearLRSchedulerArgs(BaseModel):
+    min_lr_ratio: float | None = 0.0
+
+
+class FinetuneCosineLRSchedulerArgs(BaseModel):
+    min_lr_ratio: float | None = 0.0
+    num_cycles: float | None = 0.5
+
+
 class FinetuneLRScheduler(BaseModel):
     lr_scheduler_type: str
-    lr_scheduler_args: FinetuneLinearLRSchedulerArgs | None = None
 
 
-class FinetuneLinearLRSchedulerArgs(BaseModel):
-    min_lr_ratio: float | None = 0.0
+class FinetuneLinearLRScheduler(FinetuneLRScheduler):
+    lr_scheduler_type: Literal["linear"] = "linear"
+    lr_scheduler: FinetuneLinearLRSchedulerArgs | None = None
+
+
+class FinetuneCosineLRScheduler(FinetuneLRScheduler):
+    lr_scheduler_type: Literal["cosine"] = "cosine"
+    lr_scheduler: FinetuneCosineLRSchedulerArgs | None = None
 
 
 class FinetuneCheckpoint(BaseModel):

together-1.4.5/src/together/resources/models.py

@@ -1,75 +0,0 @@
-from __future__ import annotations
-
-from typing import List
-
-from together.abstract import api_requestor
-from together.together_response import TogetherResponse
-from together.types import (
-    ModelObject,
-    TogetherClient,
-    TogetherRequest,
-)
-
-
-class Models:
-    def __init__(self, client: TogetherClient) -> None:
-        self._client = client
-
-    def list(
-        self,
-    ) -> List[ModelObject]:
-        """
-        Method to return list of models on the API
-
-        Returns:
-            List[ModelObject]: List of model objects
-        """
-
-        requestor = api_requestor.APIRequestor(
-            client=self._client,
-        )
-
-        response, _, _ = requestor.request(
-            options=TogetherRequest(
-                method="GET",
-                url="models",
-            ),
-            stream=False,
-        )
-
-        assert isinstance(response, TogetherResponse)
-        assert isinstance(response.data, list)
-
-        return [ModelObject(**model) for model in response.data]
-
-
-class AsyncModels:
-    def __init__(self, client: TogetherClient) -> None:
-        self._client = client
-
-    async def list(
-        self,
-    ) -> List[ModelObject]:
-        """
-        Async method to return list of models on API
-
-        Returns:
-            List[ModelObject]: List of model objects
-        """
-
-        requestor = api_requestor.APIRequestor(
-            client=self._client,
-        )
-
-        response, _, _ = await requestor.arequest(
-            options=TogetherRequest(
-                method="GET",
-                url="models",
-            ),
-            stream=False,
-        )
-
-        assert isinstance(response, TogetherResponse)
-        assert isinstance(response.data, list)
-
-        return [ModelObject(**model) for model in response.data]