@surph_ai/sdk 0.0.12 → 0.0.13

package/deploy/index.js

@@ -1,13 +1,12 @@
 const path = require('path')
 const fs = require('fs')
-const axios = require('axios')
+// const axios = require('axios')
 const shell = require('shelljs')
 const colors = require('colors/safe') // https://www.npmjs.com/package/colors
 const bestzip = require('bestzip')
 
-// const PORTAL_URL = 'https://portal.turbo360.co'
-
-const RPC_URL = 'https://e3lunom2hka3u6iiotrlzrcez40uwdnk.lambda-url.us-east-1.on.aws'
+// const RPC_URL = 'https://e3lunom2hka3u6iiotrlzrcez40uwdnk.lambda-url.us-east-1.on.aws'
+const RPC_URL = 'https://rpc.surph.ai'
 const ZIP_NAME = 'LATEST.zip'
 const STATIC_ARCHIVE_NAME = 'Archive.zip'
 const DEFAULT_HEADERS = {
@@ -16,34 +15,40 @@ const DEFAULT_HEADERS = {
 }
 
 const rpcCall = async (action, args, headers = DEFAULT_HEADERS) => {
+  let path = null
+  if (action === 'uploadUrl') {
+    path = 's3/upload_url'
+  }
+  if (action === 'deployTool') {
+    path = 'tools/deploy'
+  }
+
   try {
-    const resp = await axios({
-      url: RPC_URL,
-      method: 'post',
-      headers,
-      data: {
-        action,
-        args
-      },
+    if (action === null) {
+      throw new Error(`Invalid action: ${action}`)
+    }
+
+    const resp = await fetch(`${RPC_URL}/${path}`, {
+      method: 'POST',
+      body: JSON.stringify(args),
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+        'x-surph-client': 'surph-sdk'
+      }
     })
 
-    return resp
+    const { response } = await resp.json()
+    if (response.error) {
+      throw new Error(response.error)
+    }
+
+    return response
   } catch (error) {
     throw error    
   }
 }
 
-const getUploadUrl = async (folder, filename, filetype = 'application/zip') => {
-  const resp = await rpcCall('uploadUrl', { folder, filename, filetype })
-
-  if (resp.data.confirmation !== 'success') {
-    throw new Error(resp.data.message)
-  }
-
-  const uploadUrl = resp.data.data.upload
-  return uploadUrl
-}
-
 /*
 // 09/17/2019 - this did not cover all scenarios. Windows worked fine (confirmed
 // by Marianne) but if on a funky linux distro, the "else" block failed.
@@ -81,12 +86,8 @@ const zipDirectory = (name = 'package.zip') => {
 }
 
 const compile = async (deployDir, name = 'package.zip', dir = null) => {
-  // let data = utils.readFile('package.json')
-  // const json = JSON.parse(data)
-
-  // delete json.devDependencies // prevent these from deploying
-
   shell.mkdir('-p', `${deployDir}/`)
+  shell.cp('-R', `node_modules/@surph_ai/sdk/deploy/tool-main.js`, `${deployDir}/main.js`)
 
   if (dir === null) {
     shell.cp('-R', '!(node_modules|deploy)', `${deployDir}/`) // copy everything but node_modules and deploy
@@ -98,6 +99,7 @@ const compile = async (deployDir, name = 'package.zip', dir = null) => {
   }
 
   shell.cd(deployDir)
+  shell.exec('npm install --production --silent')
 
   await zipDirectory(name) // package it up!
 
@@ -115,130 +117,38 @@ const compile = async (deployDir, name = 'package.zip', dir = null) => {
 }
 
 module.exports = {
-  project: async ({ TURBO_PROJECT_SLUG }) => {
-    if (!TURBO_PROJECT_SLUG) {
-      throw new Error(colors.white('Project undefined. Please check .env file.'))
+  tool: async ({ SURPH_TOOL_SLUG }) => {
+    if (!SURPH_TOOL_SLUG) {
+      throw new Error(colors.white('Tool undefined. Please check .env file.'))
     }
 
-    shell.cp('-R', path.join(__dirname, 'Dockerfile'), 'Dockerfile')
+    const { uploadUrl } = await rpcCall('uploadUrl', {
+      collection: 'tools',
+      folder: SURPH_TOOL_SLUG,
+      filename: `uploads/${ZIP_NAME}`,
+      filetype: 'application/zip'
+    })
 
-    const uploadUrl = await getUploadUrl('projects', `${TURBO_PROJECT_SLUG}/container/${ZIP_NAME}`)
+    // console.log('UPLOAD URL: ' + uploadUrl)
+    console.log(`\n${colors.white('Deploying tool. This usually takes a few minutes...')}\n`)
 
-    console.log(`\n${colors.white('Deploying project code. This usually takes a few minutes...')}\n`)
     await compile('.deploy', ZIP_NAME)
   
-    await axios({
-      url: uploadUrl,
-      method: 'put',
-      data: fs.readFileSync(ZIP_NAME),
+    await fetch(uploadUrl, {
+      method: 'PUT',
+      body: fs.readFileSync(ZIP_NAME),
       headers: {
+        'Accept': 'application/json',
         'Content-Type': 'application/zip'
-      }
+      }    
     })
 
     shell.rm('-rf', ZIP_NAME)
-    shell.rm('-rf', 'Dockerfile')
-
-    // trigger docker build in the cloud:
-    await rpcCall('deploy', { project: TURBO_PROJECT_SLUG })
 
     // connect container image to function:
-    await rpcCall('bind-image', { project: TURBO_PROJECT_SLUG })
-
-    console.log(colors.white('\nDeploy complete! To view your site, navigate to\n'))
-    console.log(colors.white(`https://${TURBO_PROJECT_SLUG}.vinely.site\n\n`))
-  },
-
-  static: async ({ TURBO_PROJECT_SLUG }) => {
-    if (!TURBO_PROJECT_SLUG) {
-      throw new Error(colors.white('Project undefined. Please check .env file.'))
-    }
-
-    const uploadUrl = await getUploadUrl('projects', `${TURBO_PROJECT_SLUG}/static/${STATIC_ARCHIVE_NAME}`)
-		await compile('.deploy', STATIC_ARCHIVE_NAME, 'public')
-
-    await axios({
-      url: uploadUrl,
-      method: 'put',
-      data: fs.readFileSync(STATIC_ARCHIVE_NAME),
-      headers: {
-        'Content-Type': 'application/zip'
-      }
-    })
-
-    shell.rm('-rf', STATIC_ARCHIVE_NAME)
-
-    try {
-    await rpcCall('sync', {
-      project: TURBO_PROJECT_SLUG,
-      folder: 'static',
-      file: STATIC_ARCHIVE_NAME
-    })
-    } catch (error) {
-    console.warn('FAIL: ' + error)
-    return
-    }
-
-    console.log(colors.white('\nStatic deployment complete! To view, navigate to\n'))
-    console.log(colors.white(`https://${TURBO_PROJECT_SLUG}.turbo360-static-sites.com\n\n`))
-  },
-
-  /*
-  // deploy app:
-  app: async ({ TURBO_APP_SLUG }) => {
-    let resp = await axios({
-      url: RPC_URL,
-      method: 'post',
-      data: {
-        action: 'appDeployments',
-        args: {
-          app: TURBO_APP_SLUG
-        }
-      },
-      headers: { Accept: 'application/json' }
-    })
-
-    const { confirmation, message, data } = resp.data
-    if (confirmation !== 'success') {
-      throw new Error(message)
-    }
-
-    const { deployments } = data
-    const deployment = `${deployments.length + 1}.zip`
-
-    resp = await axios({
-      url: RPC_URL,
-      method: 'post',
-      data: {
-        action: 'uploadUrl',
-        args: {
-          folder: 'apps',
-          // filename: `${TURBO_APP_SLUG}/${deployment}`,
-          filename: `${TURBO_APP_SLUG}/builds/${deployment}`,
-          filetype: 'application/zip'
-        }
-      },
-    })
-
-    if (resp.data.confirmation !== 'success') {
-      throw new Error(resp.data.message)
-    }
-
-    const uploadUrl = resp.data.data.upload
-
-		console.log('\nUploading app code...\n')
-		await compile('.deploy', deployment)
-
-    await axios({
-      url: uploadUrl,
-      method: 'put',
-      data: fs.readFileSync(deployment),
-      headers: {
-        'Content-Type': 'application/zip'
-      }
-    })
+    await rpcCall('deployTool', { tool: SURPH_TOOL_SLUG })
 
-    shell.rm('-rf', deployment)
+    console.log(colors.white('\nDeploy complete! To view your tool, navigate to\n'))
+    console.log(colors.white(`https://surph.ai/tool/${SURPH_TOOL_SLUG}\n\n`))
   }
-  */
 }

package/deploy/tool-main.js

@@ -0,0 +1,19 @@
+const tool = require('./tools')
+
+const handler = async (event) => {
+  const { args = {} } = event;
+  let payload = null;
+  try {
+      payload = await tool(args);
+  }
+  catch (error) {
+      payload = error instanceof Error ? error.message : String(error);
+  }
+  const response = {
+      statusCode: 200,
+      body: JSON.stringify(payload),
+  };
+  return response;
+};
+
+exports.handler = handler;

package/index.js

@@ -6,11 +6,10 @@
 // https://github.com/expressjs/generator/blob/master/bin/express-cli.js
 // https://developer.atlassian.com/blog/2015/11/scripting-with-node/
 
+const { Command } = require('commander')
 const path = require('path')
 const dotenv = require('dotenv')
-const axios = require('axios')
 const prompt = require('prompt')
-const { Command } = require('commander')
 const shell = require('shelljs')
 const colors = require('colors/safe')
 const AdmZip = require('adm-zip')
@@ -18,12 +17,10 @@ const auth = require('./auth')
 const deploy = require('./deploy')
 const scaffold = require('./scaffold')
 const utils = require('./utils')
-const Realm = require('./utils/Realm')
 const packageJson = require('./package.json')
 
 const VERSION = packageJson.version
-
-const PORTAL_URL = 'https://portal.turbo360.co'
+const SURPH_REST_URL = 'https://surph-mongo-http-19075ff8d93f.herokuapp.com'
 // const RPC_URL = 'https://e3lunom2hka3u6iiotrlzrcez40uwdnk.lambda-url.us-east-1.on.aws'
 
 // FUTURE: Export as a referenceable type
@@ -74,6 +71,7 @@ program.command('profile')
   console.log(text)
 })
 
