toolbox returns object instead of array

Author: nbonamy

client/src/index.ts

@@ -130,7 +130,7 @@ export class NestorClient {
       if (response.ok) {
         const toolbox = await response.json()
         this.logger?.log(`Fetched toolbox at ${url}`)
-        hub.tools = toolbox
+        hub.tools = toolbox.tools
       }
     } catch (err) {
       this.logger?.error(`Error while fetching tools from hub ${hub.name}`, err)

client/tests/client.test.ts

@@ -4,20 +4,20 @@ import { NestorClient } from '../src/index'
 import mdns from 'mdns'
 
 global.fetch = vi.fn((req) => {
-  if (req.includes('6000')) return { ok: true, json: () => [] }
-  if (req.includes('6001')) return { ok: true, json: () => [ 1, 2, 3 ] }
+  if (req.includes('6000')) return { ok: true, json: () => { return { tools:[] } } }
+  if (req.includes('6001')) return { ok: true, json: () => { return { tools:[ 1, 2, 3 ] } } }
   if (req.includes('6003')) throw new Error('not supposed to happen')
   if (req.includes('6002')) {
     if (req.includes('toolbox')) {
-      return { ok: true, json: () => [ 
-        { function: { name: 'tool', url: 'localhost:3004'}}
-      ]}
+      return { ok: true, json: () => { return { tools: [ 
+        { function: { name: 'tool', url: 'localhost:3004'} }
+      ]}}}
     } else {
       return { ok: true, json: () => { return { result: 'ok' }}}
     }
   }
   // assuming other ports are real hubs
-  return { ok: true, json: () => [] }
+  return { ok: true, json: () => { return { tools: [] } } }
 })
 
 const logger = {

hub/src/routes/toolbox.ts

@@ -10,7 +10,7 @@ router.get(['/', '/:format'], (req, res) => {
 
     const marshaller = new Marshaller()
     if (req.params.format === undefined || req.params.format === 'openai') {
-      res.json(marshaller.toOpenAI(req.serviceDirectory))
+      res.json({ tools: marshaller.toOpenAI(req.serviceDirectory) })
     } else {
       res.status(400).send({ error: 'invalid format' })
     }