@surph_ai/cli 0.0.8 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surph_ai/cli",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "",
   "main": "index.js",
   "types": "./types.d.ts",

package/scaffold/index.js

@@ -79,6 +79,9 @@ module.exports = (name, type = 'app') => {
     shell.cp('-R', path.join(__dirname, `tool/examples/weather/index.ts`), 'examples/weather/index.ts')
     shell.cp('-R', path.join(__dirname, `tool/examples/weather/manifest.json`), 'examples/weather/manifest.json')
 
+    shell.mkdir('-p', 'examples/dealfinder')
+    shell.cp('-R', path.join(__dirname, `tool/examples/dealfinder/index.ts`), 'examples/dealfinder/index.ts')
+    shell.cp('-R', path.join(__dirname, `tool/examples/dealfinder/manifest.json`), 'examples/dealfinder/manifest.json')
 
 
     utils.write('manifest-example.json', JSON.stringify({

package/scaffold/tool/examples/dealfinder/index.ts

@@ -0,0 +1,45 @@
+import type { ToolHandler } from '@surph_ai/sdk';
+import { surph } from '@surph_ai/sdk';
+
+// your custom tool args goes here
+type ToolArgs = {
+  preferences: string[]
+};
+
+const handler: ToolHandler<ToolArgs> = async ({ args, user, context }: Record<string, any>) => {
+  try {
+    if (!args) {
+      throw new Error('Args required.')
+    }
+
+    if (!context) {
+      throw new Error('Context required.')
+    }
+
+    const { preferences } = args; // string[]
+    const searchQuery = preferences.join(', ')
+
+    const searchResults = await surph.search(searchQuery, context)
+
+    const promptResponse = await surph.prompt({
+      instructions: `searchResults is a JSON array data feed of events and announcements. Your job is to sort each item into one of three categories: offering free food, free event, or free giveaway (such as raffles, prizes, etc.).`,
+      prompt: `Given this list of items, separate them into free food, free event, or free giveaway:\n\n${JSON.stringify(searchResults)}`,
+      output: {
+        name: 'deal_search_results',
+        description: 'The deal search results',
+        fields: [
+          { name: 'food', type: 'array', description: 'a list of events and announcements with free food.' },
+          { name: 'event',  type: 'array', description: 'a list of events that are free to attend.' },
+          { name: 'items', type: 'array', description: 'a list of events and announcements with free items.' }
+        ]
+      }
+    })
+
+    return promptResponse
+  } catch (error) {
+    throw error
+  }
+};
+
+export default handler;
+

package/scaffold/tool/examples/dealfinder/manifest.json

@@ -0,0 +1,21 @@
+{
+  "deal-finder-q9je7jou": {
+    "name": "deal-finder",
+    "slug": "deal-finder-q9je7jou",
+    "type": "custom",
+    "description": "Search the user's active Surph context for local deals, discounts, promotions, specials, sales, and related opportunities across food, drinks, restaurants, shops, events, entertainment, and other businesses or venues covered by the context. Use whenever the user asks to find, compare, filter, or recommend current or upcoming local deals—including requests for happy hours, meal specials, event discounts, retail sales, coupons, or promotions. Prefer this instead of webSearch when the requested local businesses, venues, events, or listings are represented in the active Surph context.",
+    "parameters": {
+      "type": "object",
+      "properties": {
+        "preferences": {
+          "type": "array",
+          "description": "Optional free-form preferences, categories, constraints, or deal criteria to prioritize, such as food, drinks, events, retail sales, happy hour, nearby neighborhoods, budget, dates, or specific businesses.",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "required": []
+    }
+  }
+}

package/toolserver/app.js

@@ -1,5 +1,6 @@
 const express = require('express')
 const vinely = require('@vinely-ai/sdk')
+const { config } = require('./middleware/index.js')
 
 const app = express()
 
@@ -8,18 +9,22 @@ vinely.configureApp(app, {
   static: 'public',
 })
 
-app.use((req, res, next) => {
-  res.setHeader('Access-Control-Allow-Origin', '*')
-  res.header('Access-Control-Allow-Headers', 'x-surph-user, Content-Type');
-  res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
-  if (req.method === 'OPTIONS') return res.sendStatus(204);
-  next()
-})
+app.use(config)
 
-const index = require('./routes/index')
+// app.use((req, res, next) => {
+//   res.setHeader('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'x-surph-user, Content-Type');
+//   res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+//   if (req.method === 'OPTIONS') return res.sendStatus(204);
+//   next()
+// })
+
+const api = require('./routes/api')
 const tool = require('./routes/tool')
+const index = require('./routes/index')
 
-app.use('/', index)
+app.use('/api', api)
 app.use('/tools', tool)
+app.use('/', index)
 
 module.exports.entry = vinely.server(app)

package/toolserver/middleware/config.js

@@ -0,0 +1,40 @@
+// this is meant to mimic production environment
+// so no need to distinguish between local and production
+
+let config = null;
+
+const CDN = 'https://surph.s3.us-east-1.amazonaws.com/webapp/static';
+
+const fetchDesktopConfig = async () => {
+  const response = await fetch('https://surph.s3.us-east-1.amazonaws.com/admin/desktop/config.json');
+  const data = await response.json();
+  return data;
+}
+
+const fetchWebConfig = async () => {
+  const response = await fetch('https://surph.s3.us-east-1.amazonaws.com/webapp/static/dist/prod/imports.json');
+  const data = await response.json();
+  return { imports: data }
+}
+
+module.exports = async (req, res, next) => {
+  const webConfig = await fetchWebConfig(); // always fetch the latest imports.json
+
+  if (config !== null) {
+    req.config = { ...config, ...webConfig };
+    // console.log('CACHED CONFIG: ', req.config);
+    return next();
+  }
+
+  const desktopConfig = await fetchDesktopConfig();
+  config = {
+    ...desktopConfig,
+    ...webConfig,
+    isLocal: false,
+    isDev: true, // this is undefined in production.
+    CDN,
+  };
+
+  req.config = config;
+  next();
+};

package/toolserver/middleware/index.js

@@ -0,0 +1,5 @@
+const config = require('./config.js')
+
+module.exports = {
+  config,
+}

package/toolserver/routes/api.js

@@ -0,0 +1,66 @@
+const { Router } = require('express') 
+// import { REST_API_URL } from '../utils/constants.js'
+
+const router = Router()
+
+const BASE_URL = 'https://surph.ai'
+// const BASE_URL = 'http://localhost:3005' // for local testing
+const PATH_RE = /^\/[a-zA-Z0-9_\-/]+$/
+
+router.post('*', async (req, res, next) => {
+  const path = req.path
+  if (!PATH_RE.test(path) || path.includes('//') || path.includes('..')) {
+    res.status(400).json({ error: 'invalid path' })
+    return
+  }
+
+  try {
+    const url = `${BASE_URL}/api${path}`
+    const upstream = await fetch(`${url}`, {
+      method: 'POST',
+      body: JSON.stringify(req.body || {}),
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+        'x-surph-client': 'surph-webapp'
+      },
+    })
+
+    const body = await upstream.json()
+    const contentType = upstream.headers.get('content-type')
+    if (contentType) res.set('Content-Type', contentType)
+    res.status(upstream.status).json(body)
+  } catch (e) {
+    res.status(502).json({ error: e?.message || 'upstream api failed' })
+  }
+})
+
+router.get('*', async (req, res, next) => {
+  const path = req.path
+  if (!PATH_RE.test(path) || path.includes('//') || path.includes('..')) {
+    res.status(400).json({ error: 'invalid path' })
+    return
+  }
+
+  try {
+    const url = `${BASE_URL}/api${path}`
+    const upstream = await fetch(`${url}`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+        'x-surph-client': 'surph-webapp'
+      },
+    })
+
+    const body = await upstream.json()
+    const contentType = upstream.headers.get('content-type')
+    if (contentType) res.set('Content-Type', contentType)
+    res.status(upstream.status).json(body)
+  } catch (e) {
+    console.log('ERR: ' + e.message)
+    res.status(502).json({ error: e?.message || 'upstream api failed' })
+  }
+})
+
+module.exports = router

package/toolserver/routes/index.js

@@ -1,8 +1,27 @@
 const { Router } = require('express')
 const router = Router()
+const manifest = require('../../../../../manifest.json')
 
-router.get('/', (req, res, next) => {
-  res.render('index', {})
+router.get('/', async (req, res, next) => {
+  try {
+    const toolSlugs = Object.keys(manifest)
+
+    const context = {
+      env: 'sandbox',
+      config: { ...req.config, entry: 'web' },
+      tools: toolSlugs.map(slug => (manifest[slug])),
+    }
+
+    res.render('index', {
+      ...context,
+      CDN: req.config.CDN,
+      preloaded: JSON.stringify(context)
+    })
+  } catch (error) {
+    res.json({
+      error: 'something went wrong'
+    })
+  }
 })
 
 module.exports = router

package/toolserver/templates/index.html

@@ -1,3 +1,4 @@
+
 <!DOCTYPE html>
 <html dir="ltr" lang="en-US">
 <head>
@@ -7,14 +8,14 @@
   <meta http-equiv="Content-Language" content="en" />
 
   <title>Surph AI</title>
-  <link rel="shortcut icon" href="https://lh3.googleusercontent.com/MpnmfR3zYPTojA03QbhGgwIHucmH5s4G2vbIlADYhODL488MQt_BuVztv9LYmJbhwkScYN0DIXuh4d10YMsLbWXT">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-  <link rel="stylesheet" href="https://cdn.turbo360-dev.com/admin/assets/scaffold/css/style.min.css" />
+  <link rel="shortcut icon" href="https://surph.s3.us-east-1.amazonaws.com/admin/assets/icon-green.svg">
 </head>
 
 <body>
-  <div class="container pt-5">
-    <h1>Welcome to Surph AI</h1>
-  </div>
+  <div id="root"></div>
+
+  <script type="text/javascript">window.__PRELOADED__ = {{{ preloaded }}}</script>
+  <script defer="defer" src="{{{ CDN }}}/dist/prod/{{{ config.imports.commons }}}"></script>
+  <script defer="defer" src="{{{ CDN }}}/dist/prod/{{{ config.imports.app }}}"></script>
 </body>
 </html>