+/*
 program.command('login')
 .description('login to Surph')
 .action(async (cmd, options) => {
@@ -100,21 +98,22 @@ program.command('login')
   }
 })
 
-// program.command('dev')
-// .description('run dev server')
-// .action(async (cmd, options) => {
-//   try {
-//   	// shell.cp('-R', path.join(__dirname, '../default/lambda/js/index.js'), 'vectors/js/index.js')
-// 		shell.cd(path.join(__dirname, 'base/Surph-base'))
-//     shell.exec('npm run dev')
-// 		// shell.cd('Surph-base')
+program.command('dev')
+.description('run dev server')
+.action(async (cmd, options) => {
+  try {
+  	// shell.cp('-R', path.join(__dirname, '../default/lambda/js/index.js'), 'vectors/js/index.js')
+		shell.cd(path.join(__dirname, 'base/Surph-base'))
+    shell.exec('npm run dev')
+		// shell.cd('Surph-base')
 
-//     // shell.exec('gulp build --gulpfile node_modules/@turbo360/turbo-sdk/src/gulpfile.js --silent')
+    // shell.exec('gulp build --gulpfile node_modules/@turbo360/turbo-sdk/src/gulpfile.js --silent')
 
-//   } catch (error) {
-//     utils.printError(error)
-//   }
-// })
+  } catch (error) {
+    utils.printError(error)
+  }
+})
+*/
 
 program.command('new <name>')
 .description('create new Surph app')
