memory & test

scripts/build_tools/save_tools.ts

@@ -277,8 +277,8 @@ export async function saveToolsInNode(toolsOriginal: DirectoryEntry[]): Promise<
   const tools: DirectoryEntry[] = JSON.parse(JSON.stringify(toolsOriginal));
   const toolsSaved: DirectoryEntry[] = [];
   for (const tool of tools) {
-      // Wait 250ms between tool uploads
-      await new Promise(resolve => setTimeout(resolve, 250));
+      // Wait 50ms between tool uploads
+      await new Promise(resolve => setTimeout(resolve, 50));
 
       // Read files
       const metadata: Metadata = JSON.parse(await Deno.readTextFile(join(tool.dir, "metadata.json")));
@@ -353,12 +353,6 @@ export async function saveToolsInNode(toolsOriginal: DirectoryEntry[]): Promise<
           args: [zipPath, '-d', zipPathFiles],
         });
         await unzip.output();
-
-        // Enable flag to update reference files
-        // copy the unzipped __tool.json to the tool directory as .tool-dump.test.json
-        if (Deno.env.get("UPDATE_DUMP_FILES")) {
-          await Deno.copyFile(join(zipPathFiles, "__tool.json"), join(tool.dir, ".tool-dump.test.json"));
-        }
 
       } catch {
         console.error(`Error: Invalid zip file downloaded for ${tool.name}`);

scripts/tests/tool-memory.test.ts

@@ -0,0 +1,102 @@
+const code = Deno.readTextFileSync(import.meta.dirname + '/../../tools/memory/tool.ts');
+const metadata = JSON.parse(Deno.readTextFileSync(import.meta.dirname + '/../../tools/memory/metadata.json'));
+
+type INPUTS = {
+    data?: string;
+    general_prompt?: string;
+    specific_prompt?: string;
+    key?: string;
+};
+const X_SHINKAI_TOOL_ID = `example-${Math.random().toString(36).substring(2, 15)}`;
+const X_SHINKAI_APP_ID = `run-${Math.random().toString(36).substring(2, 15)}`;
+
+const base_url = Deno.env.get('SHINKAI_NODE_ADDR') ?? 'http://localhost:9950';
+const token = Deno.env.get('BEARER_TOKEN') ?? 'debug';
+const llm_provider = Deno.env.get('INITIAL_AGENT_NAMES') ? (Deno.env.get('INITIAL_AGENT_NAMES')??'').split(',')[0] : 'llama3_1_8b';
+async function runCommandTest(parameters: INPUTS) {
+    const response = await fetch(base_url + '/v2/code_execution', {
+        method: 'POST',
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'x-shinkai-tool-id': X_SHINKAI_TOOL_ID,
+            'x-shinkai-app-id': X_SHINKAI_APP_ID,
+            'x-shinkai-llm-provider': llm_provider,
+            'Content-Type': 'application/json; charset=utf-8',
+        },
+        body: JSON.stringify({
+            code,
+            tool_type: 'denodynamic',
+            llm_provider,
+            tools: metadata.tools || [],
+            parameters
+        })
+    });
+
+    const data = await response.json();
+    return data;
+}
+
+export async function memoryTest() {
+    const expect = (data: any, message: string | undefined, errorStr: string | undefined) => {
+        if (!data) throw Error('[Check failed] ' + (message ?? '') + ' ' + (errorStr ?? ''));
+        else console.log('[Check passed] ' + (message ?? ''));
+    }
+
+    const parametersA: INPUTS = {
+        data: 'Chile,[a] officially the Republic of Chile,[b] is a country in western South America. It is the southernmost country in the world and the closest to Antarctica, stretching along a narrow strip of land between the Andes Mountains and the Pacific Ocean. Chile had a population of 17.5 million as of the latest census in 2017 and has a territorial area of 756,102 square kilometers (291,933 sq mi),[10][3] sharing borders with Peru to the north, Bolivia to the northeast, Argentina to the east, and the Drake Passage to the south. The country also controls several Pacific islands, including Juan Fernández, Isla Salas y Gómez, Desventuradas, and Easter Island, and claims about 1,250,000 square kilometers (480,000 sq mi) of Antarctica as the Chilean Antarctic Territory.[nb 2] The capital and largest city of Chile is Santiago, and the national language is Spanish.',
+    }
+    const dataA= await runCommandTest(parametersA);
+    // console.log('================================\nExpected: Chile\n', dataA.generalMemory);
+    expect(dataA.generalMemory.match(/Chile/i), '0. Chile found', JSON.stringify(dataA));
+
+    const parametersB: INPUTS = {
+        data: 'Argentina,[C] officially the Argentine Republic,[A][D] is a country in the southern half of South America. Argentina covers an area of 2,780,400 km2 (1,073,500 sq mi),[B] making it the second-largest country in South America after Brazil, the fourth-largest country in the Americas, and the eighth-largest country in the world. It shares the bulk of the Southern Cone with Chile to the west, and is also bordered by Bolivia and Paraguay to the north, Brazil to the northeast, Uruguay and the South Atlantic Ocean to the east, and the Drake Passage to the south. Argentina is a federal state subdivided into twenty-three provinces, and one autonomous city, which is the federal capital and largest city of the nation, Buenos Aires. The provinces and the capital have their own constitutions, but exist under a federal system. Argentina claims sovereignty over the Falkland Islands, South Georgia and the South Sandwich Islands, the Southern Patagonian Ice Field, and a part of Antarctica.',
+    }
+
+    const dataB = await runCommandTest(parametersB);
+    // console.log('================================\nExpected: Chile & Argentina\n', dataB.generalMemory);
+    expect(dataB.generalMemory.match(/Chile/i), '1. Chile found', JSON.stringify(dataB));
+    expect(dataB.generalMemory.match(/Argentina/i), '2. Argentina found', JSON.stringify(dataB));
+
+    const parametersC: INPUTS = {
+        data: 'Spain,[f] officially the Kingdom of Spain,[a][g] is a country in Southwestern Europe with territories in North Africa.[12][h] Featuring the southernmost point of continental Europe, it is the largest country in Southern Europe and the fourth-most populous European Union member state. Spanning across the majority of the Iberian Peninsula, its territory also includes the Canary Islands, in the Eastern Atlantic Ocean, the Balearic Islands, in the Western Mediterranean Sea, and the autonomous cities of Ceuta and Melilla, in Africa. Peninsular Spain is bordered to the north by France, Andorra, and the Bay of Biscay; to the east and south by the Mediterranean Sea and Gibraltar; and to the west by Portugal and the Atlantic Ocean. Spain\'s capital and largest city is Madrid, and other major urban areas include Barcelona, Valencia, Seville, Zaragoza, Málaga, Murcia and Palma de Mallorca.',
+        key: 'spain'
+    };
+
+    const dataC = await runCommandTest(parametersC);
+    // console.log('================================\nExpected: Spain\n', dataC.specificMemory);
+    expect(dataC.specificMemory.match(/Spain/i), '3. Spain found', JSON.stringify(dataC));
+    expect(!dataC.specificMemory.match(/Chile/i), '4. Chile not found', JSON.stringify(dataC));
+    expect(!dataC.specificMemory.match(/Argentina/i), '5. Argentina not found', JSON.stringify(dataC));
+
+    const parametersD: INPUTS = {
+        data: 'France,[X] officially the French Republic,[XI] is a country located primarily in Western Europe. Its overseas regions and territories include French Guiana in South America, Saint Pierre and Miquelon in the North Atlantic, the French West Indies, and many islands in Oceania and the Indian Ocean, giving it one of the largest discontiguous exclusive economic zones in the world. Metropolitan France shares borders with Belgium and Luxembourg to the north, Germany to the northeast, Switzerland to the east, Italy and Monaco to the southeast, Andorra and Spain to the south, and a maritime border with the United Kingdom to the northwest. Its metropolitan area extends from the Rhine to the Atlantic Ocean and from the Mediterranean Sea to the English Channel and the North Sea. Its eighteen integral regions—five of which are overseas—span a combined area of 643,801 km2 (248,573 sq mi) and have a total population of nearly 68.4 million as of January 2024. France is a semi-presidential republic with its capital in Paris, the country\'s largest city and main cultural and economic centre.',        // key: 'key'
+        key: 'france'
+    }
+    const dataD = await runCommandTest(parametersD);
+    // console.log('================================\nExpected: France\n', dataD.specificMemory);
+    expect(dataD.specificMemory.match(/France/i), '6. France found', JSON.stringify(dataD));
+
+    const parametersE: INPUTS = {
+    };
+    const dataE = await runCommandTest(parametersE);
+    // console.log('================================\nExpected: Chile & Argentina\n', dataE.generalMemory);
+    expect(dataE.generalMemory.match(/Chile/i), '7. Chile found', JSON.stringify(dataE));
+    expect(dataE.generalMemory.match(/Argentina/i), '8. Argentina found', JSON.stringify(dataE));
+    expect(!dataE.specificMemory.match(/Spain/i), '9. Spain not found', JSON.stringify(dataE));
+
+    const parametersF: INPUTS = {
+        key: 'spain'
+    };
+    const dataF = await runCommandTest(parametersF);
+    // console.log('================================\nExpected: Spain\n', dataF.specificMemory);
+    expect(dataF.specificMemory.match(/Spain/i), '10. Spain found', JSON.stringify(dataF));
+
+    const parametersG: INPUTS = {
+        key: 'england'
+    };
+    const dataG = await runCommandTest(parametersG);
+    // console.log('================================\nExpected: None\n', dataG.specificMemory);
+    expect(dataG.specificMemory === '' || dataG.specificMemory === null, '11. Empty memory', JSON.stringify(dataG));
+}
+

