@knowlearning/agents 0.9.0 → 0.9.2

package/agents/browser/embedded.js

@@ -40,6 +40,7 @@ export default function EmbeddedAgent() {
   addEventListener('message', async ({ data }) => {
     if (data.type === 'auth') {
       // TODO: switch to access_token
+      console.log('localStorage "state", data.state, token', localStorage.getItem('state'), data.state, data.token)
       if (localStorage.getItem('state') === data.state) {
         localStorage.setItem('token', data.token)
       }
@@ -77,8 +78,9 @@ export default function EmbeddedAgent() {
     if (!isUUID(target)) target = (await metadata(target)).id
 
     if (!tagTypeToTargetCache[tag_type]) tagTypeToTargetCache[tag_type] = {}
-    tagTypeToTargetCache[tag_type][target] = true
+    if (tagTypeToTargetCache[tag_type][target]) return
 
+    tagTypeToTargetCache[tag_type][target] = true
     await tag(tag_type, target)
   }
 
@@ -114,8 +116,9 @@ export default function EmbeddedAgent() {
     return interact(scope, [{ op: 'add', path:['active'], value: null }])
   }
 
-  function interact(scope, patch) {
-    tagIfNotYetTaggedInSession('mutated', scope)
+  //  TODO: better approach than exposing addTag
+  function interact(scope, patch, addTag=true) {
+    if (addTag) tagIfNotYetTaggedInSession('mutated', scope)
     return send({ type: 'interact', scope, patch })
   }
 
@@ -202,6 +205,7 @@ export default function EmbeddedAgent() {
     return send({ type: 'login', provider, username, password })
   }
 
+  function query(query, params) { return send({ type: 'query', query, params }) }
   function logout() { return send({ type: 'logout' }) }
   function disconnect() { return send({ type: 'disconnect' }) }
   function reconnect() { return send({ type: 'reconnect' }) }
@@ -227,6 +231,7 @@ export default function EmbeddedAgent() {
     reconnect,
     synced,
     close,
+    query,
     tag
   }
 }

package/agents/browser/initialize.js

@@ -65,7 +65,9 @@ function embed(environment, iframe) {
     }
     else if (type === 'interact') {
       const { scope, patch } = message
-      await Agent.interact(scope, patch)
+      //  TODO: should use a better approach to instruct agent
+      //        not to generate a tag from this interaction
+      await Agent.interact(scope, patch, false)
       if (listeners.mutate) listeners.mutate({ scope })
       sendDown({}) // TODO: might want to send down the interaction index
     }
@@ -91,6 +93,10 @@ function embed(environment, iframe) {
       const { root, scopes } = message
       sendDown(await Agent.patch(root, scopes))
     }
+    else if (type === 'query') {
+      const { query, params } = message
+      sendDown(await Agent.query(query, params))
+    }
     else if (type === 'upload') {
       const { name, contentType, id } = message
       sendDown(await Agent.upload(name, contentType, undefined, id))

package/agents/generic.js

@@ -222,6 +222,8 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     if (targetCache && targetCache[target]) return
 
     if (!targetCache) tagTypeToTargetCache[tag_type] = {}
+    if (tagTypeToTargetCache[tag_type][target]) return
+
     tagTypeToTargetCache[tag_type][target] = true
 
       //  always use absolute referene when tagging
@@ -421,15 +423,17 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     mode = 'debug'
   }
 
-  function query(query, params, domain) {
+  async function query(query, params, domain) {
     create({
       active_type: POSTGRES_QUERY_TYPE,
       active: { query, params, domain }
     })
-    return lastMessageResponse()
+    const { rows } = await lastMessageResponse()
+    return rows
   }
 
   function tag(tag_type, target, context=[]) {
+    console.log('TAGGING', tag_type, target, context)
     return create({
       active_type: TAG_TYPE,
       active: { tag_type, target, context }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowlearning/agents",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "API for embedding applications in KnowLearning systems.",
   "main": "node.js",
   "browser": "browser.js",