@@ -144,6 +143,7 @@ program.command('tool <name>')
 .description('create new Surph tool')
 .action(name => scaffold(name, 'tool'))
 
+/*
 program.command('connect')
 .description('Connect to Surph project')
 .action(async (cmd, options) => {
@@ -224,12 +224,81 @@ program.command('connect')
     utils.printError(error)
   }
 })
+*/
+
+program.command('publish')
+.description('Publish Surph tool')
+.action(async (cmd, options) => {
+  try {
+    const manifest = require('../../../tools/manifest.json')
+
+    // TODO: if not found try root directory.
+    if (!manifest) {
+      throw new Error('manifest.json not found')
+    }
+
+    const keys = Object.keys(manifest)
+    if (keys.length === 0) {
+      throw new Error('invalide manifest.json')
+    }
+
+    const slug = keys[0]
+
+    // console.log('Publish Surph tool: ' + JSON.stringify(manifest[slug]))
+
+    const url = `${SURPH_REST_URL}/rest/tool?slug=${slug}`
+    let resp = await fetch(url, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json',
+        'x-surph-client': 'surph-sdk'
+      }
+    })
+
+    const { payload } = await resp.json()
+
+    // tool not registered yet, create:
+    if (payload.length === 0) {
+      const resp = await fetch(url, {
+        method: 'POST',
+        body: JSON.stringify(manifest[slug]),
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          'x-surph-client': 'surph-sdk'
+        }
+      })
+    
+      const { payload } = await resp.json()
+      console.log('\nSurph tool registered: ' + JSON.stringify(payload))
+      return
+    }
+
+    resp = await fetch(`${SURPH_REST_URL}/rest/tool/${payload[0]._id}`, {
+      method: 'PUT',
+      body: JSON.stringify(manifest[slug]),
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+        'x-surph-client': 'surph-sdk'
+      }
+    })
+  
+    const data = await resp.json()
+    console.log('\nSurph tool updated: ' + JSON.stringify(data.payload))
+
+
+  } catch (error) {
+    
+  }
+})
+
 
 program.command('deploy')
