@byfriends/kosong 0.2.2 → 0.3.2

package/dist/providers/openai-responses.mjs

@@ -1,6 +1,6 @@
-import { c as thinkingEffortToReasoningEffort, n as convertOpenAIError, p as extractText, s as reasoningEffortToThinkingEffort } from "../openai-common-Dl42y_vn.mjs";
-import { o as ChatProviderError } from "../errors-WFxxzL1B.mjs";
-import { l as usesOpenAIResponsesDeveloperRole, n as requireProviderApiKey, r as resolveAuthBackedClient, s as getOpenAIResponsesModelCapability, t as mergeRequestHeaders } from "../request-auth-BMXt8jRu.mjs";
+import { c as thinkingEffortToReasoningEffort, n as convertOpenAIError, p as extractText, s as reasoningEffortToThinkingEffort } from "../openai-common-B7Ex3mNh.mjs";
+import { l as ChatProviderError, n as extractCacheUsage } from "../provider-common-CaxKVTTJ.mjs";
+import { d as usesOpenAIResponsesDeveloperRole, l as getOpenAIResponsesModelCapability, n as BaseChatProvider, t as BaseStreamedMessage } from "../base-streamed-message-Kok6Drxr.mjs";
 import OpenAI from "openai";
 import { createHash } from "node:crypto";
 //#region src/providers/openai-responses.ts
@@ -308,30 +308,17 @@ function convertTool(tool) {
 		strict: false
 	};
 }
