together 2.0.0a13__py3-none-any.whl → 2.0.0a15__py3-none-any.whl

together/lib/cli/api/utils.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
 
 import re
+import sys
 import math
-from typing import List, Union, Literal
+from typing import Any, List, Union, Literal, TypeVar, Callable
 from gettext import gettext as _
 from datetime import datetime
+from functools import wraps
 
 import click
 
+from together import APIError
 from together.lib.types.fine_tuning import COMPLETED_STATUSES, FinetuneResponse
 from together.types.finetune_response import FinetuneResponse as _FinetuneResponse
 from together.types.fine_tuning_list_response import Data
@@ -101,11 +104,11 @@ def generate_progress_bar(
     progress = "Progress: [bold red]unavailable[/bold red]"
     if finetune_job.status in COMPLETED_STATUSES:
         progress = "Progress: [bold green]completed[/bold green]"
-    elif finetune_job.updated_at is not None:
-        update_at = finetune_job.updated_at.astimezone()
+    elif getattr(finetune_job, "started_at", None) is not None and isinstance(finetune_job.started_at, datetime):
+        started_at = finetune_job.started_at.astimezone()
 
         if finetune_job.progress is not None:
-            if current_time < update_at:
+            if current_time < started_at:
                 return progress
 
             if not finetune_job.progress.estimate_available:
@@ -114,7 +117,7 @@ def generate_progress_bar(
             if finetune_job.progress.seconds_remaining <= 0:
                 return progress
 
-            elapsed_time = (current_time - update_at).total_seconds()
+            elapsed_time = (current_time - started_at).total_seconds()
             ratio_filled = min(elapsed_time / finetune_job.progress.seconds_remaining, 1.0)
             percentage = ratio_filled * 100
             filled = math.ceil(ratio_filled * _PROGRESS_BAR_WIDTH)
@@ -129,3 +132,36 @@ def generate_progress_bar(
         return progress
 
     return re.sub(r"\[/?[^\]]+\]", "", progress)
+
+
+F = TypeVar("F", bound=Callable[..., Any])
+
+
+def handle_api_errors(prefix: str) -> Callable[[F], F]:
+    """Decorator to handle common API errors in CLI commands."""
+
+    prefix_styled = click.style(f"{prefix}: ", fg="blue")
+
+    def decorator(f: F) -> F:
+        @wraps(f)
+        def wrapper(*args: Any, **kwargs: Any) -> Any:
+            try:
+                return f(*args, **kwargs)
+            # User aborted the command
+            except click.Abort:
+                sys.exit(0)
+            except APIError as e:
+                click.echo(prefix_styled + click.style("Failed", fg="red"))
+                if e.body is not None:
+                    click.echo(prefix_styled + click.style(getattr(e.body, "message", str(e.body)), fg="red"))
+                else:
+                    click.echo(prefix_styled + click.style(str(e), fg="red"))
+                sys.exit(1)
+            except Exception as e:
+                click.echo(prefix_styled + click.style("Failed", fg="red"))
+                click.echo(prefix_styled + click.style(f"An unexpected error occurred - {str(e)}", fg="red"))
+                sys.exit(1)
+
+        return wrapper  # type: ignore
+
+    return decorator  # type: ignore

together/lib/cli/cli.py

@@ -11,6 +11,7 @@ from together._constants import DEFAULT_TIMEOUT
 from together.lib.cli.api.evals import evals
 from together.lib.cli.api.files import files
 from together.lib.cli.api.models import models
+from together.lib.cli.api.beta.beta import beta
 from together.lib.cli.api.endpoints import endpoints
 from together.lib.cli.api.fine_tuning import fine_tuning
 
@@ -66,6 +67,7 @@ main.add_command(fine_tuning)
 main.add_command(models)
 main.add_command(endpoints)
 main.add_command(evals)
+main.add_command(beta)
 
 if __name__ == "__main__":
     main()

together/lib/types/fine_tuning.py

@@ -305,6 +305,9 @@ class FinetuneResponse(BaseModel):
     updated_at: datetime
     """Last update timestamp of the fine-tune job"""
 
+    started_at: Optional[datetime] = None
+    """Start timestamp of a current stage of the fine-tune job"""
+
     batch_size: Optional[int] = None
     """Batch size used for training"""
 

together/resources/__init__.py

@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .beta import (
+    BetaResource,
+    AsyncBetaResource,
+    BetaResourceWithRawResponse,
+    AsyncBetaResourceWithRawResponse,
+    BetaResourceWithStreamingResponse,
+    AsyncBetaResourceWithStreamingResponse,
+)
 from .chat import (
     ChatResource,
     AsyncChatResource,
@@ -130,6 +138,12 @@ from .code_interpreter import (
 )
 
 __all__ = [
+    "BetaResource",
+    "AsyncBetaResource",
+    "BetaResourceWithRawResponse",
+    "AsyncBetaResourceWithRawResponse",
+    "BetaResourceWithStreamingResponse",
+    "AsyncBetaResourceWithStreamingResponse",
     "ChatResource",
     "AsyncChatResource",
     "ChatResourceWithRawResponse",

together/resources/beta/__init__.py

@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .beta import (
+    BetaResource,
+    AsyncBetaResource,
+    BetaResourceWithRawResponse,
+    AsyncBetaResourceWithRawResponse,
+    BetaResourceWithStreamingResponse,
+    AsyncBetaResourceWithStreamingResponse,
+)
+from .clusters import (
+    ClustersResource,
+    AsyncClustersResource,
+    ClustersResourceWithRawResponse,
+    AsyncClustersResourceWithRawResponse,
+    ClustersResourceWithStreamingResponse,
+    AsyncClustersResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ClustersResource",
+    "AsyncClustersResource",
+    "ClustersResourceWithRawResponse",
+    "AsyncClustersResourceWithRawResponse",
+    "ClustersResourceWithStreamingResponse",
+    "AsyncClustersResourceWithStreamingResponse",
+    "BetaResource",
+    "AsyncBetaResource",
+    "BetaResourceWithRawResponse",
+    "AsyncBetaResourceWithRawResponse",
+    "BetaResourceWithStreamingResponse",
+    "AsyncBetaResourceWithStreamingResponse",
+]

together/resources/beta/beta.py

@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .clusters.clusters import (
+    ClustersResource,
+    AsyncClustersResource,
+    ClustersResourceWithRawResponse,
+    AsyncClustersResourceWithRawResponse,
+    ClustersResourceWithStreamingResponse,
+    AsyncClustersResourceWithStreamingResponse,
+)
+
+__all__ = ["BetaResource", "AsyncBetaResource"]
+
+
+class BetaResource(SyncAPIResource):
+    @cached_property
+    def clusters(self) -> ClustersResource:
+        return ClustersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> BetaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/togethercomputer/together-py#accessing-raw-response-data-eg-headers
+        """
+        return BetaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BetaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/togethercomputer/together-py#with_streaming_response
+        """
+        return BetaResourceWithStreamingResponse(self)
+
+
+class AsyncBetaResource(AsyncAPIResource):
+    @cached_property
+    def clusters(self) -> AsyncClustersResource:
+        return AsyncClustersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncBetaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/togethercomputer/together-py#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBetaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBetaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/togethercomputer/together-py#with_streaming_response
+        """
+        return AsyncBetaResourceWithStreamingResponse(self)
+
+
+class BetaResourceWithRawResponse:
+    def __init__(self, beta: BetaResource) -> None:
+        self._beta = beta
+
+    @cached_property
+    def clusters(self) -> ClustersResourceWithRawResponse:
+        return ClustersResourceWithRawResponse(self._beta.clusters)
+
+
+class AsyncBetaResourceWithRawResponse:
+    def __init__(self, beta: AsyncBetaResource) -> None:
+        self._beta = beta
+
+    @cached_property
+    def clusters(self) -> AsyncClustersResourceWithRawResponse:
+        return AsyncClustersResourceWithRawResponse(self._beta.clusters)
+
+
+class BetaResourceWithStreamingResponse:
+    def __init__(self, beta: BetaResource) -> None:
+        self._beta = beta
+
+    @cached_property
+    def clusters(self) -> ClustersResourceWithStreamingResponse:
+        return ClustersResourceWithStreamingResponse(self._beta.clusters)
+
+
+class AsyncBetaResourceWithStreamingResponse:
+    def __init__(self, beta: AsyncBetaResource) -> None:
+        self._beta = beta
+
+    @cached_property
+    def clusters(self) -> AsyncClustersResourceWithStreamingResponse:
+        return AsyncClustersResourceWithStreamingResponse(self._beta.clusters)

together/resources/beta/clusters/__init__.py

@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .storage import (
+    StorageResource,
+    AsyncStorageResource,
+    StorageResourceWithRawResponse,
+    AsyncStorageResourceWithRawResponse,
+    StorageResourceWithStreamingResponse,
+    AsyncStorageResourceWithStreamingResponse,
+)
+from .clusters import (
+    ClustersResource,
+    AsyncClustersResource,
+    ClustersResourceWithRawResponse,
+    AsyncClustersResourceWithRawResponse,
+    ClustersResourceWithStreamingResponse,
+    AsyncClustersResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "StorageResource",
+    "AsyncStorageResource",
+    "StorageResourceWithRawResponse",
+    "AsyncStorageResourceWithRawResponse",
+    "StorageResourceWithStreamingResponse",
+    "AsyncStorageResourceWithStreamingResponse",
+    "ClustersResource",
+    "AsyncClustersResource",
+    "ClustersResourceWithRawResponse",
+    "AsyncClustersResourceWithRawResponse",
+    "ClustersResourceWithStreamingResponse",
+    "AsyncClustersResourceWithStreamingResponse",
+]