feat: internal: Update to new cluster api routing

Author: stainless-app[bot]

.stats.yml

@@ -1,4 +1,4 @@
 configured_endpoints: 75
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/togetherai%2Ftogetherai-f8e1988cea25f47a95ca7cf1722347162933046c684b4c1e5b346de4e24f27a0.yml
-openapi_spec_hash: c988b1ccf857555dad9aaca26fc0e5a3
-config_hash: 194c832976406fd1bf4a7d5f646a7ca0
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/togetherai%2Ftogetherai-8a76fff2b243efa52f6d90af85d9cb313bfd927d17cb30bd5e3503a3a382a050.yml
+openapi_spec_hash: 49b0cace7ee5a8b50781bb8bc73a2258
+config_hash: 87871f68de88e698f3c0c7ed6047d132

api.md

@@ -18,6 +18,22 @@ Methods:
 - <code title="delete /deployments/{id}">client.beta.jig.<a href="./src/resources/beta/jig/jig.ts">destroy</a>(id) -> unknown</code>
 - <code title="get /deployments/{id}/logs">client.beta.jig.<a href="./src/resources/beta/jig/jig.ts">retrieveLogs</a>(id, { ...params }) -> DeploymentLogs</code>
 
+### Queue
+
+Types:
+
+- <code><a href="./src/resources/beta/jig/queue.ts">QueueRetrieveResponse</a></code>
+- <code><a href="./src/resources/beta/jig/queue.ts">QueueCancelResponse</a></code>
+- <code><a href="./src/resources/beta/jig/queue.ts">QueueMetricsResponse</a></code>
+- <code><a href="./src/resources/beta/jig/queue.ts">QueueSubmitResponse</a></code>
+
+Methods:
+
+- <code title="get /queue/status">client.beta.jig.queue.<a href="./src/resources/beta/jig/queue.ts">retrieve</a>({ ...params }) -> QueueRetrieveResponse</code>
+- <code title="post /queue/cancel">client.beta.jig.queue.<a href="./src/resources/beta/jig/queue.ts">cancel</a>({ ...params }) -> QueueCancelResponse</code>
+- <code title="get /queue/metrics">client.beta.jig.queue.<a href="./src/resources/beta/jig/queue.ts">metrics</a>({ ...params }) -> QueueMetricsResponse</code>
+- <code title="post /queue/submit">client.beta.jig.queue.<a href="./src/resources/beta/jig/queue.ts">submit</a>({ ...params }) -> QueueSubmitResponse</code>
+
 ### Volumes
 
 Types:
@@ -50,22 +66,6 @@ Methods:
 - <code title="get /deployments/secrets">client.beta.jig.secrets.<a href="./src/resources/beta/jig/secrets.ts">list</a>() -> SecretListResponse</code>
 - <code title="delete /deployments/secrets/{id}">client.beta.jig.secrets.<a href="./src/resources/beta/jig/secrets.ts">delete</a>(id) -> unknown</code>
 
-## Queue
-
-Types:
-
-- <code><a href="./src/resources/beta/queue.ts">QueueRetrieveResponse</a></code>
-- <code><a href="./src/resources/beta/queue.ts">QueueCancelResponse</a></code>
-- <code><a href="./src/resources/beta/queue.ts">QueueMetricsResponse</a></code>
-- <code><a href="./src/resources/beta/queue.ts">QueueSubmitResponse</a></code>
-
-Methods:
-
-- <code title="get /queue/status">client.beta.queue.<a href="./src/resources/beta/queue.ts">retrieve</a>({ ...params }) -> QueueRetrieveResponse</code>
-- <code title="post /queue/cancel">client.beta.queue.<a href="./src/resources/beta/queue.ts">cancel</a>({ ...params }) -> QueueCancelResponse</code>
-- <code title="get /queue/metrics">client.beta.queue.<a href="./src/resources/beta/queue.ts">metrics</a>({ ...params }) -> QueueMetricsResponse</code>
-- <code title="post /queue/submit">client.beta.queue.<a href="./src/resources/beta/queue.ts">submit</a>({ ...params }) -> QueueSubmitResponse</code>
-
 ## Clusters
 
 Types:
@@ -77,12 +77,12 @@ Types:
 
 Methods:
 
