Merge pull request #124 from intelligentnode/123-replace-axios-with-native-fetch

replace axios with native fetch

Author: intelligentnode

IntelliNode/README.md

@@ -18,10 +18,10 @@
 Integrate your data with the latest language models and deep learning frameworks using intellinode **javascript**. The library provides intuitive functions for sending input to models like ChatGPT, WaveNet and Stable diffusion, and receiving generated text, speech, or images. With just a few lines of code, you can easily access the power of cutting-edge AI models to enhance your projects.
 
 # Latest Updates
-- Support Nvidia hosted models deepseek 🐳 and llama3 🦙.
-- Add Anthropic claude 3 chat.
+- Adjust the module to work backend and frontend.
+- Support Nvidia hosted models deepseek and llama3 🦙.
+- Add Anthropic claude 3.5 chat.
 - Add Google Gemini chat and vision.
-- Add Mistral MoE model as a chatbot provider.
 - Update stable diffusion to use the XL model engine. 🎨
 - Add support for hugging face inference. 🤗
 - Support in-memory semantic search. 🔍

IntelliNode/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "intellinode",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "description": "Create AI agents using the latest models, including ChatGPT, Llama, Diffusion, Cohere, Gemini, and Hugging Face.",
   "main": "index.js",
   "keywords": [
@@ -32,7 +32,7 @@
   },
   "homepage": "https://intellinode.ai",
   "dependencies": {
-    "axios": "^1.7.9",
+    "cross-fetch": "^4.1.0",
     "dotenv": "^16.4.7",
     "form-data": "^4.0.1"
   }

IntelliNode/package.json

@@ -73,7 +73,7 @@ async function testOpenaiChatGPTCase3() {
     console.log('\nChat test case 3: \n');
 
     const sysMsg = "You are a helpful assistant.";
-    const input = new ChatGPTInput(sysMsg, { model: "gpt-3.5-turbo-0613" });
+    const input = new ChatGPTInput(sysMsg, { model: "o3-mini" });
     input.addMessage(new ChatGPTMessage("Please return the current date and time in Dublin.", "user"));
 
     const functions = [

IntelliNode/test/integration/Chatbot.test.js

@@ -5,8 +5,6 @@ Copyright 2023 Github.com/Barqawiz/IntelliNode
 
    Licensed under the Apache License, Version 2.0 (the "License");
 */
-const axios = require('axios');
-
 class ConnHelper {
   constructor() {
   }

IntelliNode/utils/ConnHelper.js

@@ -0,0 +1,105 @@
+const fetch = require('cross-fetch');
+const FormData = require('form-data');
+
+class FetchClient {
+  constructor({ baseURL = '', headers = {} } = {}) {
+    this.baseURL = baseURL;
+    this.defaultHeaders = headers;
+  }
+
+  /**
+   * Send a POST request using cross-fetch.
+   * 
+   * @param {string} endpoint - URL path or full URL if starts with http.
+   * @param {object|FormData} data - Data to send in the request body.
+   * @param {object} extraConfig - Optional config (e.g. { responseType: 'arraybuffer' | 'stream' }).
+   * @returns {Promise<any|ReadableStream|ArrayBuffer>} - JSON by default, or stream/arrayBuffer if specified.
+   */
+  async post(endpoint, data, extraConfig = {}) {
+    const url = endpoint.startsWith('http')
+      ? endpoint
+      : this.baseURL + endpoint;
+
+    // Decide how to handle the request body
+    let body;
+    if (data instanceof FormData) {
+      // Use FormData directly (e.g., file uploads)
+      body = data;
+    } else if (data !== undefined) {
+      // Assume JSON
+      body = JSON.stringify(data);
+    }
+
+    // Merge default and extra headers
+    const headers = {
+      ...this.defaultHeaders,
+      ...(extraConfig.headers || {})
+    };
+
+    // If using FormData in Node, merge the form's headers
+    if (data instanceof FormData) {
+      Object.assign(headers, data.getHeaders());
+    }
+
+    const config = {
+      method: 'POST',
+      headers,
+      body
+    };
+
+    // Make the request
+    const response = await fetch(url, config);
+
+    // Check for HTTP error
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`HTTP error ${response.status}: ${errorText}`);
+    }
+
+    // Handle custom response types
+    if (extraConfig.responseType === 'arraybuffer') {
+      return await response.arrayBuffer();
+    } else if (extraConfig.responseType === 'stream') {
+      // Return raw body stream (ReadableStream in browser / Node 18+)
+      return response.body;
+    } else {
+      // Default: parse JSON
+      return await response.json();
+    }
+  }
+
+  /**
+   * Send a GET request using cross-fetch.
+   * 
+   * @param {string} endpoint - URL path or full URL if starts with http.
+   * @param {object} extraConfig - Optional config (e.g. { responseType: 'arraybuffer' }).
+   * @returns {Promise<any|ReadableStream|ArrayBuffer>} - JSON by default, or stream/arrayBuffer if specified.
+   */
+  async get(endpoint, extraConfig = {}) {
+    const url = endpoint.startsWith('http')
+      ? endpoint
+      : this.baseURL + endpoint;
+
+    const headers = {
+      ...this.defaultHeaders,
+      ...(extraConfig.headers || {})
+    };
+
+    const response = await fetch(url, { method: 'GET', headers });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`HTTP error ${response.status}: ${errorText}`);
+    }
+
+    if (extraConfig.responseType === 'arraybuffer') {
+      return await response.arrayBuffer();
+    } else if (extraConfig.responseType === 'stream') {
+      return response.body;
+    } else {
+      return await response.json();
+    }
+  }
+}
+
+module.exports = FetchClient;

