together 2.0.0a17__py3-none-any.whl → 2.0.0a19__py3-none-any.whl

together/lib/cli/api/endpoints/hardware.py

@@ -1,10 +1,14 @@
 from __future__ import annotations
 
+import re
 import json as json_lib
+from typing import Any, Dict, List
 
 import click
+from tabulate import tabulate
 
 from together import Together, omit
+from together.types import EndpointListHardwareResponse
 from together.lib.cli.api._utils import handle_api_errors
 from together.lib.utils.serializer import datetime_serializer
 
@@ -21,20 +25,47 @@ from together.lib.utils.serializer import datetime_serializer
 @handle_api_errors("Endpoints")
 def hardware(client: Together, model: str | None, json: bool, available: bool) -> None:
     """List all available hardware options, optionally filtered by model."""
-    message = "Available hardware options:" if available else "All hardware options:"
-    click.echo(message, err=True)
-    hardware_options = client.hardware.list(model=model or omit)
-    # hardware_options = client.endpoints.list_hardware(model)
+    hardware_options = client.endpoints.list_hardware(model=model or omit)
+
     if available:
         hardware_options.data = [
             hardware
             for hardware in hardware_options.data
             if hardware.availability is not None and hardware.availability.status == "available"
         ]
-
     if json:
         json_output = [hardware.model_dump() for hardware in hardware_options.data]
         click.echo(json_lib.dumps(json_output, default=datetime_serializer, indent=2))
     else:
-        for hardware in hardware_options.data:
-            click.echo(f"  {hardware.id}", err=True)
+        _format_hardware_options(hardware_options, show_availability=model is not None)
+
+
+def _format_hardware_options(hardware_options: EndpointListHardwareResponse, show_availability: bool = True) -> None:
+    display_list: List[Dict[str, Any]] = []
+
+    for hw in hardware_options.data:
+        data = {
+            "Hardware ID": hw.id,
+            "GPU": re.sub(r"\-\d+[a-zA-Z][a-zA-Z]$", "", hw.specs.gpu_type)
+            if hw.specs and hw.specs.gpu_type
+            else "N/A",
+            "Memory": f"{int(hw.specs.gpu_memory)}GB" if hw.specs else "N/A",
+            "Count": hw.specs.gpu_count if hw.specs else "N/A",
+            "Price (per minute)": (f"${hw.pricing.cents_per_minute / 100:.2f}" if hw.pricing else "N/A"),
+        }
+
+        if show_availability:
+            status_display = "—"
+            if hw.availability:
+                status = hw.availability.status
+                # Add visual indicators for status
+                if status == "available":
+                    status_display = click.style("✓ available", fg="green")
+                elif status == "unavailable":
+                    status_display = click.style("✗ unavailable", fg="red")
+                else:  # insufficient
+                    status_display = click.style("⚠ insufficient", fg="yellow")
+                data["availability"] = status_display
+        display_list.append(data)
+
+    click.echo(tabulate(display_list, headers="keys", numalign="left"))

together/lib/cli/api/models/upload.py

@@ -3,7 +3,7 @@ from typing import Literal, Optional
 
 import click
 
-from together import Together, omit
+from together import Together, TogetherError, omit
 from together._response import APIResponse as APIResponse
 from together.lib.cli.api._utils import handle_api_errors
 from together.types.model_upload_response import ModelUploadResponse