-var OpenAIResponsesStreamedMessage = class {
-	_id = null;
-	_usage = null;
-	_finishReason = null;
-	_rawFinishReason = null;
-	_iter;
+var OpenAIResponsesStreamedMessage = class extends BaseStreamedMessage {
+	_response;
+	_isStream;
 	constructor(response, isStream) {
-		if (isStream) this._iter = this._convertStreamResponse(response);
-		else this._iter = this._convertNonStreamResponse(response);
+		super();
+		this._response = response;
+		this._isStream = isStream;
 	}
-	get id() {
-		return this._id;
-	}
-	get usage() {
-		return this._usage;
-	}
-	get finishReason() {
-		return this._finishReason;
-	}
-	get rawFinishReason() {
-		return this._rawFinishReason;
-	}
-	async *[Symbol.asyncIterator]() {
-		yield* this._iter;
+	_buildIter() {
+		if (this._isStream) return this._convertStreamResponse(this._response);
+		return this._convertNonStreamResponse(this._response);
 	}
 	_captureFinishReasonFromResponse(response) {
 		const status = readNullableStringField(response, "status");
@@ -345,12 +332,7 @@ var OpenAIResponsesStreamedMessage = class {
 		const outputTokens = readNumberField(usage, "output_tokens") ?? 0;
 		const details = readObjectField(usage, "input_tokens_details");
 		const cached = details ? readNumberField(details, "cached_tokens") ?? 0 : 0;
-		this._usage = {
-			inputOther: inputTokens - cached,
-			output: outputTokens,
-			inputCacheRead: cached,
-			inputCacheCreation: 0
-		};
+		this._usage = extractCacheUsage(inputTokens, cached, outputTokens);
 	}
 	async *_convertNonStreamResponse(response) {
 		this._id = readStringField(response, "id") ?? null;
@@ -513,34 +495,22 @@ var OpenAIResponsesStreamedMessage = class {
 		}
 	}
 };
-var OpenAIResponsesChatProvider = class {
+var OpenAIResponsesChatProvider = class OpenAIResponsesChatProvider extends BaseChatProvider {
 	name = "openai-responses";
-	_model;
 	_stream;
-	_apiKey;
-	_baseUrl;
-	_defaultHeaders;
-	_generationKwargs;
 	_toolMessageConversion;
-	_client;
 	_httpClient;
-	_clientFactory;
 	constructor(options) {
 		const apiKey = options.apiKey ?? process.env["OPENAI_API_KEY"];
-		this._apiKey = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
-		this._baseUrl = options.baseUrl ?? "https://api.openai.com/v1";
-		this._defaultHeaders = options.defaultHeaders;
-		this._model = options.model;
+		const apiKeyResolved = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
+		const baseUrl = options.baseUrl ?? "https://api.openai.com/v1";
+		const generationKwargs = {};
+		if (options.maxOutputTokens !== void 0) generationKwargs.max_output_tokens = options.maxOutputTokens;
+		const client = apiKeyResolved === void 0 ? void 0 : OpenAIResponsesChatProvider.buildClient(apiKeyResolved, baseUrl, options.defaultHeaders, options.httpClient);
+		super(options.model, generationKwargs, apiKeyResolved, baseUrl, options.defaultHeaders, client, options.clientFactory);
 		this._stream = true;
-		this._generationKwargs = {};
 		this._toolMessageConversion = options.toolMessageConversion ?? null;
 		this._httpClient = options.httpClient;
-		this._clientFactory = options.clientFactory;
-		if (options.maxOutputTokens !== void 0) this._generationKwargs.max_output_tokens = options.maxOutputTokens;
-		this._client = this._apiKey === void 0 ? void 0 : this._buildClient(this._apiKey);
-	}
-	get modelName() {
-		return this._model;
 	}
 	get thinkingEffort() {
 		return reasoningEffortToThinkingEffort(this._generationKwargs.reasoning_effort);
@@ -599,41 +569,18 @@ var OpenAIResponsesChatProvider = class {
 	}
 	withThinking(effort) {
 		const reasoningEffort = thinkingEffortToReasoningEffort(effort, this._model);
-		const clone = this._clone();
-		clone._generationKwargs = {
-			...clone._generationKwargs,
-			reasoning_effort: reasoningEffort
-		};
-		return clone;
-	}
-	withGenerationKwargs(kwargs) {
-		const clone = this._clone();
-		clone._generationKwargs = {
-			...clone._generationKwargs,
-			...kwargs
-		};
-		return clone;
+		return this.withGenerationKwargs({ reasoning_effort: reasoningEffort });
 	}
-	_clone() {
-		const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
-		clone._generationKwargs = { ...this._generationKwargs };
-		return clone;
+	createRawClient(auth, defaultHeaders) {
+		return OpenAIResponsesChatProvider.buildClient(auth.apiKey, this._baseUrl, defaultHeaders, this._httpClient);
 	}
-	_createClient(auth) {
-		return resolveAuthBackedClient({
-			cachedClient: this._client,
-			clientFactory: this._clientFactory
-		}, auth, (a) => this._buildClient(requireProviderApiKey("OpenAIResponsesChatProvider", a, this._apiKey), a));
-	}
-	_buildClient(apiKey, auth) {
-		const clientOpts = {
+	static buildClient(apiKey, baseURL, defaultHeaders, httpClient) {
+		return new OpenAI({
 			apiKey,
-			baseURL: this._baseUrl
-		};
-		const defaultHeaders = mergeRequestHeaders(this._defaultHeaders, auth?.headers);
-		if (defaultHeaders !== void 0) clientOpts["defaultHeaders"] = defaultHeaders;
-		if (this._httpClient !== void 0) clientOpts["httpClient"] = this._httpClient;
-		return new OpenAI(clientOpts);
+			baseURL,
+			...defaultHeaders !== void 0 ? { defaultHeaders } : {},
+			...httpClient !== void 0 ? { httpClient } : {}
+		});
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byfriends/kosong",
-  "version": "0.2.2",
+  "version": "0.3.2",
   "description": "LLM and provider abstraction layer for BYF",
   "license": "Proprietary",
   "author": "ByronFinn",

package/dist/errors-WFxxzL1B.mjs

@@ -1,80 +0,0 @@
-//#region src/errors.ts
-/**
-* Base error for all chat provider errors.
-*/
-var ChatProviderError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "ChatProviderError";
-	}
-};
-/**
-* Network-level connection failure.
-*/
-var APIConnectionError = class extends ChatProviderError {
-	constructor(message) {
-		super(message);
-		this.name = "APIConnectionError";
-	}
-};
-/**
-* Request timed out.
-*/
-var APITimeoutError = class extends ChatProviderError {
-	constructor(message) {
-		super(message);
-		this.name = "APITimeoutError";
-	}
-};
-/**
-* HTTP status error from the API.
-*/
-var APIStatusError = class extends ChatProviderError {
-	statusCode;
-	requestId;
-	constructor(statusCode, message, requestId) {
-		super(message);
-		this.name = "APIStatusError";
-		this.statusCode = statusCode;
-		this.requestId = requestId ?? null;
-	}
-};
-/**
-* HTTP status error that specifically means the request exceeded the model
-* context window.
-*/
-var APIContextOverflowError = class extends APIStatusError {
-	constructor(statusCode, message, requestId) {
-		super(statusCode, message, requestId);
-		this.name = "APIContextOverflowError";
-	}
-};
-/**
-* The API returned an empty response (no content, no tool calls).
-*/
-var APIEmptyResponseError = class extends ChatProviderError {
-	constructor(message) {
-		super(message);
-		this.name = "APIEmptyResponseError";
-	}
-};
-const CONTEXT_OVERFLOW_MESSAGE_PATTERNS = [
-	/context[ _-]?length/,
-	/(?:context[ _-]?window.*exceed|exceed.*context[ _-]?window)/,
-	/maximum context/,
-	/exceed(?:ed|s|ing)?\s+(?:the\s+)?max(?:imum)?\s+tokens?/,
-	/(?:too many tokens.*(?:prompt|input|context)|(?:prompt|input|context).*too many tokens)/,
-	/prompt is too long.*maximum/,
-	/input token count.*exceeds?.*maximum number of tokens/
-];
-function normalizeAPIStatusError(statusCode, message, requestId) {
-	if (isContextOverflowStatusError(statusCode, message)) return new APIContextOverflowError(statusCode, message, requestId);
-	return new APIStatusError(statusCode, message, requestId);
-}
-function isContextOverflowStatusError(statusCode, message) {
-	if (statusCode !== 400 && statusCode !== 413 && statusCode !== 422) return false;
-	const lowerMessage = message.toLowerCase();
-	return CONTEXT_OVERFLOW_MESSAGE_PATTERNS.some((pattern) => pattern.test(lowerMessage));
-}
-//#endregion
-export { APITimeoutError as a, APIStatusError as i, APIContextOverflowError as n, ChatProviderError as o, APIEmptyResponseError as r, normalizeAPIStatusError as s, APIConnectionError as t };