-.option('-t, --type <default_or_static>', 'deployment type | static or default', 'default') // https://www.npmjs.com/package/commander#default-option-value
 .description('Deploy to Surph')
 .action(async (cmd, options) => {
   try {
+    /*
     const { type } = cmd
     if (type !== 'default' && type !== 'static') {
       const msg = colors.red(`\nError: Invalid deployment type ${type}.\n`) +
@@ -243,16 +312,9 @@ program.command('deploy')
         ERRORS.NOT_LOGGED_IN);
     }
 
-    const {
-      TURBO_PROJECT = null,
-      TURBO_PROJECT_SLUG = null
-    } = dotenv.parse(utils.readFile('.env') ?? '')
-
-    if (TURBO_PROJECT === null || TURBO_PROJECT_SLUG === null) {
-      program.error('Surph project not connected. To connect, run:\n\n$ vly connect', 
-        ERRORS.PROJECT_NOT_CONNECTED)
-    }
+    */
 
+    /*
     const apps = await Realm.restQuery('project', 'get', { slug: TURBO_PROJECT_SLUG })
     if (apps.length === 0) {
       program.error(`App ${TURBO_PROJECT} not found.`, ERRORS.PROJECT_NOT_FOUND)
@@ -262,14 +324,15 @@ program.command('deploy')
     if (!members.find(member => (member.id === user.id))) {
       program.error('Unauthorized', ERRORS.NOT_AUTHORIZED)
     }
+    */
 
-    // console.log('DEPLOY: ' + type)
-    // if (type === 'static') {
-    //   await deploy.static({ TURBO_PROJECT_SLUG })
-    //   return
-    // }
+    const { SURPH_TOOL = null } = dotenv.parse(utils.readFile('.env') ?? '')
+
+    if (SURPH_TOOL === null) {
+      program.error('Surph project not connected. To connect, run:\n\n$ surph connect', ERRORS.PROJECT_NOT_CONNECTED)
+    }
 
-    await deploy.project({ TURBO_PROJECT_SLUG })
+    await deploy.tool({ SURPH_TOOL_SLUG: SURPH_TOOL })
   } catch (error) {
     utils.printError(error)
     program.error(`Unexpected error: ${error}`, ERRORS.UNSPECIFIED)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surph_ai/sdk",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "",
   "main": "index.js",
   "publishConfig": {
@@ -18,18 +18,17 @@
   "dependencies": {
     "@aws-sdk/client-bedrock-runtime": "^3.1096.0",
     "adm-zip": "^0.5.10",
-    "axios": "^1.12.2",
     "bestzip": "^2.2.1",
     "cheerio": "^1.2.0",
     "colors": "^1.4.0",
-    "cookie": "^0.5.0",
     "commander": "^14.0.1",
+    "cookie": "^0.5.0",
     "cors": "^2.8.6",
     "dotenv": "^16.0.3",
     "express": "^4.18.1",
     "impit": "^0.14.0",
+    "mustache": "^4.2.0",
     "prompt": "^1.3.0",
-    "shelljs": "^0.8.5",
-    "mustache": "^4.2.0"
+    "shelljs": "^0.8.5"
   }
 }

package/scaffold/index.js

@@ -100,17 +100,17 @@ module.exports = (name, type = 'app') => {
     } , null, 2) + '\n')
 
     const slug = slugify(name, 8)
-    const manifest = {
-      slug: {
-        name,
-        slug,
-        type: 'custom',
-        description: '',
-        parameters: {
-          type: "object",
-          properties: {},
-          required: []
-        }
+
+    const manifest = {}
+    manifest[slug] = {
+      name,
+      slug,
+      type: 'custom',
+      description: '',
+      parameters: {
+        type: "object",
+        properties: {},
+        required: []
       }
     }
 

package/scaffold/tool/package.json

@@ -1,17 +1,18 @@
 {
-  "name": "base-template",
+  "name": "tool-template",
   "version": "0.0.0",
   "private": true,
   "scripts": {
     "dev": "surph toolserver & surph chatserver",
-    "test": "",
-    "build": ""
+    "deploy": "surph deploy",
+    "build": "",
+    "test": ""
   },
   "dependencies": {
-    "@surph_ai/sdk": "latest",
     "@vinely-ai/sdk": "^0.0.6"
   },
   "devDependencies": {
+    "@surph_ai/sdk": "latest",
     "nodemon": "^2.0.2"
   }
 }

package/scaffold/tool/tools/index.js

@@ -3,6 +3,6 @@
 
 module.exports = {
   demo: (args) => {
-    return `this is a sample tool: ${JSON.stringify(args)}`  
+    return `This is a sample tool: ${JSON.stringify(args)}. Remove this tool and replace it with your own.`
   }
 }

package/toolserver/routes/tool.js

@@ -12,10 +12,15 @@ const handler = async (args, tool) => {
   } catch (error) {
     errorMsg = error instanceof Error ? error.message : String(error)
   } finally {
-    return {
-      success: errorMsg === null ? true : false,
-      payload
-    }
+    const resp = { success: errorMsg === null ? true : false }
+
+    if (payload)
+      resp.payload = payload
+    
+    if (errorMsg !== null)
+      resp.error = errorMsg
+
+    return resp
   }
 }
 
@@ -34,12 +39,12 @@ router.get('/', async (req, res, next) => {
 
 router.get('/:tool', async (req, res, next) => {
   try {
-    const tool = tools[req.params.tool]
-    if (!tool) {
-      throw new Error(`Tool ${req.params.tool} not found.`)
-    }
+    // const tool = tools[req.params.tool]
+    // if (!tool) {
+    //   throw new Error(`Tool ${req.params.tool} not found.`)
+    // }
 
-    const response = await handler(req.query, tool)
+    const response = await handler(req.query, tools)
     res.json({ response })
   } catch (error) {
     res.json({
@@ -53,19 +58,16 @@ router.get('/:tool', async (req, res, next) => {
 
 router.post('/custom', async (req, res, next) => {
   // console.log('TOOL CALL: ' + JSON.stringify(req.body))
-  // {"name":"youtube-transcript","args":{"video":"m7kw0AhrMvQ"},"tool":{"name":"youtube-transcript","slug":"y2script","type":"custom","description":"Fetch the plain-text transcript (spoken words) of a YouTube video. Use this whenever the user asks about, quotes from, summarizes, or wants to search inside the content of a YouTube video — including questions like \"what does this video say about X\", \"summarize this video\", \"pull the transcript\", or when the user pastes a YouTube URL and expects you to know its contents. Do NOT use this for general video metadata (title, channel, view count) or for non-YouTube videos.","parameters":{"type":"object","properties":{"video":{"type":"string","description":"The YouTube video to transcribe. Accepts either a full URL (e.g. \"https://www.youtube.com/watch?v=EwusdkKUlwI\", \"https://youtu.be/EwusdkKUlwI\") or the bare 11-character video id (e.g. \"EwusdkKUlwI\"). Extract this from the user's message when they paste a link."}},"required":["video"]}},"user":{"id":"6a3d402f0817076e079e7398","username":"dkwon"}}
-
   try {
     const { name, args, tool, user = null } = req.body;
-    console.log('TOOL CALL: ' + name)
+    // console.log('TOOL CALL: ' + name)
     // console.log('TOOL ARGS: ' + JSON.stringify(args))
 
-    const _tool = tools[tool.slug]
-    if (!_tool) {
-      throw new Error(`Tool ${tool.name} not found.`)
+    if (process.env.SURPH_TOOL !== tool.slug) {
+      throw new Error(`Invalid tool ${tool.slug}. Check .env file.`)
     }
 
-    const response = await handler(args, _tool)
+    const response = await handler(args, tools)
     // console.log('TOOL RESP: ' + JSON.stringify(response))
     res.json({ response })
   } catch (error) {

package/utils/index.js

@@ -1,6 +1,5 @@
 const fs = require('fs')
 const colors = require('colors/safe')
-// const superagent = require('superagent')
 const dotenv = require('dotenv')
 const MODE_0666 = parseInt('0666', 8)
 

package/base/vinely-base/.nvmrc

@@ -1 +0,0 @@
-lts/jod

package/base/vinely-base/README.md

@@ -1,30 +0,0 @@
-# base-template
-
-This project was built with Vertex Labs. To learn more, click here: https://www.vtxlabs.io
-
-## Instructions
-After cloning into repo, cd to project root directory and install dependencies:
-
-```
-$ npm install
-```
-
-To run dev server, install Nodemon library globally:
-
-```
-$ sudo npm install nodemon -g
-```
-
-Then run devserver from project root directory:
-
-```
-$ nodemon
-```
-
-Open browser to:
-
-```
-http://localhost:3000
-```
-
-Profit!

package/base/vinely-base/app.js

@@ -1,5 +0,0 @@
-import turbo from '@turbo360/turbo-sdk'
-import server from './build/server/index.js'
-
-const entry = turbo.entry(() => server)
-export { entry }

package/base/vinely-base/declarations.d.ts

@@ -1 +0,0 @@
-declare module '@turbo360/turbo-sdk';