Optimize and fix format (#9)

* Update structure and fix tool functions * Fix format * Add scripts for test * Convert useless code to temporary comment * Optimize allocate in methods * Fix scripts
Universal-Code-Modules · Aug 25, 2024 · c85579f · c85579f
1 parent 9ec3c56
commit c85579f
Show file tree

Hide file tree

Showing 5 changed files with 3,892 additions and 3,904 deletions.
diff --git a/files/openai/tools/test-library.js b/files/openai/tools/test-library.js
@@ -2,32 +2,29 @@
 
 const locations = [
   {
-    location: 'San Francisco',
+    location: 'San Francisco, CA',
     temperature: '72',
     unit: 'fahrenheit',
     age: '72',
   },
   {
-    location: 'Paris',
+    location: 'Paris, France',
     temperature: '22',
     unit: 'fahrenheit',
     age: '22',
   },
   {
-    location: 'Tokyo',
+    location: 'Tokyo, Japan',
     temperature: '10',
     unit: 'celsius',
     age: '10',
   },
 ];
 
-const getCurrentWeather = ({ location /*,unit = 'fahrenheit'*/ }) => {
-  const targetLocation = location.toLowerCase();
-  for (const expectedLocation of locations) {
-    const { location } = expectedLocation;
-    if (location.toLowerCase() === targetLocation) {
-      const result = { ...expectedLocation };
-      delete result.age;
+const getCurrentWeather = ({ location: targetLocation }) => {
+  for (const { location, temperature, unit } of locations) {
+    if (location === targetLocation) {
+      const result = { location, temperature, unit };
       return JSON.stringify(result);
     }
   }
@@ -38,13 +35,10 @@ const getCurrentWeather = ({ location /*,unit = 'fahrenheit'*/ }) => {
   });
 };
 
-const getCurrentAge = ({ location /*unit = 'years'*/ }) => {
-  const targetLocation = location.toLowerCase();
-  for (const expectedLocation of locations) {
-    const { location } = expectedLocation;
-    if (location.toLowerCase() === targetLocation) {
-      const result = { ...expectedLocation };
-      delete result.temperature;
+const getCurrentAge = ({ location: targetLocation }) => {
+  for (const { location, age, unit } of locations) {
+    if (location === targetLocation) {
+      const result = { location, age, unit };
       return JSON.stringify(result);
     }
   }
@@ -57,8 +51,6 @@ const getCurrentAge = ({ location /*unit = 'years'*/ }) => {
 
 const tools = [
   {
-    // name: "get_current_weather",
-
     fn: getCurrentWeather,
     scope: this,
     description: 'Get the current weather in a given location',
@@ -72,8 +64,6 @@ const tools = [
     required: ['location'],
   },
   {
-    // name: "get_current_weather",
-
     fn: getCurrentAge,
     scope: this,
     description: 'Get the current population average age in a given location',

diff --git a/lib/huggingface/connector.js b/lib/huggingface/connector.js
@@ -1,11 +1,10 @@
 'use strict';
 
 const { HfInference } = require('@huggingface/inference');
-
 const utils = require('./utils');
 const { DEFAULT_MODELS } = require('./config.json');
 
-const { tokens, custom } = utils;
+const { /* tokens, */ language } = utils;
 
 class Chat {
   //temperature = 0.7, topP = 1, frequencyPenalty = 0
@@ -15,47 +14,39 @@ class Chat {
     system,
     model = DEFAULT_MODELS.completions,
     tools,
-    maxTokens = 1000,
+    // maxTokens = 1000,
     // maxPrice = 0.1,
   }) {
     this.hf = new HfInference(apiKey);
     this.system = system;
     this.model = model;
     this.tools = tools;
-    this.maxTokens = maxTokens;
+    this.language = language(this.hf);
+    // this.maxTokens = maxTokens;
     // this.maxPrice = maxPrice;
 
-    this.messages = [];
-    this.tokens = 0;
-    this.price = 0;
+    // this.messages = [];
+    // this.tokens = 0;
+    // this.price = 0;
 
     // throw new Error(`Max ${maxTokens} tokens exceeded`);
   }
 
   async message({ text }) {
-    const tokenCount = await tokens.count({ text, model: this.model });
-    const { maxTokens, model } = this;
-
-    const increaseMaxTokens = tokens + tokenCount > maxTokens;
-    if (increaseMaxTokens) {
-      throw new Error(`Max ${this.maxTokens} tokens exceeded`);
-    }
-
-    const res = await custom(this.hf).generate({
-      text,
-      model,
-      messages: this.messages,
-      system: this.system,
-      tools: this.tools,
-    });
+    const { /* maxTokens, */ model } = this;
+    // const tokenCount = await tokens.count({ text, model });
 
-    if (res.error) return res.error.message;
+    // const increaseMaxTokens = tokens + tokenCount > maxTokens;
+    // if (increaseMaxTokens) {
+    //   throw new Error(`Max ${this.maxTokens} tokens exceeded`);
+    // }
+    const res = await this.language.textGeneration(text, model);
 
-    this.messages = res.messages;
-    this.tokens += res.usage.total_tokens;
-    this.price += res.usage.total_price;
+    // this.messages = res.messages;
+    // this.tokens += res.usage.total_tokens;
+    // this.price += res.usage.total_price;
 
-    return res.message;
+    return res;
   }
 
   /*

diff --git a/lib/openai/connector.js b/lib/openai/connector.js
@@ -23,6 +23,8 @@ class Chat {
     this.system = system;
     this.model = model;
     this.tools = tools;
+    this.language = language(this.openai);
+    this.speech = speech(this.openai);
     this.maxTokens = maxTokens;
     // this.maxPrice = maxPrice;
 
@@ -42,7 +44,7 @@ class Chat {
       throw new Error(`Max ${this.maxTokens} tokens exceeded`);
     }
 
-    const res = await language(this.openai).generate({
+    const res = await this.language.generate({
       text,
       model,
       messages: this.messages,
@@ -73,7 +75,7 @@ class Chat {
     let inputText = text;
 
     if (inputFilePath) {
-      inputText = await speech(this.openai).speechToText({
+      inputText = await this.speech.speechToText({
         pathToFile: inputFilePath,
       });
     }
@@ -106,7 +108,7 @@ class Chat {
     voice = DEFAULT_VOICE,
   }) {
     const start = measureTime();
-    await speech(this.openai).textToSpeech({
+    await this.speech.textToSpeech({
       text: outputText,
       pathToFile: outputFilePath,
       voice,