@reminix/sdk 0.8.2 → 0.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +23 -0
- package/README.md +10 -43
- package/client.d.mts +5 -5
- package/client.d.mts.map +1 -1
- package/client.d.ts +5 -5
- package/client.d.ts.map +1 -1
- package/client.js +3 -3
- package/client.js.map +1 -1
- package/client.mjs +3 -3
- package/client.mjs.map +1 -1
- package/core/streaming.d.mts +33 -0
- package/core/streaming.d.mts.map +1 -0
- package/core/streaming.d.ts +33 -0
- package/core/streaming.d.ts.map +1 -0
- package/core/streaming.js +263 -0
- package/core/streaming.js.map +1 -0
- package/core/streaming.mjs +258 -0
- package/core/streaming.mjs.map +1 -0
- package/index.d.mts +0 -1
- package/index.d.mts.map +1 -1
- package/index.d.ts +0 -1
- package/index.d.ts.map +1 -1
- package/index.js +1 -5
- package/index.js.map +1 -1
- package/index.mjs +0 -2
- package/index.mjs.map +1 -1
- package/internal/decoders/line.d.mts +17 -0
- package/internal/decoders/line.d.mts.map +1 -0
- package/internal/decoders/line.d.ts +17 -0
- package/internal/decoders/line.d.ts.map +1 -0
- package/internal/decoders/line.js +113 -0
- package/internal/decoders/line.js.map +1 -0
- package/internal/decoders/line.mjs +108 -0
- package/internal/decoders/line.mjs.map +1 -0
- package/internal/parse.d.mts.map +1 -1
- package/internal/parse.d.ts.map +1 -1
- package/internal/parse.js +10 -0
- package/internal/parse.js.map +1 -1
- package/internal/parse.mjs +10 -0
- package/internal/parse.mjs.map +1 -1
- package/internal/request-options.d.mts +2 -0
- package/internal/request-options.d.mts.map +1 -1
- package/internal/request-options.d.ts +2 -0
- package/internal/request-options.d.ts.map +1 -1
- package/internal/request-options.js.map +1 -1
- package/internal/request-options.mjs.map +1 -1
- package/package.json +1 -1
- package/resources/agents.d.mts +49 -40
- package/resources/agents.d.mts.map +1 -1
- package/resources/agents.d.ts +49 -40
- package/resources/agents.d.ts.map +1 -1
- package/resources/agents.js +7 -127
- package/resources/agents.js.map +1 -1
- package/resources/agents.mjs +7 -126
- package/resources/agents.mjs.map +1 -1
- package/resources/index.d.mts +2 -2
- package/resources/index.d.mts.map +1 -1
- package/resources/index.d.ts +2 -2
- package/resources/index.d.ts.map +1 -1
- package/resources/index.js +3 -3
- package/resources/index.js.map +1 -1
- package/resources/index.mjs +1 -1
- package/resources/index.mjs.map +1 -1
- package/resources/{project.d.mts → projects.d.mts} +31 -7
- package/resources/projects.d.mts.map +1 -0
- package/resources/{project.d.ts → projects.d.ts} +31 -7
- package/resources/projects.d.ts.map +1 -0
- package/resources/{project.js → projects.js} +8 -7
- package/resources/projects.js.map +1 -0
- package/resources/{project.mjs → projects.mjs} +6 -5
- package/resources/projects.mjs.map +1 -0
- package/src/client.ts +14 -4
- package/src/core/streaming.ts +315 -0
- package/src/index.ts +0 -4
- package/src/internal/decoders/line.ts +135 -0
- package/src/internal/parse.ts +14 -0
- package/src/internal/request-options.ts +2 -0
- package/src/resources/agents.ts +101 -67
- package/src/resources/index.ts +6 -1
- package/src/resources/{project.ts → projects.ts} +35 -7
- package/src/streaming.ts +2 -87
- package/src/version.ts +1 -1
- package/streaming.d.mts +1 -30
- package/streaming.d.mts.map +1 -1
- package/streaming.d.ts +1 -30
- package/streaming.d.ts.map +1 -1
- package/streaming.js +3 -80
- package/streaming.js.map +1 -1
- package/streaming.mjs +1 -78
- package/streaming.mjs.map +1 -1
- package/version.d.mts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/version.mjs +1 -1
- package/resources/project.d.mts.map +0 -1
- package/resources/project.d.ts.map +0 -1
- package/resources/project.js.map +0 -1
- package/resources/project.mjs.map +0 -1
|
@@ -1,23 +1,24 @@
|
|
|
1
1
|
import { APIResource } from "../core/resource.js";
|
|
2
2
|
import { APIPromise } from "../core/api-promise.js";
|
|
3
3
|
import { RequestOptions } from "../internal/request-options.js";
|
|
4
|
-
export declare class
|
|
4
|
+
export declare class Projects extends APIResource {
|
|
5
5
|
/**
|
|
6
|
-
* Returns the project associated with the API key
|
|
6
|
+
* Returns the project associated with the API key or X-Project header.
|
|
7
7
|
*
|
|
8
8
|
* The project contains metadata about your organization's configuration,
|
|
9
9
|
* including:
|
|
10
10
|
*
|
|
11
11
|
* - Project ID and organization ID
|
|
12
12
|
* - Project name and slug
|
|
13
|
+
* - Organization details
|
|
13
14
|
* - Creation and update timestamps
|
|
14
15
|
*
|
|
15
16
|
* This endpoint is useful for verifying your API key is valid and retrieving
|
|
16
17
|
* project details.
|
|
17
18
|
*/
|
|
18
|
-
|
|
19
|
+
retrieveCurrent(options?: RequestOptions): APIPromise<ProjectRetrieveCurrentResponse>;
|
|
19
20
|
}
|
|
20
|
-
export interface
|
|
21
|
+
export interface ProjectRetrieveCurrentResponse {
|
|
21
22
|
/**
|
|
22
23
|
* Unique identifier for the project
|
|
23
24
|
*/
|
|
@@ -30,6 +31,10 @@ export interface ProjectRetrieveResponse {
|
|
|
30
31
|
* Human-readable name of the project
|
|
31
32
|
*/
|
|
32
33
|
name: string;
|
|
34
|
+
/**
|
|
35
|
+
* Organization that owns this project
|
|
36
|
+
*/
|
|
37
|
+
organization: ProjectRetrieveCurrentResponse.Organization;
|
|
33
38
|
/**
|
|
34
39
|
* ID of the organization that owns this project
|
|
35
40
|
*/
|
|
@@ -43,7 +48,26 @@ export interface ProjectRetrieveResponse {
|
|
|
43
48
|
*/
|
|
44
49
|
updatedAt: string;
|
|
45
50
|
}
|
|
46
|
-
export declare namespace
|
|
47
|
-
|
|
51
|
+
export declare namespace ProjectRetrieveCurrentResponse {
|
|
52
|
+
/**
|
|
53
|
+
* Organization that owns this project
|
|
54
|
+
*/
|
|
55
|
+
interface Organization {
|
|
56
|
+
/**
|
|
57
|
+
* Unique identifier for the organization
|
|
58
|
+
*/
|
|
59
|
+
id: string;
|
|
60
|
+
/**
|
|
61
|
+
* Human-readable name of the organization
|
|
62
|
+
*/
|
|
63
|
+
name: string;
|
|
64
|
+
/**
|
|
65
|
+
* URL-friendly identifier for the organization
|
|
66
|
+
*/
|
|
67
|
+
slug: string;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
export declare namespace Projects {
|
|
71
|
+
export { type ProjectRetrieveCurrentResponse as ProjectRetrieveCurrentResponse };
|
|
48
72
|
}
|
|
49
|
-
//# sourceMappingURL=
|
|
73
|
+
//# sourceMappingURL=projects.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projects.d.ts","sourceRoot":"","sources":["../src/resources/projects.ts"],"names":[],"mappings":"OAEO,EAAE,WAAW,EAAE;OACf,EAAE,UAAU,EAAE;OACd,EAAE,cAAc,EAAE;AAEzB,qBAAa,QAAS,SAAQ,WAAW;IACvC;;;;;;;;;;;;;OAaG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,UAAU,CAAC,8BAA8B,CAAC;CAGtF;AAED,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,EAAE,8BAA8B,CAAC,YAAY,CAAC;IAE1D;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,yBAAiB,8BAA8B,CAAC;IAC9C;;OAEG;IACH,UAAiB,YAAY;QAC3B;;WAEG;QACH,EAAE,EAAE,MAAM,CAAC;QAEX;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;QAEb;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;KACd;CACF;AAED,MAAM,CAAC,OAAO,WAAW,QAAQ,CAAC;IAChC,OAAO,EAAE,KAAK,8BAA8B,IAAI,8BAA8B,EAAE,CAAC;CAClF"}
|
|
@@ -1,25 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.
|
|
4
|
+
exports.Projects = void 0;
|
|
5
5
|
const resource_1 = require("../core/resource.js");
|
|
6
|
-
class
|
|
6
|
+
class Projects extends resource_1.APIResource {
|
|
7
7
|
/**
|
|
8
|
-
* Returns the project associated with the API key
|
|
8
|
+
* Returns the project associated with the API key or X-Project header.
|
|
9
9
|
*
|
|
10
10
|
* The project contains metadata about your organization's configuration,
|
|
11
11
|
* including:
|
|
12
12
|
*
|
|
13
13
|
* - Project ID and organization ID
|
|
14
14
|
* - Project name and slug
|
|
15
|
+
* - Organization details
|
|
15
16
|
* - Creation and update timestamps
|
|
16
17
|
*
|
|
17
18
|
* This endpoint is useful for verifying your API key is valid and retrieving
|
|
18
19
|
* project details.
|
|
19
20
|
*/
|
|
20
|
-
|
|
21
|
-
return this._client.get('/
|
|
21
|
+
retrieveCurrent(options) {
|
|
22
|
+
return this._client.get('/projects/current', options);
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
|
-
exports.
|
|
25
|
-
//# sourceMappingURL=
|
|
25
|
+
exports.Projects = Projects;
|
|
26
|
+
//# sourceMappingURL=projects.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projects.js","sourceRoot":"","sources":["../src/resources/projects.ts"],"names":[],"mappings":";AAAA,sFAAsF;;;AAEtF,kDAA+C;AAI/C,MAAa,QAAS,SAAQ,sBAAW;IACvC;;;;;;;;;;;;;OAaG;IACH,eAAe,CAAC,OAAwB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;CACF;AAlBD,4BAkBC"}
|
|
@@ -1,21 +1,22 @@
|
|
|
1
1
|
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
|
|
2
2
|
import { APIResource } from "../core/resource.mjs";
|
|
3
|
-
export class
|
|
3
|
+
export class Projects extends APIResource {
|
|
4
4
|
/**
|
|
5
|
-
* Returns the project associated with the API key
|
|
5
|
+
* Returns the project associated with the API key or X-Project header.
|
|
6
6
|
*
|
|
7
7
|
* The project contains metadata about your organization's configuration,
|
|
8
8
|
* including:
|
|
9
9
|
*
|
|
10
10
|
* - Project ID and organization ID
|
|
11
11
|
* - Project name and slug
|
|
12
|
+
* - Organization details
|
|
12
13
|
* - Creation and update timestamps
|
|
13
14
|
*
|
|
14
15
|
* This endpoint is useful for verifying your API key is valid and retrieving
|
|
15
16
|
* project details.
|
|
16
17
|
*/
|
|
17
|
-
|
|
18
|
-
return this._client.get('/
|
|
18
|
+
retrieveCurrent(options) {
|
|
19
|
+
return this._client.get('/projects/current', options);
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
|
-
//# sourceMappingURL=
|
|
22
|
+
//# sourceMappingURL=projects.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projects.mjs","sourceRoot":"","sources":["../src/resources/projects.ts"],"names":[],"mappings":"AAAA,sFAAsF;OAE/E,EAAE,WAAW,EAAE;AAItB,MAAM,OAAO,QAAS,SAAQ,WAAW;IACvC;;;;;;;;;;;;;OAaG;IACH,eAAe,CAAC,OAAwB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;CACF"}
|
package/src/client.ts
CHANGED
|
@@ -18,13 +18,18 @@ import * as API from './resources/index';
|
|
|
18
18
|
import { APIPromise } from './core/api-promise';
|
|
19
19
|
import {
|
|
20
20
|
AgentChatParams,
|
|
21
|
+
AgentChatParamsNonStreaming,
|
|
22
|
+
AgentChatParamsStreaming,
|
|
21
23
|
AgentChatResponse,
|
|
22
24
|
AgentInvokeParams,
|
|
25
|
+
AgentInvokeParamsNonStreaming,
|
|
26
|
+
AgentInvokeParamsStreaming,
|
|
23
27
|
AgentInvokeResponse,
|
|
24
28
|
Agents,
|
|
25
29
|
Context,
|
|
30
|
+
StreamChunk,
|
|
26
31
|
} from './resources/agents';
|
|
27
|
-
import {
|
|
32
|
+
import { ProjectRetrieveCurrentResponse, Projects } from './resources/projects';
|
|
28
33
|
import { type Fetch } from './internal/builtin-types';
|
|
29
34
|
import { HeadersLike, NullableHeaders, buildHeaders } from './internal/headers';
|
|
30
35
|
import { FinalRequestOptions, RequestOptions } from './internal/request-options';
|
|
@@ -722,24 +727,29 @@ export class Reminix {
|
|
|
722
727
|
|
|
723
728
|
static toFile = Uploads.toFile;
|
|
724
729
|
|
|
725
|
-
|
|
730
|
+
projects: API.Projects = new API.Projects(this);
|
|
726
731
|
agents: API.Agents = new API.Agents(this);
|
|
727
732
|
}
|
|
728
733
|
|
|
729
|
-
Reminix.
|
|
734
|
+
Reminix.Projects = Projects;
|
|
730
735
|
Reminix.Agents = Agents;
|
|
731
736
|
|
|
732
737
|
export declare namespace Reminix {
|
|
733
738
|
export type RequestOptions = Opts.RequestOptions;
|
|
734
739
|
|
|
735
|
-
export {
|
|
740
|
+
export { Projects as Projects, type ProjectRetrieveCurrentResponse as ProjectRetrieveCurrentResponse };
|
|
736
741
|
|
|
737
742
|
export {
|
|
738
743
|
Agents as Agents,
|
|
739
744
|
type Context as Context,
|
|
745
|
+
type StreamChunk as StreamChunk,
|
|
740
746
|
type AgentChatResponse as AgentChatResponse,
|
|
741
747
|
type AgentInvokeResponse as AgentInvokeResponse,
|
|
742
748
|
type AgentChatParams as AgentChatParams,
|
|
749
|
+
type AgentChatParamsNonStreaming as AgentChatParamsNonStreaming,
|
|
750
|
+
type AgentChatParamsStreaming as AgentChatParamsStreaming,
|
|
743
751
|
type AgentInvokeParams as AgentInvokeParams,
|
|
752
|
+
type AgentInvokeParamsNonStreaming as AgentInvokeParamsNonStreaming,
|
|
753
|
+
type AgentInvokeParamsStreaming as AgentInvokeParamsStreaming,
|
|
744
754
|
};
|
|
745
755
|
}
|
|
@@ -0,0 +1,315 @@
|
|
|
1
|
+
import { ReminixError } from './error';
|
|
2
|
+
import { type ReadableStream } from '../internal/shim-types';
|
|
3
|
+
import { makeReadableStream } from '../internal/shims';
|
|
4
|
+
import { findDoubleNewlineIndex, LineDecoder } from '../internal/decoders/line';
|
|
5
|
+
import { ReadableStreamToAsyncIterable } from '../internal/shims';
|
|
6
|
+
import { isAbortError } from '../internal/errors';
|
|
7
|
+
import { encodeUTF8 } from '../internal/utils/bytes';
|
|
8
|
+
import { loggerFor } from '../internal/utils/log';
|
|
9
|
+
import type { Reminix } from '../client';
|
|
10
|
+
|
|
11
|
+
type Bytes = string | ArrayBuffer | Uint8Array | null | undefined;
|
|
12
|
+
|
|
13
|
+
export type ServerSentEvent = {
|
|
14
|
+
event: string | null;
|
|
15
|
+
data: string;
|
|
16
|
+
raw: string[];
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
export class Stream<Item> implements AsyncIterable<Item> {
|
|
20
|
+
controller: AbortController;
|
|
21
|
+
#client: Reminix | undefined;
|
|
22
|
+
|
|
23
|
+
constructor(
|
|
24
|
+
private iterator: () => AsyncIterator<Item>,
|
|
25
|
+
controller: AbortController,
|
|
26
|
+
client?: Reminix,
|
|
27
|
+
) {
|
|
28
|
+
this.controller = controller;
|
|
29
|
+
this.#client = client;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
static fromSSEResponse<Item>(
|
|
33
|
+
response: Response,
|
|
34
|
+
controller: AbortController,
|
|
35
|
+
client?: Reminix,
|
|
36
|
+
): Stream<Item> {
|
|
37
|
+
let consumed = false;
|
|
38
|
+
const logger = client ? loggerFor(client) : console;
|
|
39
|
+
|
|
40
|
+
async function* iterator(): AsyncIterator<Item, any, undefined> {
|
|
41
|
+
if (consumed) {
|
|
42
|
+
throw new ReminixError('Cannot iterate over a consumed stream, use `.tee()` to split the stream.');
|
|
43
|
+
}
|
|
44
|
+
consumed = true;
|
|
45
|
+
let done = false;
|
|
46
|
+
try {
|
|
47
|
+
for await (const sse of _iterSSEMessages(response, controller)) {
|
|
48
|
+
try {
|
|
49
|
+
yield JSON.parse(sse.data);
|
|
50
|
+
} catch (e) {
|
|
51
|
+
logger.error(`Could not parse message into JSON:`, sse.data);
|
|
52
|
+
logger.error(`From chunk:`, sse.raw);
|
|
53
|
+
throw e;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
done = true;
|
|
57
|
+
} catch (e) {
|
|
58
|
+
// If the user calls `stream.controller.abort()`, we should exit without throwing.
|
|
59
|
+
if (isAbortError(e)) return;
|
|
60
|
+
throw e;
|
|
61
|
+
} finally {
|
|
62
|
+
// If the user `break`s, abort the ongoing request.
|
|
63
|
+
if (!done) controller.abort();
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return new Stream(iterator, controller, client);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Generates a Stream from a newline-separated ReadableStream
|
|
72
|
+
* where each item is a JSON value.
|
|
73
|
+
*/
|
|
74
|
+
static fromReadableStream<Item>(
|
|
75
|
+
readableStream: ReadableStream,
|
|
76
|
+
controller: AbortController,
|
|
77
|
+
client?: Reminix,
|
|
78
|
+
): Stream<Item> {
|
|
79
|
+
let consumed = false;
|
|
80
|
+
|
|
81
|
+
async function* iterLines(): AsyncGenerator<string, void, unknown> {
|
|
82
|
+
const lineDecoder = new LineDecoder();
|
|
83
|
+
|
|
84
|
+
const iter = ReadableStreamToAsyncIterable<Bytes>(readableStream);
|
|
85
|
+
for await (const chunk of iter) {
|
|
86
|
+
for (const line of lineDecoder.decode(chunk)) {
|
|
87
|
+
yield line;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
for (const line of lineDecoder.flush()) {
|
|
92
|
+
yield line;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
async function* iterator(): AsyncIterator<Item, any, undefined> {
|
|
97
|
+
if (consumed) {
|
|
98
|
+
throw new ReminixError('Cannot iterate over a consumed stream, use `.tee()` to split the stream.');
|
|
99
|
+
}
|
|
100
|
+
consumed = true;
|
|
101
|
+
let done = false;
|
|
102
|
+
try {
|
|
103
|
+
for await (const line of iterLines()) {
|
|
104
|
+
if (done) continue;
|
|
105
|
+
if (line) yield JSON.parse(line);
|
|
106
|
+
}
|
|
107
|
+
done = true;
|
|
108
|
+
} catch (e) {
|
|
109
|
+
// If the user calls `stream.controller.abort()`, we should exit without throwing.
|
|
110
|
+
if (isAbortError(e)) return;
|
|
111
|
+
throw e;
|
|
112
|
+
} finally {
|
|
113
|
+
// If the user `break`s, abort the ongoing request.
|
|
114
|
+
if (!done) controller.abort();
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
return new Stream(iterator, controller, client);
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
[Symbol.asyncIterator](): AsyncIterator<Item> {
|
|
122
|
+
return this.iterator();
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
/**
|
|
126
|
+
* Splits the stream into two streams which can be
|
|
127
|
+
* independently read from at different speeds.
|
|
128
|
+
*/
|
|
129
|
+
tee(): [Stream<Item>, Stream<Item>] {
|
|
130
|
+
const left: Array<Promise<IteratorResult<Item>>> = [];
|
|
131
|
+
const right: Array<Promise<IteratorResult<Item>>> = [];
|
|
132
|
+
const iterator = this.iterator();
|
|
133
|
+
|
|
134
|
+
const teeIterator = (queue: Array<Promise<IteratorResult<Item>>>): AsyncIterator<Item> => {
|
|
135
|
+
return {
|
|
136
|
+
next: () => {
|
|
137
|
+
if (queue.length === 0) {
|
|
138
|
+
const result = iterator.next();
|
|
139
|
+
left.push(result);
|
|
140
|
+
right.push(result);
|
|
141
|
+
}
|
|
142
|
+
return queue.shift()!;
|
|
143
|
+
},
|
|
144
|
+
};
|
|
145
|
+
};
|
|
146
|
+
|
|
147
|
+
return [
|
|
148
|
+
new Stream(() => teeIterator(left), this.controller, this.#client),
|
|
149
|
+
new Stream(() => teeIterator(right), this.controller, this.#client),
|
|
150
|
+
];
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
/**
|
|
154
|
+
* Converts this stream to a newline-separated ReadableStream of
|
|
155
|
+
* JSON stringified values in the stream
|
|
156
|
+
* which can be turned back into a Stream with `Stream.fromReadableStream()`.
|
|
157
|
+
*/
|
|
158
|
+
toReadableStream(): ReadableStream {
|
|
159
|
+
const self = this;
|
|
160
|
+
let iter: AsyncIterator<Item>;
|
|
161
|
+
|
|
162
|
+
return makeReadableStream({
|
|
163
|
+
async start() {
|
|
164
|
+
iter = self[Symbol.asyncIterator]();
|
|
165
|
+
},
|
|
166
|
+
async pull(ctrl: any) {
|
|
167
|
+
try {
|
|
168
|
+
const { value, done } = await iter.next();
|
|
169
|
+
if (done) return ctrl.close();
|
|
170
|
+
|
|
171
|
+
const bytes = encodeUTF8(JSON.stringify(value) + '\n');
|
|
172
|
+
|
|
173
|
+
ctrl.enqueue(bytes);
|
|
174
|
+
} catch (err) {
|
|
175
|
+
ctrl.error(err);
|
|
176
|
+
}
|
|
177
|
+
},
|
|
178
|
+
async cancel() {
|
|
179
|
+
await iter.return?.();
|
|
180
|
+
},
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
export async function* _iterSSEMessages(
|
|
186
|
+
response: Response,
|
|
187
|
+
controller: AbortController,
|
|
188
|
+
): AsyncGenerator<ServerSentEvent, void, unknown> {
|
|
189
|
+
if (!response.body) {
|
|
190
|
+
controller.abort();
|
|
191
|
+
if (
|
|
192
|
+
typeof (globalThis as any).navigator !== 'undefined' &&
|
|
193
|
+
(globalThis as any).navigator.product === 'ReactNative'
|
|
194
|
+
) {
|
|
195
|
+
throw new ReminixError(
|
|
196
|
+
`The default react-native fetch implementation does not support streaming. Please use expo/fetch: https://docs.expo.dev/versions/latest/sdk/expo/#expofetch-api`,
|
|
197
|
+
);
|
|
198
|
+
}
|
|
199
|
+
throw new ReminixError(`Attempted to iterate over a response with no body`);
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
const sseDecoder = new SSEDecoder();
|
|
203
|
+
const lineDecoder = new LineDecoder();
|
|
204
|
+
|
|
205
|
+
const iter = ReadableStreamToAsyncIterable<Bytes>(response.body);
|
|
206
|
+
for await (const sseChunk of iterSSEChunks(iter)) {
|
|
207
|
+
for (const line of lineDecoder.decode(sseChunk)) {
|
|
208
|
+
const sse = sseDecoder.decode(line);
|
|
209
|
+
if (sse) yield sse;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
for (const line of lineDecoder.flush()) {
|
|
214
|
+
const sse = sseDecoder.decode(line);
|
|
215
|
+
if (sse) yield sse;
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
/**
|
|
220
|
+
* Given an async iterable iterator, iterates over it and yields full
|
|
221
|
+
* SSE chunks, i.e. yields when a double new-line is encountered.
|
|
222
|
+
*/
|
|
223
|
+
async function* iterSSEChunks(iterator: AsyncIterableIterator<Bytes>): AsyncGenerator<Uint8Array> {
|
|
224
|
+
let data = new Uint8Array();
|
|
225
|
+
|
|
226
|
+
for await (const chunk of iterator) {
|
|
227
|
+
if (chunk == null) {
|
|
228
|
+
continue;
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
const binaryChunk =
|
|
232
|
+
chunk instanceof ArrayBuffer ? new Uint8Array(chunk)
|
|
233
|
+
: typeof chunk === 'string' ? encodeUTF8(chunk)
|
|
234
|
+
: chunk;
|
|
235
|
+
|
|
236
|
+
let newData = new Uint8Array(data.length + binaryChunk.length);
|
|
237
|
+
newData.set(data);
|
|
238
|
+
newData.set(binaryChunk, data.length);
|
|
239
|
+
data = newData;
|
|
240
|
+
|
|
241
|
+
let patternIndex;
|
|
242
|
+
while ((patternIndex = findDoubleNewlineIndex(data)) !== -1) {
|
|
243
|
+
yield data.slice(0, patternIndex);
|
|
244
|
+
data = data.slice(patternIndex);
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
if (data.length > 0) {
|
|
249
|
+
yield data;
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
class SSEDecoder {
|
|
254
|
+
private data: string[];
|
|
255
|
+
private event: string | null;
|
|
256
|
+
private chunks: string[];
|
|
257
|
+
|
|
258
|
+
constructor() {
|
|
259
|
+
this.event = null;
|
|
260
|
+
this.data = [];
|
|
261
|
+
this.chunks = [];
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
decode(line: string) {
|
|
265
|
+
if (line.endsWith('\r')) {
|
|
266
|
+
line = line.substring(0, line.length - 1);
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
if (!line) {
|
|
270
|
+
// empty line and we didn't previously encounter any messages
|
|
271
|
+
if (!this.event && !this.data.length) return null;
|
|
272
|
+
|
|
273
|
+
const sse: ServerSentEvent = {
|
|
274
|
+
event: this.event,
|
|
275
|
+
data: this.data.join('\n'),
|
|
276
|
+
raw: this.chunks,
|
|
277
|
+
};
|
|
278
|
+
|
|
279
|
+
this.event = null;
|
|
280
|
+
this.data = [];
|
|
281
|
+
this.chunks = [];
|
|
282
|
+
|
|
283
|
+
return sse;
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
this.chunks.push(line);
|
|
287
|
+
|
|
288
|
+
if (line.startsWith(':')) {
|
|
289
|
+
return null;
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
let [fieldname, _, value] = partition(line, ':');
|
|
293
|
+
|
|
294
|
+
if (value.startsWith(' ')) {
|
|
295
|
+
value = value.substring(1);
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
if (fieldname === 'event') {
|
|
299
|
+
this.event = value;
|
|
300
|
+
} else if (fieldname === 'data') {
|
|
301
|
+
this.data.push(value);
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
return null;
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
function partition(str: string, delimiter: string): [string, string, string] {
|
|
309
|
+
const index = str.indexOf(delimiter);
|
|
310
|
+
if (index !== -1) {
|
|
311
|
+
return [str.substring(0, index), delimiter, str.substring(index + delimiter.length)];
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
return [str, '', ''];
|
|
315
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import { concatBytes, decodeUTF8, encodeUTF8 } from '../utils/bytes';
|
|
2
|
+
|
|
3
|
+
export type Bytes = string | ArrayBuffer | Uint8Array | null | undefined;
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* A re-implementation of httpx's `LineDecoder` in Python that handles incrementally
|
|
7
|
+
* reading lines from text.
|
|
8
|
+
*
|
|
9
|
+
* https://github.com/encode/httpx/blob/920333ea98118e9cf617f246905d7b202510941c/httpx/_decoders.py#L258
|
|
10
|
+
*/
|
|
11
|
+
export class LineDecoder {
|
|
12
|
+
// prettier-ignore
|
|
13
|
+
static NEWLINE_CHARS = new Set(['\n', '\r']);
|
|
14
|
+
static NEWLINE_REGEXP = /\r\n|[\n\r]/g;
|
|
15
|
+
|
|
16
|
+
#buffer: Uint8Array;
|
|
17
|
+
#carriageReturnIndex: number | null;
|
|
18
|
+
|
|
19
|
+
constructor() {
|
|
20
|
+
this.#buffer = new Uint8Array();
|
|
21
|
+
this.#carriageReturnIndex = null;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
decode(chunk: Bytes): string[] {
|
|
25
|
+
if (chunk == null) {
|
|
26
|
+
return [];
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const binaryChunk =
|
|
30
|
+
chunk instanceof ArrayBuffer ? new Uint8Array(chunk)
|
|
31
|
+
: typeof chunk === 'string' ? encodeUTF8(chunk)
|
|
32
|
+
: chunk;
|
|
33
|
+
|
|
34
|
+
this.#buffer = concatBytes([this.#buffer, binaryChunk]);
|
|
35
|
+
|
|
36
|
+
const lines: string[] = [];
|
|
37
|
+
let patternIndex;
|
|
38
|
+
while ((patternIndex = findNewlineIndex(this.#buffer, this.#carriageReturnIndex)) != null) {
|
|
39
|
+
if (patternIndex.carriage && this.#carriageReturnIndex == null) {
|
|
40
|
+
// skip until we either get a corresponding `\n`, a new `\r` or nothing
|
|
41
|
+
this.#carriageReturnIndex = patternIndex.index;
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
// we got double \r or \rtext\n
|
|
46
|
+
if (
|
|
47
|
+
this.#carriageReturnIndex != null &&
|
|
48
|
+
(patternIndex.index !== this.#carriageReturnIndex + 1 || patternIndex.carriage)
|
|
49
|
+
) {
|
|
50
|
+
lines.push(decodeUTF8(this.#buffer.subarray(0, this.#carriageReturnIndex - 1)));
|
|
51
|
+
this.#buffer = this.#buffer.subarray(this.#carriageReturnIndex);
|
|
52
|
+
this.#carriageReturnIndex = null;
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
const endIndex =
|
|
57
|
+
this.#carriageReturnIndex !== null ? patternIndex.preceding - 1 : patternIndex.preceding;
|
|
58
|
+
|
|
59
|
+
const line = decodeUTF8(this.#buffer.subarray(0, endIndex));
|
|
60
|
+
lines.push(line);
|
|
61
|
+
|
|
62
|
+
this.#buffer = this.#buffer.subarray(patternIndex.index);
|
|
63
|
+
this.#carriageReturnIndex = null;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
return lines;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
flush(): string[] {
|
|
70
|
+
if (!this.#buffer.length) {
|
|
71
|
+
return [];
|
|
72
|
+
}
|
|
73
|
+
return this.decode('\n');
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* This function searches the buffer for the end patterns, (\r or \n)
|
|
79
|
+
* and returns an object with the index preceding the matched newline and the
|
|
80
|
+
* index after the newline char. `null` is returned if no new line is found.
|
|
81
|
+
*
|
|
82
|
+
* ```ts
|
|
83
|
+
* findNewLineIndex('abc\ndef') -> { preceding: 2, index: 3 }
|
|
84
|
+
* ```
|
|
85
|
+
*/
|
|
86
|
+
function findNewlineIndex(
|
|
87
|
+
buffer: Uint8Array,
|
|
88
|
+
startIndex: number | null,
|
|
89
|
+
): { preceding: number; index: number; carriage: boolean } | null {
|
|
90
|
+
const newline = 0x0a; // \n
|
|
91
|
+
const carriage = 0x0d; // \r
|
|
92
|
+
|
|
93
|
+
for (let i = startIndex ?? 0; i < buffer.length; i++) {
|
|
94
|
+
if (buffer[i] === newline) {
|
|
95
|
+
return { preceding: i, index: i + 1, carriage: false };
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
if (buffer[i] === carriage) {
|
|
99
|
+
return { preceding: i, index: i + 1, carriage: true };
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
return null;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
export function findDoubleNewlineIndex(buffer: Uint8Array): number {
|
|
107
|
+
// This function searches the buffer for the end patterns (\r\r, \n\n, \r\n\r\n)
|
|
108
|
+
// and returns the index right after the first occurrence of any pattern,
|
|
109
|
+
// or -1 if none of the patterns are found.
|
|
110
|
+
const newline = 0x0a; // \n
|
|
111
|
+
const carriage = 0x0d; // \r
|
|
112
|
+
|
|
113
|
+
for (let i = 0; i < buffer.length - 1; i++) {
|
|
114
|
+
if (buffer[i] === newline && buffer[i + 1] === newline) {
|
|
115
|
+
// \n\n
|
|
116
|
+
return i + 2;
|
|
117
|
+
}
|
|
118
|
+
if (buffer[i] === carriage && buffer[i + 1] === carriage) {
|
|
119
|
+
// \r\r
|
|
120
|
+
return i + 2;
|
|
121
|
+
}
|
|
122
|
+
if (
|
|
123
|
+
buffer[i] === carriage &&
|
|
124
|
+
buffer[i + 1] === newline &&
|
|
125
|
+
i + 3 < buffer.length &&
|
|
126
|
+
buffer[i + 2] === carriage &&
|
|
127
|
+
buffer[i + 3] === newline
|
|
128
|
+
) {
|
|
129
|
+
// \r\n\r\n
|
|
130
|
+
return i + 4;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
return -1;
|
|
135
|
+
}
|
package/src/internal/parse.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
|
|
2
2
|
|
|
3
3
|
import type { FinalRequestOptions } from './request-options';
|
|
4
|
+
import { Stream } from '../core/streaming';
|
|
4
5
|
import { type Reminix } from '../client';
|
|
5
6
|
import { formatRequestDetails, loggerFor } from './utils/log';
|
|
6
7
|
|
|
@@ -16,6 +17,19 @@ export type APIResponseProps = {
|
|
|
16
17
|
export async function defaultParseResponse<T>(client: Reminix, props: APIResponseProps): Promise<T> {
|
|
17
18
|
const { response, requestLogID, retryOfRequestLogID, startTime } = props;
|
|
18
19
|
const body = await (async () => {
|
|
20
|
+
if (props.options.stream) {
|
|
21
|
+
loggerFor(client).debug('response', response.status, response.url, response.headers, response.body);
|
|
22
|
+
|
|
23
|
+
// Note: there is an invariant here that isn't represented in the type system
|
|
24
|
+
// that if you set `stream: true` the response type must also be `Stream<T>`
|
|
25
|
+
|
|
26
|
+
if (props.options.__streamClass) {
|
|
27
|
+
return props.options.__streamClass.fromSSEResponse(response, props.controller, client) as any;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
return Stream.fromSSEResponse(response, props.controller, client) as any;
|
|
31
|
+
}
|
|
32
|
+
|
|
19
33
|
// fetch refuses to read the body when the status code is 204.
|
|
20
34
|
if (response.status === 204) {
|
|
21
35
|
return null as T;
|