-- <code title="post /clusters">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">create</a>({ ...params }) -> Cluster</code>
-- <code title="get /clusters/{cluster_id}">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">retrieve</a>(clusterID) -> Cluster</code>
-- <code title="put /clusters/{cluster_id}">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">update</a>(clusterID, { ...params }) -> Cluster</code>
-- <code title="get /clusters">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">list</a>() -> ClusterListResponse</code>
-- <code title="delete /clusters/{cluster_id}">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">delete</a>(clusterID) -> ClusterDeleteResponse</code>
-- <code title="get /clusters/regions">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">listRegions</a>() -> ClusterListRegionsResponse</code>
+- <code title="post /compute/clusters">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">create</a>({ ...params }) -> Cluster</code>
+- <code title="get /compute/clusters/{cluster_id}">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">retrieve</a>(clusterID) -> Cluster</code>
+- <code title="put /compute/clusters/{cluster_id}">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">update</a>(clusterID, { ...params }) -> Cluster</code>
+- <code title="get /compute/clusters">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">list</a>() -> ClusterListResponse</code>
+- <code title="delete /compute/clusters/{cluster_id}">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">delete</a>(clusterID) -> ClusterDeleteResponse</code>
+- <code title="get /compute/regions">client.beta.clusters.<a href="./src/resources/beta/clusters/clusters.ts">listRegions</a>() -> ClusterListRegionsResponse</code>
 
 ### Storage
 
@@ -94,11 +94,11 @@ Types:
 
 Methods:
 
-- <code title="post /clusters/storages">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">create</a>({ ...params }) -> ClusterStorage</code>
-- <code title="get /clusters/storages/{volume_id}">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">retrieve</a>(volumeID) -> ClusterStorage</code>
-- <code title="put /clusters/storages">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">update</a>({ ...params }) -> ClusterStorage</code>
-- <code title="get /clusters/storages">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">list</a>() -> StorageListResponse</code>
-- <code title="delete /clusters/storages/{volume_id}">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">delete</a>(volumeID) -> StorageDeleteResponse</code>
+- <code title="post /compute/clusters/storage/volumes">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">create</a>({ ...params }) -> ClusterStorage</code>
+- <code title="get /compute/clusters/storage/volumes/{volume_id}">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">retrieve</a>(volumeID) -> ClusterStorage</code>
+- <code title="put /compute/clusters/storage/volumes">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">update</a>({ ...params }) -> ClusterStorage</code>
+- <code title="get /compute/clusters/storage/volumes">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">list</a>() -> StorageListResponse</code>
+- <code title="delete /compute/clusters/storage/volumes/{volume_id}">client.beta.clusters.storage.<a href="./src/resources/beta/clusters/storage.ts">delete</a>(volumeID) -> StorageDeleteResponse</code>
 
 # Chat
 

src/resources/beta/beta.ts