scripts/zip.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "jsr:@std/assert";
+import { assertEquals, equal } from "jsr:@std/assert";
 import { getMetadata, processToolsDirectory, saveToolsInNode } from "./build_tools/save_tools.ts";
 import { join } from "https://deno.land/std/path/mod.ts";
 import { exists } from "https://deno.land/std/fs/mod.ts";
@@ -53,9 +53,21 @@ Deno.test("Compare shinkai-node generated ZIP __tool.json vs .tool-dump.test.jso
     // Embeddings might change.
     zipToolData.content[0].embedding = [];
     toolDumpData.content[0].embedding = [];
-    assertEquals(zipToolData, toolDumpData);
+
+    // Enable flag to update reference files
+    // copy the unzipped __tool.json to the tool directory as .tool-dump.test.json
+    if (Deno.env.get("UPDATE_DUMP_FILES")) {
+      if (!equal(zipToolData, toolDumpData)) {
+        console.log('Updating reference file:', entryx.name);
+        await Deno.copyFile(join(zipDir, "__tool.json"), join(toolDir, ".tool-dump.test.json"));
+      }
+    } else {
+      assertEquals(zipToolData, toolDumpData);
+    }
   }
-
 });
 
 
+// Deno.test("Check if memory is working", async () => {
+//   await memoryTest();
+// });