IntelliNode/utils/FetchClient.js

@@ -1,31 +1,31 @@
-const axios = require('axios');
+const FetchClient = require('../utils/FetchClient');
 
 class AWSEndpointWrapper {
   constructor(apiUrl, apiKey = null) {
     this.API_BASE_URL = apiUrl;
 
     let headers = {
-      'Content-Type': 'application/json'
+      'Content-Type': 'application/json',
     };
-    // sdd the API kry if provided
+
     if (apiKey) {
       headers['Authorization'] = `Bearer ${apiKey}`;
     }
-    // Configure axios
-    this.httpClient = axios.create({
+
+    // Create our FetchClient with the base url + default headers
+    this.client = new FetchClient({
       baseURL: this.API_BASE_URL,
-      headers
+      headers: headers,
     });
   }
 
   async predict(inputData) {
     try {
-      const response = await this.httpClient.post('', inputData);
-      return response.data;
+      return await this.client.post('', inputData);
     } catch (error) {
-      throw error;
+      throw error; // You can wrap this in a custom error message if you wish
     }
   }
 }
 
-module.exports = AWSEndpointWrapper;
+module.exports = AWSEndpointWrapper;

IntelliNode/wrappers/AWSEndpointWrapper.js

@@ -5,35 +5,37 @@ Copyright 2023 Github.com/Barqawiz/IntelliNode
 
    Licensed under the Apache License, Version 2.0 (the "License");
 */
-const axios = require('axios');
 const config = require('../config.json');
 const connHelper = require('../utils/ConnHelper');
+const FetchClient = require('../utils/FetchClient');
 
 class AnthropicWrapper {
-    constructor(apiKey) {
-        this.API_BASE_URL = config.url.anthropic.base;
-        this.API_VERSION = config.url.anthropic.version;
-        this.httpClient = axios.create({
-            baseURL: this.API_BASE_URL,
-            headers: {
-                'Content-Type': 'application/json',
-                'Accept': 'application/json',
-                'x-api-key': apiKey,
-                'anthropic-version': this.API_VERSION
-            }
-        });
-    }
+  constructor(apiKey) {
+    this.API_BASE_URL = config.url.anthropic.base;
+    this.API_VERSION = config.url.anthropic.version;
 
-    async generateText(params) {
-        const url = config.url.anthropic.messages;
-        try {
-            const response = await this.httpClient.post(url, params);
-            return response.data;
-        } catch (error) {
-            throw new Error(connHelper.getErrorMessage(error));
-        }
-    }
+    // Create our FetchClient instance
+    this.client = new FetchClient({
+      baseURL: this.API_BASE_URL,
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+        'x-api-key': apiKey,
+        'anthropic-version': this.API_VERSION,
+      },
+    });
+  }
 
+  async generateText(params) {
+    const endpoint = config.url.anthropic.messages;
+
+    try {
+      // Use the client’s post method
+      return await this.client.post(endpoint, params);
+    } catch (error) {
+      throw new Error(connHelper.getErrorMessage(error));
+    }
+  }
 }
 
-module.exports = AnthropicWrapper;
+module.exports = AnthropicWrapper;