@@ -1,18 +1,6 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../core/resource';
-import * as QueueAPI from './queue';
-import {
-  Queue,
-  QueueCancelParams,
-  QueueCancelResponse,
-  QueueMetricsParams,
-  QueueMetricsResponse,
-  QueueRetrieveParams,
-  QueueRetrieveResponse,
-  QueueSubmitParams,
-  QueueSubmitResponse,
-} from './queue';
 import * as ClustersAPI from './clusters/clusters';
 import {
   Cluster,
@@ -37,12 +25,10 @@ import {
 
 export class Beta extends APIResource {
   jig: JigAPI.Jig = new JigAPI.Jig(this._client);
-  queue: QueueAPI.Queue = new QueueAPI.Queue(this._client);
   clusters: ClustersAPI.Clusters = new ClustersAPI.Clusters(this._client);
 }
 
 Beta.Jig = Jig;
-Beta.Queue = Queue;
 Beta.Clusters = Clusters;
 
 export declare namespace Beta {
@@ -57,18 +43,6 @@ export declare namespace Beta {
     type JigRetrieveLogsParams as JigRetrieveLogsParams,
   };
 
-  export {
-    Queue as Queue,
-    type QueueRetrieveResponse as QueueRetrieveResponse,
-    type QueueCancelResponse as QueueCancelResponse,
-    type QueueMetricsResponse as QueueMetricsResponse,
-    type QueueSubmitResponse as QueueSubmitResponse,
-    type QueueRetrieveParams as QueueRetrieveParams,
-    type QueueCancelParams as QueueCancelParams,
-    type QueueMetricsParams as QueueMetricsParams,
-    type QueueSubmitParams as QueueSubmitParams,
-  };
-
   export {
     Clusters as Clusters,
     type Cluster as Cluster,

src/resources/beta/clusters/clusters.ts

@@ -25,42 +25,42 @@ export class Clusters extends APIResource {
    * management.
    */
   create(body: ClusterCreateParams, options?: RequestOptions): APIPromise<Cluster> {
-    return this._client.post('/clusters', { body, ...options });
+    return this._client.post('/compute/clusters', { body, ...options });
   }
 
   /**
    * Retrieve information about a specific GPU cluster.
    */
   retrieve(clusterID: string, options?: RequestOptions): APIPromise<Cluster> {
-    return this._client.get(path`/clusters/${clusterID}`, options);
+    return this._client.get(path`/compute/clusters/${clusterID}`, options);
   }
 
   /**
    * Update the configuration of an existing GPU cluster.
    */
   update(clusterID: string, body: ClusterUpdateParams, options?: RequestOptions): APIPromise<Cluster> {
-    return this._client.put(path`/clusters/${clusterID}`, { body, ...options });
+    return this._client.put(path`/compute/clusters/${clusterID}`, { body, ...options });
   }
 
   /**
    * List all GPU clusters.
    */
   list(options?: RequestOptions): APIPromise<ClusterListResponse> {
-    return this._client.get('/clusters', options);
+    return this._client.get('/compute/clusters', options);
   }
 
   /**
    * Delete a GPU cluster by cluster ID.
    */
   delete(clusterID: string, options?: RequestOptions): APIPromise<ClusterDeleteResponse> {
-    return this._client.delete(path`/clusters/${clusterID}`, options);
+    return this._client.delete(path`/compute/clusters/${clusterID}`, options);
   }
 
   /**
    * List regions and corresponding supported driver versions
    */
   listRegions(options?: RequestOptions): APIPromise<ClusterListRegionsResponse> {
-    return this._client.get('/clusters/regions', options);
+    return this._client.get('/compute/regions', options);
   }
 }
 

src/resources/beta/clusters/storage.ts

@@ -14,36 +14,36 @@ export class Storage extends APIResource {
    * performance for shared storage.
    */
   create(body: StorageCreateParams, options?: RequestOptions): APIPromise<ClusterStorage> {
-    return this._client.post('/clusters/storages', { body, ...options });
+    return this._client.post('/compute/clusters/storage/volumes', { body, ...options });
   }
 
   /**
    * Retrieve information about a specific shared volume.
    */
   retrieve(volumeID: string, options?: RequestOptions): APIPromise<ClusterStorage> {
-    return this._client.get(path`/clusters/storages/${volumeID}`, options);
+    return this._client.get(path`/compute/clusters/storage/volumes/${volumeID}`, options);
   }
 
   /**
    * Update the configuration of an existing shared volume.
    */
   update(body: StorageUpdateParams, options?: RequestOptions): APIPromise<ClusterStorage> {
-    return this._client.put('/clusters/storages', { body, ...options });
+    return this._client.put('/compute/clusters/storage/volumes', { body, ...options });
   }
 
   /**
    * List all shared volumes.
    */
   list(options?: RequestOptions): APIPromise<StorageListResponse> {
-    return this._client.get('/clusters/storages', options);
+    return this._client.get('/compute/clusters/storage/volumes', options);
   }
 
   /**
    * Delete a shared volume. Note that if this volume is attached to a cluster,
    * deleting will fail.
    */
   delete(volumeID: string, options?: RequestOptions): APIPromise<StorageDeleteResponse> {
-    return this._client.delete(path`/clusters/storages/${volumeID}`, options);
+    return this._client.delete(path`/compute/clusters/storage/volumes/${volumeID}`, options);
   }
 }
 

src/resources/beta/index.ts

@@ -20,14 +20,3 @@ export {
   type JigDeployParams,
   type JigRetrieveLogsParams,
 } from './jig/index';
-export {
-  Queue,
-  type QueueRetrieveResponse,
-  type QueueCancelResponse,
-  type QueueMetricsResponse,
-  type QueueSubmitResponse,
-  type QueueRetrieveParams,
-  type QueueCancelParams,
-  type QueueMetricsParams,
-  type QueueSubmitParams,
-} from './queue';

src/resources/beta/jig/index.ts

@@ -10,6 +10,17 @@ export {
   type JigDeployParams,
   type JigRetrieveLogsParams,
 } from './jig';
+export {
+  Queue,
+  type QueueRetrieveResponse,
+  type QueueCancelResponse,
+  type QueueMetricsResponse,
+  type QueueSubmitResponse,
+  type QueueRetrieveParams,
+  type QueueCancelParams,
+  type QueueMetricsParams,
+  type QueueSubmitParams,
+} from './queue';
 export {
   Secrets,
   type Secret,

src/resources/beta/jig/jig.ts

@@ -1,6 +1,18 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../core/resource';
+import * as QueueAPI from './queue';
+import {
+  Queue,
+  QueueCancelParams,
+  QueueCancelResponse,
+  QueueMetricsParams,
+  QueueMetricsResponse,
+  QueueRetrieveParams,
+  QueueRetrieveResponse,
+  QueueSubmitParams,
+  QueueSubmitResponse,
+} from './queue';
 import * as SecretsAPI from './secrets';
 import {
   Secret,
@@ -24,6 +36,7 @@ import { RequestOptions } from '../../../internal/request-options';
 import { path } from '../../../internal/utils/path';
 
 export class Jig extends APIResource {
+  queue: QueueAPI.Queue = new QueueAPI.Queue(this._client);
   volumes: VolumesAPI.Volumes = new VolumesAPI.Volumes(this._client);
   secrets: SecretsAPI.Secrets = new SecretsAPI.Secrets(this._client);
 
@@ -698,6 +711,7 @@ export interface JigRetrieveLogsParams {
   replica_id?: string;
 }
 
+Jig.Queue = Queue;
 Jig.Volumes = Volumes;
 Jig.Secrets = Secrets;
 
@@ -712,6 +726,18 @@ export declare namespace Jig {
     type JigRetrieveLogsParams as JigRetrieveLogsParams,
   };
 
+  export {
+    Queue as Queue,
+    type QueueRetrieveResponse as QueueRetrieveResponse,
+    type QueueCancelResponse as QueueCancelResponse,
+    type QueueMetricsResponse as QueueMetricsResponse,
+    type QueueSubmitResponse as QueueSubmitResponse,
+    type QueueRetrieveParams as QueueRetrieveParams,
+    type QueueCancelParams as QueueCancelParams,
+    type QueueMetricsParams as QueueMetricsParams,
+    type QueueSubmitParams as QueueSubmitParams,
+  };
+
   export {
     Volumes as Volumes,
     type VolumesAPIVolume as Volume,

src/resources/beta/queue.ts src/resources/beta/jig/queue.tssrc/resources/beta/queue.ts renamed to src/resources/beta/jig/queue.ts

@@ -1,8 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../core/resource';
-import { APIPromise } from '../../core/api-promise';
-import { RequestOptions } from '../../internal/request-options';
+import { APIResource } from '../../../core/resource';
+import { APIPromise } from '../../../core/api-promise';
+import { RequestOptions } from '../../../internal/request-options';
 
 export class Queue extends APIResource {
   /**

tests/api-resources/beta/queue.test.ts …sts/api-resources/beta/jig/queue.test.tstests/api-resources/beta/queue.test.ts renamed to tests/api-resources/beta/jig/queue.test.ts tests/api-resources/beta/queue.test.ts renamed to tests/api-resources/beta/jig/queue.test.ts

@@ -9,7 +9,7 @@ const client = new Together({
 
 describe('resource queue', () => {
   test('retrieve: only required params', async () => {
-    const responsePromise = client.beta.queue.retrieve({ model: 'model', request_id: 'request_id' });
+    const responsePromise = client.beta.jig.queue.retrieve({ model: 'model', request_id: 'request_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -20,11 +20,11 @@ describe('resource queue', () => {
   });
 
   test('retrieve: required and optional params', async () => {
-    const response = await client.beta.queue.retrieve({ model: 'model', request_id: 'request_id' });
+    const response = await client.beta.jig.queue.retrieve({ model: 'model', request_id: 'request_id' });
   });
 
   test('cancel: only required params', async () => {
-    const responsePromise = client.beta.queue.cancel({ model: 'model', request_id: 'request_id' });
+    const responsePromise = client.beta.jig.queue.cancel({ model: 'model', request_id: 'request_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -35,11 +35,11 @@ describe('resource queue', () => {
   });
 
   test('cancel: required and optional params', async () => {
-    const response = await client.beta.queue.cancel({ model: 'model', request_id: 'request_id' });
+    const response = await client.beta.jig.queue.cancel({ model: 'model', request_id: 'request_id' });
   });
 
   test('metrics: only required params', async () => {
-    const responsePromise = client.beta.queue.metrics({ model: 'model' });
+    const responsePromise = client.beta.jig.queue.metrics({ model: 'model' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -50,11 +50,11 @@ describe('resource queue', () => {
   });
 
   test('metrics: required and optional params', async () => {
-    const response = await client.beta.queue.metrics({ model: 'model' });
+    const response = await client.beta.jig.queue.metrics({ model: 'model' });
   });
 
   test('submit: only required params', async () => {
-    const responsePromise = client.beta.queue.submit({
+    const responsePromise = client.beta.jig.queue.submit({
       model: 'model',
       payload: { foo: 'bar' },
     });
@@ -68,7 +68,7 @@ describe('resource queue', () => {
   });
 
   test('submit: required and optional params', async () => {
-    const response = await client.beta.queue.submit({
+    const response = await client.beta.jig.queue.submit({
       model: 'model',
       payload: { foo: 'bar' },
       info: { foo: 'bar' },