macrocosmos 1.2.13 → 1.2.14

package/dist/__tests__/apex/client-chat.test.js

@@ -6,34 +6,32 @@ describe("ApexClient", () => {
     if (!API_KEY) {
         throw new Error("MACROCOSMOS_API_KEY environment variable is required");
     }
-    it("should make a streaming chat completion call", async () => {
-        // Create ApexClient
-        const client = new macrocosmos_1.ApexClient({
+    const messages = [
+        {
+            role: "user",
+            content: "What is the capital of France?",
+        },
+    ];
+    const samplingParameters = {
+        temperature: 0.7,
+        topP: 0.9,
+        maxNewTokens: 100,
+        doSample: true,
+    };
+    let client;
+    beforeEach(() => {
+        client = new macrocosmos_1.ApexClient({
             apiKey: API_KEY,
             appName: "apex-client.test.ts",
         });
-        // Create request with the proper message type
-        const messages = [
-            {
-                role: "user",
-                content: "What is the capital of France?",
-            },
-        ];
+    });
+    it("should make a streaming chat completion call", async () => {
         // Create streaming completion
         const result = await client.chat.completions.create({
             messages,
             stream: true,
-            samplingParameters: {
-                temperature: 0.7,
-                topP: 0.9,
-                maxNewTokens: 100,
-                doSample: true,
-            },
+            samplingParameters,
         });
-        // Check if it's a Stream
-        if (!(result instanceof macrocosmos_1.ApexStream)) {
-            throw new Error("Expected a Stream but got a regular response");
-        }
         // Handle streaming response
         let fullResponse = "";
         const stream = result;
@@ -48,35 +46,12 @@ describe("ApexClient", () => {
         expect(fullResponse.toLowerCase()).toContain("paris");
     }, 30000); // Increase timeout to 30 seconds for streaming
     it("should make a non-streaming chat completion call", async () => {
-        // Create ApexClient
-        const client = new macrocosmos_1.ApexClient({
-            apiKey: API_KEY,
-            appName: "apex-client.test.ts",
-        });
-        // Create request with the proper message type
-        const messages = [
-            {
-                role: "user",
-                content: "What is the capital of France?",
-            },
-        ];
         // Create non-streaming completion
-        const result = await client.chat.completions.create({
+        const response = await client.chat.completions.create({
             messages,
             stream: false,
-            samplingParameters: {
-                temperature: 0.7,
-                topP: 0.9,
-                maxNewTokens: 100,
-                doSample: true,
-            },
+            samplingParameters,
         });
-        // Check if it's a regular response
-        if (result instanceof macrocosmos_1.ApexStream) {
-            throw new Error("Expected a regular response but got a Stream");
-        }
-        // Cast to the correct type
-        const response = result;
         console.log("Response:", response.choices?.[0]?.message?.content);
         expect(response.choices?.[0]?.message?.content).toBeTruthy();
         expect(response.choices?.[0]?.message?.content?.toLowerCase()).toContain("paris");

package/dist/lib/apex/Client.d.ts

@@ -16,6 +16,18 @@ export interface ApexProtoClient {
         new (address: string, credentials: grpc.ChannelCredentials): ApexService;
     };
 }
+export interface ChatCompletionsCreate {
+    (params: ChatCompletionRequest & {
+        stream: true;
+    }, 
+    /** options are not used, but are accepted for compatibility with the OpenAI API */
+    _options?: unknown): Promise<ApexStream<ChatCompletionChunkResponse>>;
+    (params: ChatCompletionRequest & {
+        stream?: false | undefined;
+    }, 
+    /** options are not used, but are accepted for compatibility with the OpenAI API */
+    _options?: unknown): Promise<ChatCompletionResponse>;
+}
 /**
  * Client for interacting with the Apex API
  * Provides OpenAI-compatible interface over gRPC
@@ -24,17 +36,17 @@ export declare class ApexClient extends BaseClient {
     private _grpcClient?;
     private defaultTimeout;
     constructor(options: ApexClientOptions, grpcClient?: ApexServiceClient);
-    private createGrpcClient;
+    protected createGrpcClient(): ApexServiceClient;
     /**
      * Get the default timeout for chat completions
      */
-    private getDefaultTimeout;
+    protected getDefaultTimeout(): number;
     /**
      * OpenAI-compatible chat completions API
      */
     chat: {
         completions: {
-            create: (params: ChatCompletionRequest, _options?: unknown) => Promise<ChatCompletionResponse | ApexStream<ChatCompletionChunkResponse>>;
+            create: ChatCompletionsCreate;
         };
     };
     /**

package/dist/lib/apex/Client.js

@@ -44,6 +44,30 @@ const grpc = __importStar(require("@grpc/grpc-js"));
 const BaseClient_1 = require("../BaseClient");
 const Stream_1 = require("./Stream");
 Object.defineProperty(exports, "ApexStream", { enumerable: true, get: function () { return Stream_1.ApexStream; } });
+function chatCompletionsCreate(params, _options) {
+    const client = this.createGrpcClient();
+    const requestParams = {
+        ...params,
+        uids: params.uids ?? [],
+        timeout: params.timeout || this.getDefaultTimeout(),
+    };
+    if (requestParams.stream) {
+        const stream = client.chatCompletionStream(requestParams);
+        const controller = new AbortController();
+        return Promise.resolve(Stream_1.ApexStream.fromGrpcStream(stream, controller));
+    }
+    else {
+        return new Promise((resolve, reject) => {
+            client.chatCompletion(requestParams, (error, response) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                resolve(response);
+            });
+        });
+    }
+}
 /**
  * Client for interacting with the Apex API
  * Provides OpenAI-compatible interface over gRPC
@@ -56,36 +80,7 @@ class ApexClient extends BaseClient_1.BaseClient {
          */
         this.chat = {
             completions: {
-                create: async (params, _options) => {
-                    const client = this.createGrpcClient();
-                    // Apply default timeout if not specified in params
-                    const requestParams = {
-                        ...params,
-                        uids: params.uids ?? [],
-                        timeout: params.timeout || this.getDefaultTimeout(),
-                    };
-                    // Handle streaming vs non-streaming
-                    if (requestParams.stream) {
-                        // Create a streaming call
-                        const stream = client.chatCompletionStream(requestParams);
-                        // Create controller for abort capability
-                        const controller = new AbortController();
-                        // Return a Stream object that wraps the gRPC stream
-                        return Stream_1.ApexStream.fromGrpcStream(stream, controller);
-                    }
-                    else {
-                        // For non-streaming, return a promise that resolves with the completion
-                        return new Promise((resolve, reject) => {
-                            client.chatCompletion(requestParams, (error, response) => {
-                                if (error) {
-                                    reject(error);
-                                    return;
-                                }
-                                resolve(response);
-                            });
-                        });
-                    }
-                },
+                create: chatCompletionsCreate.bind(this),
             },
         };
         /**

package/dist/lib/apex/Stream.d.ts

@@ -5,6 +5,9 @@ export type ReadableStreamInterface = ReadableStream<Uint8Array>;
  */
 export declare class ApexStream<Item> implements AsyncIterable<Item> {
     private iterator;
+    /**
+     * The AbortController for this stream. Call `abort()` to cancel the stream.
+     */
     controller: AbortController;
     constructor(iterator: () => AsyncIterator<Item>, controller: AbortController);
     /**

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.2.13";
+export declare const VERSION = "1.2.14";

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = "1.2.13";
+exports.VERSION = "1.2.14";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macrocosmos",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "description": "TypeScript SDK package for Macrocosmos",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",