Skip to content

Commit

Permalink
feat(api): manual updates (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
stainless-app[bot] authored and stainless-bot committed May 24, 2024
1 parent a49c999 commit 3ce9a74
Show file tree
Hide file tree
Showing 31 changed files with 83 additions and 83 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ cd together-typescript
# With yarn
yarn link
cd ../my-package
yarn link together
yarn link together-ai

# With pnpm
pnpm link --global
cd ../my-package
pnpm link -—global together
pnpm link -—global together-ai
```

## Running tests
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Together Node API Library

[![NPM version](https://img.shields.io/npm/v/together.svg)](https://npmjs.org/package/together)
[![NPM version](https://img.shields.io/npm/v/together-ai.svg)](https://npmjs.org/package/together-ai)

This library provides convenient access to the Together REST API from server-side TypeScript or JavaScript.

Expand All @@ -11,7 +11,7 @@ It is generated with [Stainless](https://www.stainlessapi.com/).
## Installation

```sh
npm install together
npm install together-ai
```

## Usage
Expand All @@ -20,7 +20,7 @@ The full API of this library can be found in [api.md](api.md).

<!-- prettier-ignore -->
```js
import Together from 'together';
import Together from 'together-ai';

const together = new Together({
accessToken: process.env['TOGETHER_API_KEY'], // This is the default and can be omitted
Expand All @@ -43,7 +43,7 @@ main();
We provide support for streaming responses using Server Sent Events (SSE).

```ts
import Together from 'together';
import Together from 'together-ai';

const together = new Together();

Expand All @@ -66,7 +66,7 @@ This library includes TypeScript definitions for all request params and response

<!-- prettier-ignore -->
```ts
import Together from 'together';
import Together from 'together-ai';

const together = new Together({
accessToken: process.env['TOGETHER_API_KEY'], // This is the default and can be omitted
Expand Down Expand Up @@ -254,11 +254,11 @@ add the following import before your first import `from "Together"`:
```ts
// Tell TypeScript and the package to use the global web fetch instead of node-fetch.
// Note, despite the name, this does not add any polyfills, but expects them to be provided if needed.
import 'together/shims/web';
import Together from 'together';
import 'together-ai/shims/web';
import Together from 'together-ai';
```

To do the inverse, add `import "together/shims/node"` (which does import polyfills).
To do the inverse, add `import "together-ai/shims/node"` (which does import polyfills).
This can also be useful if you are getting the wrong TypeScript types for `Response` ([more details](https://github.com/togethercomputer/together-typescript/tree/main/src/_shims#readme)).

### Logging and middleware
Expand All @@ -268,7 +268,7 @@ which can be used to inspect or alter the `Request` or `Response` before/after e

```ts
import { fetch } from 'undici'; // as one example
import Together from 'together';
import Together from 'together-ai';

const client = new Together({
fetch: async (url: RequestInfo, init?: RequestInit): Promise<Response> => {
Expand Down Expand Up @@ -330,7 +330,7 @@ TypeScript >= 4.5 is supported.
The following runtimes are supported:

- Node.js 18 LTS or later ([non-EOL](https://endoflife.date/nodejs)) versions.
- Deno v1.28.0 or higher, using `import Together from "npm:together"`.
- Deno v1.28.0 or higher, using `import Together from "npm:together-ai"`.
- Bun 1.0 or later.
- Cloudflare Workers.
- Vercel Edge Runtime.
Expand Down
6 changes: 3 additions & 3 deletions jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const config: JestConfigWithTsJest = {
'^.+\\.(t|j)sx?$': ['@swc/jest', { sourceMaps: 'inline' }],
},
moduleNameMapper: {
'^together$': '<rootDir>/src/index.ts',
'^together/_shims/auto/(.*)$': '<rootDir>/src/_shims/auto/$1-node',
'^together/(.*)$': '<rootDir>/src/$1',
'^together-ai$': '<rootDir>/src/index.ts',
'^together-ai/_shims/auto/(.*)$': '<rootDir>/src/_shims/auto/$1-node',
'^together-ai/(.*)$': '<rootDir>/src/$1',
},
modulePathIgnorePatterns: [
'<rootDir>/ecosystem-tests/',
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "together",
"name": "together-ai",
"version": "0.1.0-alpha.1",
"description": "The official TypeScript library for the Together API",
"author": "Together <[email protected]>",
Expand Down Expand Up @@ -61,8 +61,8 @@
"./shims/web.mjs"
],
"imports": {
"together": ".",
"together/*": "./src/*"
"together-ai": ".",
"together-ai/*": "./src/*"
},
"exports": {
"./_shims/auto/*": {
Expand Down
6 changes: 3 additions & 3 deletions scripts/build
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ node scripts/utils/check-version.cjs

# Build into dist and will publish the package from there,
# so that src/resources/foo.ts becomes <package root>/resources/foo.js
# This way importing from `"together/resources/foo"` works
# This way importing from `"together-ai/resources/foo"` works
# even with `"moduleResolution": "node"`

rm -rf dist; mkdir dist
Expand Down Expand Up @@ -47,8 +47,8 @@ node scripts/utils/postprocess-files.cjs

# make sure that nothing crashes when we require the output CJS or
# import the output ESM
(cd dist && node -e 'require("together")')
(cd dist && node -e 'import("together")' --input-type=module)
(cd dist && node -e 'require("together-ai")')
(cd dist && node -e 'import("together-ai")' --input-type=module)

if command -v deno &> /dev/null && [ -e ./scripts/build-deno ]
then
Expand Down
4 changes: 2 additions & 2 deletions scripts/utils/postprocess-files.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const fs = require('fs');
const path = require('path');
const { parse } = require('@typescript-eslint/parser');

const pkgImportPath = process.env['PKG_IMPORT_PATH'] ?? 'together/';
const pkgImportPath = process.env['PKG_IMPORT_PATH'] ?? 'together-ai/';

const distDir =
process.env['DIST_PATH'] ?
Expand Down Expand Up @@ -142,7 +142,7 @@ async function postprocess() {

if (file.endsWith('.d.ts')) {
// work around bad tsc behavior
// if we have `import { type Readable } from 'together/_shims/index'`,
// if we have `import { type Readable } from 'together-ai/_shims/index'`,
// tsc sometimes replaces `Readable` with `import("stream").Readable` inline
// in the output .d.ts
transformed = transformed.replace(/import\("stream"\).Readable/g, 'Readable');
Expand Down
32 changes: 16 additions & 16 deletions src/_shims/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# 👋 Wondering what everything in here does?

`together` supports a wide variety of runtime environments like Node.js, Deno, Bun, browsers, and various
`together-ai` supports a wide variety of runtime environments like Node.js, Deno, Bun, browsers, and various
edge runtimes, as well as both CommonJS (CJS) and EcmaScript Modules (ESM).

To do this, `together` provides shims for either using `node-fetch` when in Node (because `fetch` is still experimental there) or the global `fetch` API built into the environment when not in Node.
To do this, `together-ai` provides shims for either using `node-fetch` when in Node (because `fetch` is still experimental there) or the global `fetch` API built into the environment when not in Node.

It uses [conditional exports](https://nodejs.org/api/packages.html#conditional-exports) to
automatically select the correct shims for each environment. However, conditional exports are a fairly new
Expand All @@ -15,32 +15,32 @@ getting the wrong raw `Response` type from `.asResponse()`, for example.

The user can work around these issues by manually importing one of:

- `import 'together/shims/node'`
- `import 'together/shims/web'`
- `import 'together-ai/shims/node'`
- `import 'together-ai/shims/web'`

All of the code here in `_shims` handles selecting the automatic default shims or manual overrides.

### How it works - Runtime

Runtime shims get installed by calling `setShims` exported by `together/_shims/registry`.
Runtime shims get installed by calling `setShims` exported by `together-ai/_shims/registry`.

Manually importing `together/shims/node` or `together/shims/web`, calls `setShims` with the respective runtime shims.
Manually importing `together-ai/shims/node` or `together-ai/shims/web`, calls `setShims` with the respective runtime shims.

All client code imports shims from `together/_shims/index`, which:
All client code imports shims from `together-ai/_shims/index`, which:

- checks if shims have been set manually
- if not, calls `setShims` with the shims from `together/_shims/auto/runtime`
- re-exports the installed shims from `together/_shims/registry`.
- if not, calls `setShims` with the shims from `together-ai/_shims/auto/runtime`
- re-exports the installed shims from `together-ai/_shims/registry`.

`together/_shims/auto/runtime` exports web runtime shims.
If the `node` export condition is set, the export map replaces it with `together/_shims/auto/runtime-node`.
`together-ai/_shims/auto/runtime` exports web runtime shims.
If the `node` export condition is set, the export map replaces it with `together-ai/_shims/auto/runtime-node`.

### How it works - Type time

All client code imports shim types from `together/_shims/index`, which selects the manual types from `together/_shims/manual-types` if they have been declared, otherwise it exports the auto types from `together/_shims/auto/types`.
All client code imports shim types from `together-ai/_shims/index`, which selects the manual types from `together-ai/_shims/manual-types` if they have been declared, otherwise it exports the auto types from `together-ai/_shims/auto/types`.

`together/_shims/manual-types` exports an empty namespace.
Manually importing `together/shims/node` or `together/shims/web` merges declarations into this empty namespace, so they get picked up by `together/_shims/index`.
`together-ai/_shims/manual-types` exports an empty namespace.
Manually importing `together-ai/shims/node` or `together-ai/shims/web` merges declarations into this empty namespace, so they get picked up by `together-ai/_shims/index`.

`together/_shims/auto/types` exports web type definitions.
If the `node` export condition is set, the export map replaces it with `together/_shims/auto/types-node`, though TS only picks this up if `"moduleResolution": "nodenext"` or `"moduleResolution": "bundler"`.
`together-ai/_shims/auto/types` exports web type definitions.
If the `node` export condition is set, the export map replaces it with `together-ai/_shims/auto/types-node`, though TS only picks this up if `"moduleResolution": "nodenext"` or `"moduleResolution": "bundler"`.
2 changes: 1 addition & 1 deletion src/_shims/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Disclaimer: modules in _shims aren't intended to be imported by SDK users.
*/
import { manual } from './manual-types';
import * as auto from 'together/_shims/auto/types';
import * as auto from 'together-ai/_shims/auto/types';
import { type RequestOptions } from '../core';

type SelectType<Manual, Auto> = unknown extends Manual ? Auto : Manual;
Expand Down
2 changes: 1 addition & 1 deletion src/_shims/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Disclaimer: modules in _shims aren't intended to be imported by SDK users.
*/
const shims = require('./registry');
const auto = require('together/_shims/auto/runtime');
const auto = require('together-ai/_shims/auto/runtime');
if (!shims.kind) shims.setShims(auto.getRuntime(), { auto: true });
for (const property of Object.keys(shims)) {
Object.defineProperty(exports, property, {
Expand Down
2 changes: 1 addition & 1 deletion src/_shims/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* Disclaimer: modules in _shims aren't intended to be imported by SDK users.
*/
import * as shims from './registry.mjs';
import * as auto from 'together/_shims/auto/runtime';
import * as auto from 'together-ai/_shims/auto/runtime';
if (!shims.kind) shims.setShims(auto.getRuntime(), { auto: true });
export * from './registry.mjs';
4 changes: 2 additions & 2 deletions src/_shims/manual-types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
/**
* Types will get added to this namespace when you import one of the following:
*
* import 'together/shims/node'
* import 'together/shims/web'
* import 'together-ai/shims/node'
* import 'together-ai/shims/web'
*
* Importing more than one will cause type and runtime errors.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/_shims/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ export let isFsReadStream: Shims['isFsReadStream'] | undefined = undefined;
export function setShims(shims: Shims, options: { auto: boolean } = { auto: false }) {
if (auto) {
throw new Error(
`you must \`import 'together/shims/${shims.kind}'\` before importing anything else from together`,
`you must \`import 'together-ai/shims/${shims.kind}'\` before importing anything else from together-ai`,
);
}
if (kind) {
throw new Error(
`can't \`import 'together/shims/${shims.kind}'\` after \`import 'together/shims/${kind}'\``,
`can't \`import 'together-ai/shims/${shims.kind}'\` after \`import 'together-ai/shims/${kind}'\``,
);
}
auto = options.auto;
Expand Down
6 changes: 3 additions & 3 deletions src/_shims/web-runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ export function getRuntime({ manuallyImported }: { manuallyImported?: boolean }
const recommendation =
manuallyImported ?
`You may need to use polyfills`
: `Add one of these imports before your first \`import … from 'together'\`:
- \`import 'together/shims/node'\` (if you're running on Node)
- \`import 'together/shims/web'\` (otherwise)
: `Add one of these imports before your first \`import … from 'together-ai'\`:
- \`import 'together-ai/shims/node'\` (if you're running on Node)
- \`import 'together-ai/shims/web'\` (otherwise)
`;

let _fetch, _Request, _Response, _Headers;
Expand Down
12 changes: 6 additions & 6 deletions src/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ export class APIPromise<T> extends Promise<T> {
*
* 👋 Getting the wrong TypeScript type for `Response`?
* Try setting `"moduleResolution": "NodeNext"` if you can,
* or add one of these imports before your first `import … from 'together'`:
* - `import 'together/shims/node'` (if you're running on Node)
* - `import 'together/shims/web'` (otherwise)
* or add one of these imports before your first `import … from 'together-ai'`:
* - `import 'together-ai/shims/node'` (if you're running on Node)
* - `import 'together-ai/shims/web'` (otherwise)
*/
asResponse(): Promise<Response> {
return this.responsePromise.then((p) => p.response);
Expand All @@ -127,9 +127,9 @@ export class APIPromise<T> extends Promise<T> {
*
* 👋 Getting the wrong TypeScript type for `Response`?
* Try setting `"moduleResolution": "NodeNext"` if you can,
* or add one of these imports before your first `import … from 'together'`:
* - `import 'together/shims/node'` (if you're running on Node)
* - `import 'together/shims/web'` (otherwise)
* or add one of these imports before your first `import … from 'together-ai'`:
* - `import 'together-ai/shims/node'` (if you're running on Node)
* - `import 'together-ai/shims/web'` (otherwise)
*/
async withResponse(): Promise<{ data: T; response: Response }> {
const [data, response] = await Promise.all([this.parse(), this.asResponse()]);
Expand Down
2 changes: 1 addition & 1 deletion src/streaming.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReadableStream, type Response } from './_shims/index';
import { TogetherError } from './error';

import { APIError } from 'together/error';
import { APIError } from 'together-ai/error';

type Bytes = string | ArrayBuffer | Uint8Array | Buffer | null | undefined;

Expand Down
2 changes: 1 addition & 1 deletion tests/api-resources/chat/completions.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.

import Together from 'together';
import Together from 'together-ai';
import { Response } from 'node-fetch';

const together = new Together({
Expand Down
2 changes: 1 addition & 1 deletion tests/api-resources/completions.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.

import Together from 'together';
import Together from 'together-ai';
import { Response } from 'node-fetch';

const together = new Together({
Expand Down
2 changes: 1 addition & 1 deletion tests/api-resources/embeddings.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.

import Together from 'together';
import Together from 'together-ai';
import { Response } from 'node-fetch';

const together = new Together({
Expand Down
2 changes: 1 addition & 1 deletion tests/api-resources/files.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.

import Together from 'together';
import Together from 'together-ai';
import { Response } from 'node-fetch';

const together = new Together({
Expand Down
2 changes: 1 addition & 1 deletion tests/api-resources/fine-tune.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.

import Together from 'together';
import Together from 'together-ai';
import { Response } from 'node-fetch';

const together = new Together({
Expand Down
2 changes: 1 addition & 1 deletion tests/api-resources/images.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.

import Together from 'together';
import Together from 'together-ai';
import { Response } from 'node-fetch';

const together = new Together({
Expand Down
2 changes: 1 addition & 1 deletion tests/api-resources/models.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.

import Together from 'together';
import Together from 'together-ai';
import { Response } from 'node-fetch';

const together = new Together({
Expand Down
6 changes: 3 additions & 3 deletions tests/form.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { multipartFormRequestOptions, createForm } from 'together/core';
import { Blob } from 'together/_shims/index';
import { toFile } from 'together';
import { multipartFormRequestOptions, createForm } from 'together-ai/core';
import { Blob } from 'together-ai/_shims/index';
import { toFile } from 'together-ai';

describe('form data validation', () => {
test('valid values do not error', async () => {
Expand Down
6 changes: 3 additions & 3 deletions tests/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.

import Together from 'together';
import { APIUserAbortError } from 'together';
import { Headers } from 'together/core';
import Together from 'together-ai';
import { APIUserAbortError } from 'together-ai';
import { Headers } from 'together-ai/core';
import defaultFetch, { Response, type RequestInit, type RequestInfo } from 'node-fetch';

describe('instantiate client', () => {
Expand Down
Loading

0 comments on commit 3ce9a74

Please sign in to comment.