@@ -76,6 +76,10 @@ def upload(
     if json:
         click.echo(json_lib.dumps(response.model_dump(), indent=2))
     else:
+        # If the model weights already exist, the api is returning 200 but with no data
+        if response.data is None:  # type: ignore
+            raise TogetherError(response.message)
+
         click.echo(f"Model upload job created successfully!")
         if response.data.job_id:
             click.echo(f"Job ID: {response.data.job_id}")

together/resources/__init__.py

@@ -16,14 +16,6 @@ from .chat import (
     ChatResourceWithStreamingResponse,
     AsyncChatResourceWithStreamingResponse,
 )
-from .jobs import (
-    JobsResource,
-    AsyncJobsResource,
-    JobsResourceWithRawResponse,
-    AsyncJobsResourceWithRawResponse,
-    JobsResourceWithStreamingResponse,
-    AsyncJobsResourceWithStreamingResponse,
-)
 from .audio import (
     AudioResource,
     AsyncAudioResource,
@@ -88,14 +80,6 @@ from .batches import (
     BatchesResourceWithStreamingResponse,
     AsyncBatchesResourceWithStreamingResponse,
 )
-from .hardware import (
-    HardwareResource,
-    AsyncHardwareResource,
-    HardwareResourceWithRawResponse,
-    AsyncHardwareResourceWithRawResponse,
-    HardwareResourceWithStreamingResponse,
-    AsyncHardwareResourceWithStreamingResponse,
-)
 from .endpoints import (
     EndpointsResource,
     AsyncEndpointsResource,
@@ -204,24 +188,12 @@ __all__ = [
     "AsyncModelsResourceWithRawResponse",
     "ModelsResourceWithStreamingResponse",
     "AsyncModelsResourceWithStreamingResponse",
-    "JobsResource",
-    "AsyncJobsResource",
-    "JobsResourceWithRawResponse",
-    "AsyncJobsResourceWithRawResponse",
-    "JobsResourceWithStreamingResponse",
-    "AsyncJobsResourceWithStreamingResponse",
     "EndpointsResource",
     "AsyncEndpointsResource",
     "EndpointsResourceWithRawResponse",
     "AsyncEndpointsResourceWithRawResponse",
     "EndpointsResourceWithStreamingResponse",
     "AsyncEndpointsResourceWithStreamingResponse",
-    "HardwareResource",
-    "AsyncHardwareResource",
-    "HardwareResourceWithRawResponse",
-    "AsyncHardwareResourceWithRawResponse",
-    "HardwareResourceWithStreamingResponse",
-    "AsyncHardwareResourceWithStreamingResponse",
     "RerankResource",
     "AsyncRerankResource",
     "RerankResourceWithRawResponse",

together/resources/beta/__init__.py

@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .jig import (
+    JigResource,
+    AsyncJigResource,
+    JigResourceWithRawResponse,
+    AsyncJigResourceWithRawResponse,
+    JigResourceWithStreamingResponse,
+    AsyncJigResourceWithStreamingResponse,
+)
 from .beta import (
     BetaResource,
     AsyncBetaResource,
@@ -18,6 +26,12 @@ from .clusters import (
 )
 
 __all__ = [
+    "JigResource",
+    "AsyncJigResource",
+    "JigResourceWithRawResponse",
+    "AsyncJigResourceWithRawResponse",
+    "JigResourceWithStreamingResponse",
+    "AsyncJigResourceWithStreamingResponse",
     "ClustersResource",
     "AsyncClustersResource",
     "ClustersResourceWithRawResponse",

together/resources/beta/beta.py

@@ -2,6 +2,14 @@
 
 from __future__ import annotations
 
+from .jig.jig import (
+    JigResource,
+    AsyncJigResource,
+    JigResourceWithRawResponse,
+    AsyncJigResourceWithRawResponse,
+    JigResourceWithStreamingResponse,
+    AsyncJigResourceWithStreamingResponse,
+)
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from .clusters.clusters import (
@@ -17,6 +25,10 @@ __all__ = ["BetaResource", "AsyncBetaResource"]
 
 
 class BetaResource(SyncAPIResource):
+    @cached_property
+    def jig(self) -> JigResource:
+        return JigResource(self._client)
+
     @cached_property
     def clusters(self) -> ClustersResource:
         return ClustersResource(self._client)
@@ -42,6 +54,10 @@ class BetaResource(SyncAPIResource):
 
 
 class AsyncBetaResource(AsyncAPIResource):
+    @cached_property
+    def jig(self) -> AsyncJigResource:
+        return AsyncJigResource(self._client)
+
     @cached_property
     def clusters(self) -> AsyncClustersResource:
         return AsyncClustersResource(self._client)
@@ -70,6 +86,10 @@ class BetaResourceWithRawResponse:
     def __init__(self, beta: BetaResource) -> None:
         self._beta = beta
 
+    @cached_property
+    def jig(self) -> JigResourceWithRawResponse:
+        return JigResourceWithRawResponse(self._beta.jig)
+
     @cached_property
     def clusters(self) -> ClustersResourceWithRawResponse:
         return ClustersResourceWithRawResponse(self._beta.clusters)
@@ -79,6 +99,10 @@ class AsyncBetaResourceWithRawResponse:
     def __init__(self, beta: AsyncBetaResource) -> None:
         self._beta = beta
 
+    @cached_property
+    def jig(self) -> AsyncJigResourceWithRawResponse:
+        return AsyncJigResourceWithRawResponse(self._beta.jig)
+
     @cached_property
     def clusters(self) -> AsyncClustersResourceWithRawResponse:
         return AsyncClustersResourceWithRawResponse(self._beta.clusters)
@@ -88,6 +112,10 @@ class BetaResourceWithStreamingResponse:
     def __init__(self, beta: BetaResource) -> None:
         self._beta = beta
 
+    @cached_property
+    def jig(self) -> JigResourceWithStreamingResponse:
+        return JigResourceWithStreamingResponse(self._beta.jig)
+
     @cached_property
     def clusters(self) -> ClustersResourceWithStreamingResponse:
         return ClustersResourceWithStreamingResponse(self._beta.clusters)
@@ -97,6 +125,10 @@ class AsyncBetaResourceWithStreamingResponse:
     def __init__(self, beta: AsyncBetaResource) -> None:
         self._beta = beta
 
+    @cached_property
+    def jig(self) -> AsyncJigResourceWithStreamingResponse:
+        return AsyncJigResourceWithStreamingResponse(self._beta.jig)
+
     @cached_property
     def clusters(self) -> AsyncClustersResourceWithStreamingResponse:
         return AsyncClustersResourceWithStreamingResponse(self._beta.clusters)

together/resources/beta/clusters/clusters.py

@@ -110,7 +110,7 @@ class ClustersResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._post(
-            "/clusters",
+            "/compute/clusters",
             body=maybe_transform(
                 {
                     "billing_type": billing_type,
@@ -158,7 +158,7 @@ class ClustersResource(SyncAPIResource):
         if not cluster_id:
             raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}")
         return self._get(
-            f"/clusters/{cluster_id}",
+            f"/compute/clusters/{cluster_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -193,7 +193,7 @@ class ClustersResource(SyncAPIResource):
         if not cluster_id:
             raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}")
         return self._put(
-            f"/clusters/{cluster_id}",
+            f"/compute/clusters/{cluster_id}",
             body=maybe_transform(
                 {
                     "cluster_type": cluster_type,
@@ -219,7 +219,7 @@ class ClustersResource(SyncAPIResource):
     ) -> ClusterListResponse:
         """List all GPU clusters."""
         return self._get(
-            "/clusters",
+            "/compute/clusters",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -252,7 +252,7 @@ class ClustersResource(SyncAPIResource):
         if not cluster_id:
             raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}")
         return self._delete(
-            f"/clusters/{cluster_id}",
+            f"/compute/clusters/{cluster_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -271,7 +271,7 @@ class ClustersResource(SyncAPIResource):
     ) -> ClusterListRegionsResponse:
         """List regions and corresponding supported driver versions"""
         return self._get(
-            "/clusters/regions",
+            "/compute/regions",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -355,7 +355,7 @@ class AsyncClustersResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._post(
-            "/clusters",
+            "/compute/clusters",
             body=await async_maybe_transform(
                 {
                     "billing_type": billing_type,
@@ -403,7 +403,7 @@ class AsyncClustersResource(AsyncAPIResource):
         if not cluster_id:
             raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}")
         return await self._get(
-            f"/clusters/{cluster_id}",
+            f"/compute/clusters/{cluster_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -438,7 +438,7 @@ class AsyncClustersResource(AsyncAPIResource):
         if not cluster_id:
             raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}")
         return await self._put(
-            f"/clusters/{cluster_id}",
+            f"/compute/clusters/{cluster_id}",
             body=await async_maybe_transform(
                 {
                     "cluster_type": cluster_type,
@@ -464,7 +464,7 @@ class AsyncClustersResource(AsyncAPIResource):
     ) -> ClusterListResponse:
         """List all GPU clusters."""
         return await self._get(
-            "/clusters",
+            "/compute/clusters",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -497,7 +497,7 @@ class AsyncClustersResource(AsyncAPIResource):
         if not cluster_id:
             raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}")
         return await self._delete(
-            f"/clusters/{cluster_id}",
+            f"/compute/clusters/{cluster_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -516,7 +516,7 @@ class AsyncClustersResource(AsyncAPIResource):
     ) -> ClusterListRegionsResponse:
         """List regions and corresponding supported driver versions"""
         return await self._get(
-            "/clusters/regions",
+            "/compute/regions",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),

together/resources/beta/clusters/storage.py

@@ -77,7 +77,7 @@ class StorageResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._post(
-            "/clusters/storages",
+            "/compute/clusters/storage/volumes",
             body=maybe_transform(
                 {
                     "region": region,
@@ -118,7 +118,7 @@ class StorageResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._get(
-            f"/clusters/storages/{volume_id}",
+            f"/compute/clusters/storage/volumes/{volume_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -150,7 +150,7 @@ class StorageResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._put(
-            "/clusters/storages",
+            "/compute/clusters/storage/volumes",
             body=maybe_transform(
                 {
                     "size_tib": size_tib,
@@ -176,7 +176,7 @@ class StorageResource(SyncAPIResource):
     ) -> StorageListResponse:
         """List all shared volumes."""
         return self._get(
-            "/clusters/storages",
+            "/compute/clusters/storage/volumes",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -211,7 +211,7 @@ class StorageResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._delete(
-            f"/clusters/storages/{volume_id}",
+            f"/compute/clusters/storage/volumes/{volume_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -273,7 +273,7 @@ class AsyncStorageResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._post(
-            "/clusters/storages",
+            "/compute/clusters/storage/volumes",
             body=await async_maybe_transform(
                 {
                     "region": region,
@@ -314,7 +314,7 @@ class AsyncStorageResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._get(
-            f"/clusters/storages/{volume_id}",
+            f"/compute/clusters/storage/volumes/{volume_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -346,7 +346,7 @@ class AsyncStorageResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._put(
-            "/clusters/storages",
+            "/compute/clusters/storage/volumes",
             body=await async_maybe_transform(
                 {
                     "size_tib": size_tib,
@@ -372,7 +372,7 @@ class AsyncStorageResource(AsyncAPIResource):
     ) -> StorageListResponse:
         """List all shared volumes."""
         return await self._get(
-            "/clusters/storages",
+            "/compute/clusters/storage/volumes",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -407,7 +407,7 @@ class AsyncStorageResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._delete(
-            f"/clusters/storages/{volume_id}",
+            f"/compute/clusters/storage/volumes/{volume_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),

together/resources/beta/jig/__init__.py

@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .jig import (
+    JigResource,
+    AsyncJigResource,
+    JigResourceWithRawResponse,
+    AsyncJigResourceWithRawResponse,
+    JigResourceWithStreamingResponse,
+    AsyncJigResourceWithStreamingResponse,
+)
+from .queue import (
+    QueueResource,
+    AsyncQueueResource,
+    QueueResourceWithRawResponse,
+    AsyncQueueResourceWithRawResponse,
+    QueueResourceWithStreamingResponse,
+    AsyncQueueResourceWithStreamingResponse,
+)
+from .secrets import (
+    SecretsResource,
+    AsyncSecretsResource,
+    SecretsResourceWithRawResponse,
+    AsyncSecretsResourceWithRawResponse,
+    SecretsResourceWithStreamingResponse,
+    AsyncSecretsResourceWithStreamingResponse,
+)
+from .volumes import (
+    VolumesResource,
+    AsyncVolumesResource,
+    VolumesResourceWithRawResponse,
+    AsyncVolumesResourceWithRawResponse,
+    VolumesResourceWithStreamingResponse,
+    AsyncVolumesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "QueueResource",
+    "AsyncQueueResource",
+    "QueueResourceWithRawResponse",
+    "AsyncQueueResourceWithRawResponse",
+    "QueueResourceWithStreamingResponse",
+    "AsyncQueueResourceWithStreamingResponse",
+    "VolumesResource",
+    "AsyncVolumesResource",
+    "VolumesResourceWithRawResponse",
+    "AsyncVolumesResourceWithRawResponse",
+    "VolumesResourceWithStreamingResponse",
+    "AsyncVolumesResourceWithStreamingResponse",
+    "SecretsResource",
+    "AsyncSecretsResource",
+    "SecretsResourceWithRawResponse",
+    "AsyncSecretsResourceWithRawResponse",
+    "SecretsResourceWithStreamingResponse",
+    "AsyncSecretsResourceWithStreamingResponse",
+    "JigResource",
+    "AsyncJigResource",
+    "JigResourceWithRawResponse",
+    "AsyncJigResourceWithRawResponse",
+    "JigResourceWithStreamingResponse",
+    "AsyncJigResourceWithStreamingResponse",
+]