Skip to content
This repository has been archived by the owner on Oct 10, 2024. It is now read-only.

Don't override global fetch & fix tests #63

Closed
wants to merge 7 commits into from
Closed

Don't override global fetch & fix tests #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
67a6d8d
don't override global fetch & fix tests
AntoineAtMistral Apr 26, 2024
b235541
don't override global fetch & fix tests
AntoineAtMistral Apr 26, 2024
3a3156f
Merge branch 'main' of https://github.com/AntoineAtMistral/client-js
AntoineAtMistral Apr 26, 2024
eafdcaf
Merge branch 'main' of https://github.com/AntoineAtMistral/client-js
AntoineAtMistral Apr 26, 2024
c268eb2
Merge branch 'main' of https://github.com/AntoineAtMistral/client-js
AntoineAtMistral Apr 26, 2024
f8d6801
Merge branch 'main' of https://github.com/AntoineAtMistral/client-js
AntoineAtMistral Apr 26, 2024
8edf10b
Merge branch 'main' of https://github.com/AntoineAtMistral/client-js
AntoineAtMistral Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ const ENDPOINT = 'https://api.mistral.ai';
* @return {Promise<void>}
*/
async function initializeFetch() {
if (typeof window === 'undefined' ||
typeof globalThis.fetch === 'undefined') {
const nodeFetch = await import('node-fetch');
fetch = nodeFetch.default;
if (typeof window === 'undefined') {
Copy link
Contributor

@sublimator sublimator Apr 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments:

window is also not defined in service workers, as used by Web Extensions, using manifest version 3

It seems the isNode flag is used to determine when to return the response.body directly from the _request method, vs implementing an async iterator.

In fact, in newer versions of node, with native fetch you need to do much the same, so isNode is a somewhat deceptive name here. It's more node-fetch specific if I'm not mistaken

In any case, this library should work in:

  1. browser in a normal page
  2. browser in a service worker
  3. an older version of node, without native fetch
  4. a newer version of node, with native fetch

isNode = true;
}

if (typeof globalThis.fetch === 'undefined') {
const nodeFetch = await import('node-fetch');
globalThis.mistralFetch = nodeFetch.default;
} else {
fetch = globalThis.fetch;
globalThis.mistralFetch = globalThis.fetch;
}
}

initializeFetch();
await initializeFetch();

/**
* MistralAPIError
Expand Down Expand Up @@ -90,7 +92,7 @@ class MistralClient {

for (let attempts = 0; attempts < this.maxRetries; attempts++) {
try {
const response = await fetch(url, options);
const response = await globalThis.mistralFetch(url, options);

if (response.ok) {
if (request?.stream) {
Expand Down
18 changes: 9 additions & 9 deletions tests/client.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Mistral Client', () => {
it('should return a chat response object', async() => {
// Mock the fetch function
const mockResponse = mockChatResponsePayload();
globalThis.fetch = mockFetch(200, mockResponse);
globalThis.mistralFetch = mockFetch(200, mockResponse);

const response = await client.chat({
model: 'mistral-small',
Expand All @@ -37,7 +37,7 @@ describe('Mistral Client', () => {
it('should return a chat response object if safeMode is set', async() => {
// Mock the fetch function
const mockResponse = mockChatResponsePayload();
globalThis.fetch = mockFetch(200, mockResponse);
globalThis.mistralFetch = mockFetch(200, mockResponse);

const response = await client.chat({
model: 'mistral-small',
Expand All @@ -55,7 +55,7 @@ describe('Mistral Client', () => {
it('should return a chat response object if safePrompt is set', async() => {
// Mock the fetch function
const mockResponse = mockChatResponsePayload();
globalThis.fetch = mockFetch(200, mockResponse);
globalThis.mistralFetch = mockFetch(200, mockResponse);

const response = await client.chat({
model: 'mistral-small',
Expand All @@ -75,7 +75,7 @@ describe('Mistral Client', () => {
it('should return parsed, streamed response', async() => {
// Mock the fetch function
const mockResponse = mockChatResponseStreamingPayload();
globalThis.fetch = mockFetchStream(200, mockResponse);
globalThis.mistralFetch = mockFetchStream(200, mockResponse);

const response = await client.chatStream({
model: 'mistral-small',
Expand All @@ -98,7 +98,7 @@ describe('Mistral Client', () => {
it('should return parsed, streamed response with safeMode', async() => {
// Mock the fetch function
const mockResponse = mockChatResponseStreamingPayload();
globalThis.fetch = mockFetchStream(200, mockResponse);
globalThis.mistralFetch = mockFetchStream(200, mockResponse);

const response = await client.chatStream({
model: 'mistral-small',
Expand All @@ -122,7 +122,7 @@ describe('Mistral Client', () => {
it('should return parsed, streamed response with safePrompt', async() => {
// Mock the fetch function
const mockResponse = mockChatResponseStreamingPayload();
globalThis.fetch = mockFetchStream(200, mockResponse);
globalThis.mistralFetch = mockFetchStream(200, mockResponse);

const response = await client.chatStream({
model: 'mistral-small',
Expand All @@ -148,7 +148,7 @@ describe('Mistral Client', () => {
it('should return embeddings', async() => {
// Mock the fetch function
const mockResponse = mockEmbeddingResponsePayload();
globalThis.fetch = mockFetch(200, mockResponse);
globalThis.mistralFetch = mockFetch(200, mockResponse);

const response = await client.embeddings(mockEmbeddingRequest);
expect(response).toEqual(mockResponse);
Expand All @@ -159,7 +159,7 @@ describe('Mistral Client', () => {
it('should return batched embeddings', async() => {
// Mock the fetch function
const mockResponse = mockEmbeddingResponsePayload(10);
globalThis.fetch = mockFetch(200, mockResponse);
globalThis.mistralFetch = mockFetch(200, mockResponse);

const response = await client.embeddings(mockEmbeddingRequest);
expect(response).toEqual(mockResponse);
Expand All @@ -170,7 +170,7 @@ describe('Mistral Client', () => {
it('should return a list of models', async() => {
// Mock the fetch function
const mockResponse = mockListModels();
globalThis.fetch = mockFetch(200, mockResponse);
globalThis.mistralFetch = mockFetch(200, mockResponse);

const response = await client.listModels();
expect(response).toEqual(mockResponse);
Expand Down