From 3b43b798c02e083d7658037a06394988ba8f0f40 Mon Sep 17 00:00:00 2001
From: Erik Jespersen <42016062+Mookse@users.noreply.github.com>
Date: Tue, 8 Oct 2024 00:36:14 -0400
Subject: [PATCH 01/56] 382 version 0024 updates (#403)
---
inc/js/globals.mjs | 88 +++++++-------
inc/js/mylife-agent-factory.mjs | 48 ++++----
inc/js/mylife-avatar.mjs | 16 ++-
inc/js/mylife-llm-services.mjs | 89 ++++++++++----
.../biographer-intelligence-1.5.json | 51 ++++++++
.../intelligences/diary-intelligence-1.0.json | 4 +-
.../journaler-intelligence-1.1.json | 60 +++++++++
.../openai/functions/changeTitle.json | 23 ++++
.../openai/functions/entrySummary.json | 32 +++--
.../openai/functions/getSummary.json | 6 +-
.../openai/functions/obscure.json | 18 +++
.../openai/functions/storySummary.json | 27 ++---
.../openai/functions/updateSummary.json | 7 +-
server.js | 2 +-
views/assets/css/bots.css | 67 +++++++---
views/assets/html/_bots.html | 77 +++++++++++-
views/assets/js/bots.mjs | 114 ++++++++++++++++--
views/assets/js/members.mjs | 36 ++++--
18 files changed, 590 insertions(+), 175 deletions(-)
create mode 100644 inc/json-schemas/intelligences/biographer-intelligence-1.5.json
create mode 100644 inc/json-schemas/intelligences/journaler-intelligence-1.1.json
create mode 100644 inc/json-schemas/openai/functions/changeTitle.json
create mode 100644 inc/json-schemas/openai/functions/obscure.json
diff --git a/inc/js/globals.mjs b/inc/js/globals.mjs
index 14130f40..b616cbb2 100644
--- a/inc/js/globals.mjs
+++ b/inc/js/globals.mjs
@@ -4,22 +4,22 @@ import { Guid } from 'js-guid' // usage = Guid.newGuid().toString()
/* constants */
const mAiJsFunctions = {
changeTitle: {
- description: 'Change the title of a memory summary in the database for an itemId',
name: 'changeTitle',
+ description: 'Change the title of a summary in the database for an itemId',
+ strict: true,
parameters: {
type: 'object',
properties: {
itemId: {
- description: 'itemId of memory item to update',
- format: 'uuid',
+ description: 'itemId to update',
type: 'string'
},
title: {
description: 'The new title for the summary',
- maxLength: 256,
type: 'string'
}
},
+ additionalProperties: false,
required: [
'itemId',
'title'
@@ -27,111 +27,109 @@ const mAiJsFunctions = {
}
},
entrySummary: {
- description: 'Generate a JOURNAL ENTRY `entry` summary with keywords and other critical data elements.',
+ description: 'Generate `entry` summary with keywords and other critical data elements.',
name: 'entrySummary',
+ strict: true,
parameters: {
type: 'object',
properties: {
content: {
- description: 'concatenated raw text content of member input for JOURNAL ENTRY.',
+ description: 'complete concatenated raw text content of member input(s) for this `entry`',
+ type: 'string'
},
keywords: {
- description: 'Keywords most relevant to JOURNAL ENTRY.',
+ description: 'Keywords most relevant to `entry`.',
items: {
- description: 'Keyword (single word or short phrase) to be used in JOURNAL ENTRY summary.',
- maxLength: 64,
+ description: 'Keyword (single word or short phrase) to be used in `entry` summary',
type: 'string'
},
- maxItems: 12,
- minItems: 3,
type: 'array'
},
mood: {
- description: 'Record member mood for day (or entry) in brief as ascertained from content of JOURNAL ENTRY.',
- maxLength: 256,
+ description: 'Record member mood for day (or entry) in brief as ascertained from content of `entry`',
type: 'string'
},
relationships: {
- description: 'Record individuals (or pets) mentioned in this `entry`.',
+ description: 'Record individuals (or pets) mentioned in this `entry`',
type: 'array',
items: {
- description: 'A name of relational individual/pet to the `entry` content.',
+ description: 'A name of relational individual/pet to the `entry` content',
type: 'string'
- },
- maxItems: 24
+ }
},
summary: {
- description: 'Generate a JOURNAL ENTRY summary from input.',
- maxLength: 20480,
+ description: 'Generate `entry` summary from member input',
type: 'string'
},
title: {
- description: 'Generate display Title of the JOURNAL ENTRY.',
- maxLength: 256,
+ description: 'Generate display Title of the `entry`',
type: 'string'
}
},
+ additionalProperties: false,
required: [
- 'content',
- 'keywords',
- 'summary',
- 'title'
+ 'content',
+ 'keywords',
+ 'mood',
+ 'relationships',
+ 'summary',
+ 'title'
]
}
},
getSummary: {
description: "Gets a story summary by itemId",
name: "getSummary",
+ strict: true,
parameters: {
type: "object",
properties: {
itemId: {
description: "Id of summary to retrieve",
- format: "uuid",
type: "string"
}
},
+ additionalProperties: false,
required: [
"itemId"
]
}
},
obscure: {
- description: "Obscures a summary so that no human names are present.",
+ description: "Obscures a summary so that no human names are present",
name: "obscure",
+ strict: true,
parameters: {
type: "object",
properties: {
itemId: {
description: "Id of summary to obscure",
- format: "uuid",
type: "string"
}
},
+ additionalProperties: false,
required: [
"itemId"
]
}
},
storySummary: {
- description: 'Generate a complete multi-paragraph STORY summary with keywords and other critical data elements.',
+ description: 'Generate a complete `story` summary with metadata elements',
name: 'storySummary',
+ strict: true,
parameters: {
type: 'object',
properties: {
keywords: {
- description: 'Keywords most relevant to STORY.',
+ description: 'Keywords most relevant to `story`',
items: {
- description: 'Keyword (single word or short phrase) to be used in STORY summary.',
- maxLength: 64,
+ description: 'Keyword from `story` summary',
type: 'string'
},
- maxItems: 12,
- minItems: 3,
type: 'array'
},
phaseOfLife: {
- description: 'Phase of life indicated in STORY.',
+ description: 'Phase of life indicated in `story`',
enum: [
'birth',
'childhood',
@@ -146,45 +144,44 @@ const mAiJsFunctions = {
'unknown',
'other'
],
- maxLength: 64,
type: 'string'
},
relationships: {
- description: 'MyLife Biographer Bot does its best to record individuals (or pets) mentioned in this `story`.',
+ description: 'Individuals (or pets) mentioned in `story`',
type: 'array',
items: {
- description: 'A name of relational individual/pet to the `story` content.',
+ description: 'Name of individual or pet in `story`',
type: 'string'
- },
- maxItems: 24
+ }
},
summary: {
- description: 'A complete multi-paragraph STORY summary composed from relevant user input.',
+ description: 'A complete `story` summary composed of all salient points from member input',
type: 'string'
},
title: {
- description: 'Generate display Title of the STORY.',
- maxLength: 256,
+ description: 'Generate display Title for `story`',
type: 'string'
}
},
+ additionalProperties: false,
required: [
'keywords',
'phaseOfLife',
+ "relationships",
'summary',
'title'
]
}
},
updateSummary: {
- description: "Updates a story summary (in total) as referenced by itemId",
+ description: "Updates (overwrites) the summary referenced by itemId",
name: "updateSummary",
+ strict: true,
parameters: {
type: "object",
properties: {
itemId: {
description: "Id of summary to update",
- format: "uuid",
type: "string"
},
summary: {
@@ -192,6 +189,7 @@ const mAiJsFunctions = {
type: "string"
}
},
+ additionalProperties: false,
required: [
"itemId",
"summary"
diff --git a/inc/js/mylife-agent-factory.mjs b/inc/js/mylife-agent-factory.mjs
index 0333459f..050a64d6 100644
--- a/inc/js/mylife-agent-factory.mjs
+++ b/inc/js/mylife-agent-factory.mjs
@@ -40,7 +40,7 @@ const mExcludeProperties = {
definitions: true,
name: true
}
-const mGeneralBotId = 'asst_piDEJKYjqvAZbLstjd6u0ZMb'
+const mGeneralBotId = 'asst_yhX5mohHmZTXNIH55FX2BR1m'
const mLLMServices = new LLMServices()
const mMyLifeTeams = [
{
@@ -121,17 +121,7 @@ const mReservedJSWords = ['break', 'case', 'catch', 'class', 'const', 'continue'
const mShadows = [
{
being: 'shadow',
- categories: ['world events'],
- form: 'story',
- id: 'e3701fa2-7cc8-4a47-bcda-a5b52d3d2e2f',
- name: 'shadow_e3701fa2-7cc8-4a47-bcda-a5b52d3d2e2f',
- proxy: '/shadow',
- text: `What was happening in the world at the time?`,
- type: 'agent',
- },
- {
- being: 'shadow',
- categories: ['personal', 'residence'],
+ categories: ['personal', 'location'],
form: 'story',
id: '0087b3ec-956e-436a-9272-eceed5e97ad0',
name: 'shadow_0087b3ec-956e-436a-9272-eceed5e97ad0',
@@ -171,15 +161,25 @@ const mShadows = [
},
{
being: 'shadow',
- categories: ['observational', 'objectivity', 'reflection'],
+ categories: ['personal', 'observation'],
form: 'story',
- id: '3bfebafb-7e44-4236-86c3-938e2f42fdd7',
- name: 'shadow_e3701fa2-7cc8-4a47-bcda-a5b52d3d2e2f',
+ id: '6465905a-328e-4df1-8d3a-c37c3e05e227',
+ name: 'shadow_6465905a-328e-4df1-8d3a-c37c3e05e227',
proxy: '/shadow',
- text: `What would a normal person have done in this situation?`,
- type: 'agent',
+ text: `The mood of the scene was...`,
+ type: 'member',
},
-] // **note**: members use shadows to help them add content to the summaries of their experiences, whereas agents return the requested content
+ {
+ being: 'shadow',
+ categories: ['personal', 'reflection', 'observation'],
+ form: 'story',
+ id: 'e61616c7-00f9-4c23-9394-3df7e98f71e0',
+ name: 'shadow_e61616c7-00f9-4c23-9394-3df7e98f71e0',
+ proxy: '/shadow',
+ text: `This was connected to larger themes in my life by ...`,
+ type: 'member',
+ },
+]
const vmClassGenerator = vm.createContext({
exports: {},
console: console,
@@ -793,11 +793,12 @@ class AgentFactory extends BotFactory {
* @returns {object} - The story document from Cosmos
*/
async story(story){
+ const defaultForm = 'memory'
const defaultType = 'story'
- const {
+ const {
assistantType='biographer',
being=defaultType,
- form=defaultType,
+ form=defaultForm,
id=this.newGuid,
keywords=[],
mbr_id=(!this.isMyLife ? this.mbr_id : undefined),
@@ -807,8 +808,7 @@ class AgentFactory extends BotFactory {
} = story
if(!mbr_id) // only triggered if not MyLife server
throw new Error('mbr_id required for story summary')
- let { name, } = story
- name = name ?? `${ defaultType }_${ form }_${ title.substring(0,64) }_${ mbr_id }`
+ const { name=`${ being }_${ form }_${ title.substring(0,64) }_${ mbr_id }`, } = story
if(!summary?.length)
throw new Error('story summary required')
/* assign default keywords */
@@ -1283,7 +1283,6 @@ function mCreateBotInstructions(factory, bot){
/* compile instructions */
switch(type){
case 'diary':
- case 'journaler':
instructions = purpose
+ preamble
+ prefix
@@ -1295,7 +1294,8 @@ function mCreateBotInstructions(factory, bot){
instructions = preamble
+ general
break
- case 'personal-biographer':
+ case 'journaler':
+ case 'personal-biographer':
instructions = preamble
+ purpose
+ prefix
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index ba347fa0..80e7eb4c 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -110,9 +110,17 @@ class Avatar extends EventEmitter {
if(shadowId)
messages = await this.shadow(shadowId, itemId, message)
else {
- // @stub - one weakness in the chain might also be the fact that I am not including in instructions how to create integrated summary and left it primarily to the JSON description of function
- if(itemId)
- message = `update-memory-request: itemId=${ itemId }\n` + message
+ if(itemId){
+ // @todo - check if item exists in memory, fewer pings and inclusions overall
+ const { summary, } = await factory.item(itemId)
+ if(summary?.length){
+ message = `possible **update-summary-request**: itemId=${ itemId }\n`
+ + `**member-update-request**:\n`
+ + message
+ + `\n**current-summary-in-database**:\n`
+ + summary
+ }
+ }
messages = await mCallLLM(this.#llmServices, conversation, message, factory, this)
}
conversation.addMessages(messages)
@@ -636,6 +644,7 @@ class Avatar extends EventEmitter {
message = `update-memory-request: itemId=${ itemId }\n` + message
break
case 'agent':
+ /*
// @stub - develop additional form types, entry or idea for instance
const dob = new Date(this.#factory.dob)
const diff_ms = Date.now() - dob.getTime()
@@ -647,6 +656,7 @@ class Avatar extends EventEmitter {
thread_id: bot.thread_id,
}
break
+ */
default:
break
}
diff --git a/inc/js/mylife-llm-services.mjs b/inc/js/mylife-llm-services.mjs
index 4a4bcd36..d251ee85 100644
--- a/inc/js/mylife-llm-services.mjs
+++ b/inc/js/mylife-llm-services.mjs
@@ -344,8 +344,12 @@ async function mRunFunctions(openai, run, factory, avatar){ // add avatar ref
case 'changetitle':
case 'change_title':
case 'change title':
- console.log('mRunFunctions()::changeTitle', toolArguments)
const { itemId: titleItemId, title, } = toolArguments
+ console.log('mRunFunctions()::changeTitle::begin', itemId, titleItemId, title)
+ avatar.backupResponse = {
+ message: `I was unable to retrieve the item indicated.`,
+ type: 'system',
+ }
if(!itemId?.length || !title?.length || itemId!==titleItemId)
action = 'apologize for lack of clarity - member should click on the collection item (like a memory, story, etc) to make it active so I can use the `changeTitle` tool'
else {
@@ -358,8 +362,13 @@ async function mRunFunctions(openai, run, factory, avatar){ // add avatar ref
title,
}
success = true
+ avatar.backupResponse = {
+ message: `I was able to retrieve change the title to: "${ title }"`,
+ type: 'system',
+ }
}
confirmation.output = JSON.stringify({ action, success, })
+ console.log('mRunFunctions()::changeTitle::end', success, item)
return confirmation
case 'confirmregistration':
case 'confirm_registration':
@@ -401,27 +410,41 @@ async function mRunFunctions(openai, run, factory, avatar){ // add avatar ref
case 'entrysummary': // entrySummary in Globals
case 'entry_summary':
case 'entry summary':
- const entry = await factory.entry(toolArguments)
- if(entry){
- action = `share brief version of entry and ask probing follow-up`
+ console.log('mRunFunctions()::entrySummary::begin', toolArguments)
+ avatar.backupResponse = {
+ message: `I'm sorry, I couldn't save this entry. I believe the issue might have been temporary. Would you like me to try again?`,
+ type: 'system',
+ }
+ const { id: entryItemId, summary: _entrySummary, } = await factory.entry(toolArguments)
+ if(_entrySummary?.length){
+ action = 'confirm entry has been saved and based on the mood of the entry, ask more about _this_ entry or move on to another event'
success = true
- } else {
- action = `journal entry failed to save, notify member and continue on for now`
+ avatar.backupResponse = {
+ message: `I can confirm that your story has been saved. Would you like to add more details or begin another memory?`,
+ type: 'system',
+ }
}
- confirmation.output = JSON.stringify({ action, success, })
- console.log('mRunFunctions()::entrySummary', toolArguments, confirmation.output)
+ confirmation.output = JSON.stringify({
+ action,
+ itemId: entryItemId,
+ success,
+ summary: _entrySummary,
+ })
+ console.log('mRunFunctions()::entrySummary::end', success, entryItemId, _entrySummary)
return confirmation
case 'getsummary':
case 'get_summary':
case 'get summary':
+ console.log('mRunFunctions()::getSummary::begin', itemId)
avatar.backupResponse = {
- message: `I'm very sorry, I'm having trouble accessing this summary information. Please try again shortly as the problem is likely temporary.`,
+ message: `I'm sorry, I couldn't finding this summary. I believe the issue might have been temporary. Would you like me to try again?`,
type: 'system',
}
- let { summary, title: _getSummaryTitle, } = item ?? {}
- if(!summary?.length){
+ let { summary: _getSummary, title: _getSummaryTitle, } = item
+ ?? {}
+ if(!_getSummary?.length){
action = `error getting summary for itemId: ${ itemId ?? 'missing itemId' } - halt any further processing and instead ask user to paste summary into chat and you will continue from there to incorporate their message.`
- summary = 'no summary found for itemId'
+ _getSummary = 'no summary found for itemId'
} else {
avatar.backupResponse = {
message: `I was able to retrieve the summary indicated.`,
@@ -430,7 +453,8 @@ async function mRunFunctions(openai, run, factory, avatar){ // add avatar ref
action = `with the summary in this JSON payload, incorporate the most recent member request into a new summary and run the \`updateSummary\` function and follow its action`
success = true
}
- confirmation.output = JSON.stringify({ action, itemId, success, summary, })
+ confirmation.output = JSON.stringify({ action, itemId, success, summary: _getSummary, })
+ console.log('mRunFunctions()::getSummary::end', success, _getSummary)
return confirmation
case 'hijackattempt':
case 'hijack_attempt':
@@ -470,17 +494,21 @@ async function mRunFunctions(openai, run, factory, avatar){ // add avatar ref
case 'story_summary':
case 'story summary':
console.log('mRunFunctions()::storySummary', toolArguments)
- const story = await factory.story(toolArguments)
- if(story){
- const { keywords, phaseOfLife, } = story
+ avatar.backupResponse = {
+ message: `I'm very sorry, an error occured before I could create your summary. Would you like me to try again?`,
+ type: 'system',
+ }
+ const { id: storyItemId, phaseOfLife, summary: _storySummary, } = await factory.story(toolArguments)
+ if(_storySummary?.length){
let { interests, updates, } = factory.core
if(typeof interests=='array')
interests = interests.join(', ')
if(typeof updates=='array')
updates = updates.join(', ')
+ action = 'confirm memory has been saved and '
switch(true){
case phaseOfLife?.length:
- action = `ask about another encounter during member's ${ phaseOfLife }`
+ action += `ask about another encounter during member's ${ phaseOfLife }`
break
case interests?.length:
action = `ask about a different interest from: ${ interests }`
@@ -490,13 +518,23 @@ async function mRunFunctions(openai, run, factory, avatar){ // add avatar ref
break
}
success = true
- } // error cascades
- confirmation.output = JSON.stringify({ action, success, })
- console.log('mRunFunctions()::storySummary()::end', story.id)
+ }
+ confirmation.output = JSON.stringify({
+ action,
+ itemId: storyItemId,
+ success,
+ summary: _storySummary,
+ })
+ avatar.backupResponse = {
+ message: `I can confirm that your story has been saved. Would you like to add more details or begin another memory?`,
+ type: 'system',
+ }
+ console.log('mRunFunctions()::storySummary()::end', success, storyItemId, _storySummary)
return confirmation
case 'updatesummary':
case 'update_summary':
case 'update summary':
+ console.log('mRunFunctions()::updatesummary::begin', itemId)
avatar.backupResponse = {
message: `I'm very sorry, an error occured before we could update your summary. Please try again as the problem is likely temporary.`,
type: 'system',
@@ -508,13 +546,18 @@ async function mRunFunctions(openai, run, factory, avatar){ // add avatar ref
itemId,
summary: updatedSummary,
}
+ action=`confirm that summary update was successful`
+ success = true
+ confirmation.output = JSON.stringify({
+ action,
+ itemId,
+ success,
+ summary: updatedSummary,
+ })
avatar.backupResponse = {
message: 'Your summary has been updated, please review and let me know if you would like to make any changes.',
type: 'system',
}
- action=`confirm that summary update was successful`
- success = true
- confirmation.output = JSON.stringify({ action, success, })
console.log('mRunFunctions()::updatesummary::end', itemId, updatedSummary)
return confirmation
default:
diff --git a/inc/json-schemas/intelligences/biographer-intelligence-1.5.json b/inc/json-schemas/intelligences/biographer-intelligence-1.5.json
new file mode 100644
index 00000000..728f5d94
--- /dev/null
+++ b/inc/json-schemas/intelligences/biographer-intelligence-1.5.json
@@ -0,0 +1,51 @@
+{
+ "allowedBeings": [
+ "core",
+ "avatar"
+ ],
+ "allowMultiple": false,
+ "being": "bot-instructions",
+ "greeting": "Hello, I am your personal biographer, and I'm here to help you create an enduring biographical sense of self. I am excited to get to know you and your story. Let's get started!",
+ "instructions": {
+ "general": "## Key Functionality\n### startup\nWhen <-mN-> begins the biography process, I greet them with excitement, share our aims with MyLife to create an enduring biographical catalog of their memories, stories and narratives. On startup, I outline how the basics of my functionality works.\n- I aim to create engaging and evocative prompts to lead them down memory lane.\n### CREATE MEMORY SUMMARY\nI catalog our interaction information in terms of \"MEMORY\". When <-mN-> intentionally signals completion of a story, or overtly changes topics, or after three (3) content exchanges on a topic, I run the `storySummary` function and follow its directions.\n### UPDATE MEMORY\nWhen request is prefaced with `update-summary-request` it will be followed by an `itemId` (if not, inform that it is required)\nReview **member-update-request** - if it does not contain a request to modify content, respond as normal\nIf request is to explicitly change the title then run `changeTitle` function and follow its outcome actions\nOtherwise summary content should be updated:\n1. Generate NEW summary by intelligently incorporating the **member-update-request** content with the provided **current-summary-in-database**\n2. Run the `updateSummary` function with this new summary and follow its outcome actions\n### RELIVE MEMORY\n1. Retrieve Summary Content: When request is prefaced with \"## relive-memory,\" it will be followed by an \"itemId.\" Use the getSummary function to retrieve the most recent summary associated with the provided \"itemId.\"\n2. Setting the Scene: Begin by setting the scene for the memory based on the retrieved summary. Provide a vivid and engaging introduction to the memory.\n3. Interactive Experience: Lead the member through the memory in chunked segments. Depending on the size and complexity of the memory, create at least two segments. For each segment, provide a detailed and dramatic description to immerse the member in the experience.\n4. Member Interaction: Between segments, the request includes \"MEMBER\" with a value of either:\n- \"NEXT\": Move to the next segment of the memory\n - Text content contributed by member. If decipherable and appropriate, this input should be incorporated into a new summary and updated as in 5 below.\n5. Updating the Summary: When MEMBER text content is received, integrate the text into the existing summary. Use the updateSummary function to send the updated summary to MyLife's system.\nEnding the Experience: Conclude the interactive experience by weaving a moral from the experience thus far, either one from the summary content or the memory portrayal sequence itself. After last moral comment, call the endMemory(itemId) function to close the memory reliving session.\n### suggest next-steps\nWhen <-mN-> seems unclear about how to continue, propose new topic based on phase of life, or one of their ## interests.\n## voice\nI am conversational, interested and intrigued about <-mN-> with an attention to detail. I am optimistic and look for ways to validate <-mN->.\n",
+ "preamble": "I am the personal biographer for <-mFN->. <-mN-> was born on <-db->, I set historical events in this context and I tailor my voice accordingly.\n",
+ "prefix": "## interests\n",
+ "purpose": "My goal is to specialize in creating, updating, and presenting accurate biographical content for MyLife member <-mFN-> based on our interactions.\n",
+ "references": [
+ {
+ "default": "ERROR loading preferences, gather interests directly from member",
+ "description": "interests are h2 (##) in prefix so that they do not get lost in context window shortening",
+ "insert": "## interests",
+ "method": "append-hard",
+ "notes": "`append-hard` indicates hard return after `find` match; `name` is variable name in _bots",
+ "value": "interests"
+ }
+ ],
+ "replacements": [
+ {
+ "default": "MyLife Member",
+ "description": "member first name",
+ "name": "<-mN->",
+ "replacement": "memberFirstName"
+ },
+ {
+ "default": "MyLife Member",
+ "description": "member full name",
+ "name": "<-mFN->",
+ "replacement": "memberName"
+ },
+ {
+ "default": "{unknown, find out}",
+ "description": "member birthdate",
+ "name": "<-db->",
+ "replacement": "dob"
+ }
+ ]
+ },
+ "limit": 8000,
+ "name": "instructions-personal-biographer-bot",
+ "purpose": "To be a biographer bot for requesting member",
+ "type": "personal-biographer",
+ "$comments": "20240919 updated error return without version update; 20241005 updated instructions to reflect streamlined update",
+ "version": 1.5
+ }
\ No newline at end of file
diff --git a/inc/json-schemas/intelligences/diary-intelligence-1.0.json b/inc/json-schemas/intelligences/diary-intelligence-1.0.json
index bc3c7bd0..8f936ca7 100644
--- a/inc/json-schemas/intelligences/diary-intelligence-1.0.json
+++ b/inc/json-schemas/intelligences/diary-intelligence-1.0.json
@@ -11,7 +11,7 @@
"So nice to see you! I am your personal diary."
],
"instructions": {
- "general": "## Key Functionality\n### startup\nWhen we begin the diary process, I\n- outline my key functionality and how I work, then\n- Prompt <-mN-> to make an entry for what happened or how they are feeling today.\n### CREATE DIARY ENTRY\nI work with the validated member to make an entry (per event or concept) and capture their thoughts. I expect around 2 or 3 exchanges to be able to submit an entry to MyLife by running the `entrySummary` function and follow directions from its outcome `action`.\n**How I create an entry payload**\n- summary should capture salient points, but disguise proper names; ex. \"Erik...\" becomes \"E. ...\", etc.\n- relationships array is populated with RELATIONSHIP-TYPE only and never given name (use Mother, not Alice)\n### UPDATE ENTRY SUMMARY\nWhen request is prefaced with `update-request` it will be followed by an `itemId` (if not, inform that it is required).\nIf request is to change the title then run `changeTitle` function and follow its outcome directions, otherwise:\n1. If the summary content is unknown for that id, then run the `getSummary` function first to get the most recent summary.\n2. Create new summary intelligently incorporating the member content of the message with the most recent version. Incorporate content by appropriate chronology or context.\n3. Run the `updateSummary` function with this newly compiled summary.\n**important**: RUN getSummary AND updateSummary SEQUENTIALLY! Server cannot handle multi-function tool resources, so must run sequentially.\n### UPDATE ENTRY SUMMARY\nWhen request is prefaced with `update-request` it will be followed by an `itemId`. If request is to change the title then run `changeTitle` function and follow its outcome directions, otherwise:\n1. If summary content is unknown for itemId, run the `getSummary` function for the most recent summary.\n2. Create new summary intelligently incorporating the member content of the message with the most recent version. Incorporate content by appropriate chronology or context.\n3. Run the `updateSummary` function with this newly compiled summary.\n**important**: RUN getSummary AND updateSummary SEQUENTIALLY! Server cannot handle multi-function tool resources, so must run sequentially.\n### OBSCURE ENTRY\nWhen request is prefaced with `update-request` it will be followed by an `itemId`.\nIf member's request indicates they want an entry be obscured, RUN `obscure` function and follow the action in the output.\n### IDENTIFY FLAGGED MEMBER CONTENT\nBased on [red flagged content list](#flags) I let the member know in my response when they enter content related to any of these flagged concepts or things. The flag will trigger once per entry and, if updating an entry, add a note that flag was triggered to the updateSummary content.\n",
+ "general": "## Key Functionality\n### startup\nWhen we begin the diary process, I\n- outline my key functionality and how I work, then\n- Prompt <-mN-> to make an entry for what happened or how they are feeling today.\n### CREATE DIARY ENTRY\nI work with the validated member to make an entry (per event or concept) and capture their thoughts. I expect around 2 or 3 exchanges to be able to submit an entry to MyLife by running the `entrySummary` function and follow directions from its outcome `action`.\n**How I create an entry payload**\n- summary should capture salient points, but disguise proper names; ex. \"Erik...\" becomes \"E. ...\", etc.\n- relationships array is populated with RELATIONSHIP-TYPE only and never given name (use Mother, not Alice)\n### UPDATE ENTRY\nWhen request is prefaced with `update-summary-request` it will be followed by an `itemId` (if not, inform that it is required)\nReview **member-update-request** - if it does not contain a request to modify content, respond as normal\nIf request is to explicitly change the title then run `changeTitle` function and follow its outcome actions\nOtherwise summary content should be updated:\n1. Generate NEW summary by intelligently incorporating the **member-update-request** content with the provided **current-summary-in-database**\n2. Run the `updateSummary` function with this new summary and follow its outcome actions\n### OBSCURE ENTRY\nWhen request is prefaced with `update-request` it will be followed by an `itemId`.\nIf member's request indicates they want an entry be obscured, RUN `obscure` function and follow the action in the output.\n### IDENTIFY FLAGGED MEMBER CONTENT\nBased on [red flagged content list](#flags) I let the member know in my response when they enter content related to any of these flagged concepts or things. The flag will trigger once per entry and, if updating an entry, add a note that flag was triggered to the updateSummary content.\n",
"preamble": "## Core Public Info about <-mFN->\n- Born on <-db->\nI set language, knowledge and event discussion in this context and I tailor my interactive voice accordingly.\n",
"prefix": "## interests\n## flags\n",
"purpose": "I am the MyLife Diary Bot for member <-mFN->. I am a privacy-first diary and journaling assistant. I help <-mN-> process their thoughts, reflections on life, and track emotions in a secure and self-driven way. Privacy is paramount, and <-mN-> interactions should be considered exclusively ours.\n",
@@ -60,6 +60,6 @@
"name": "instructions-diary-bot",
"purpose": "To be a diary bot for requesting member",
"type": "diary",
- "$comments": "",
+ "$comments": "20241006 included simplified `updateSummary`",
"version": 1.0
}
\ No newline at end of file
diff --git a/inc/json-schemas/intelligences/journaler-intelligence-1.1.json b/inc/json-schemas/intelligences/journaler-intelligence-1.1.json
new file mode 100644
index 00000000..36db98ec
--- /dev/null
+++ b/inc/json-schemas/intelligences/journaler-intelligence-1.1.json
@@ -0,0 +1,60 @@
+{
+ "allowedBeings": [
+ "core",
+ "avatar"
+ ],
+ "allowMultiple": false,
+ "being": "bot-instructions",
+ "greeting": "I'm your journaler bot, here to help you keep track of your thoughts and feelings. I can help you reflect on your day, set goals, and track your progress. Let's get started with a daily check-in? How are you feeling today?",
+ "instructions": {
+ "general": "## Key Functionality\n### startup\nWhen we begin the journaling process, I\n- outline this key functionality and how I expect us to work, then\n- Prompt <-mN-> to make an entry for what happened or how they are feeling today.\n### CREATE JOURNAL ENTRY\nI work with the validated member to make an entry (per event or concept) and capture their thoughts. I expect around 2 or 3 exchanges to be able to submit an entry to MyLife by running the `entrySummary` function and follow directions from its outcome `action`.\n### UPDATE ENTRY\nWhen request is prefaced with `update-summary-request` it will be followed by an `itemId` (if not, inform that it is required)\nReview **member-update-request** - if it does not contain a request to modify content, respond as normal\nIf request is to explicitly change the title then run `changeTitle` function and follow its outcome actions\nOtherwise summary content should be updated:\n1. Generate NEW summary by intelligently incorporating the **member-update-request** content with the provided **current-summary-in-database**\n2. Run the `updateSummary` function with this new summary and follow its outcome actions\n### IDENTIFY FLAGGED MEMBER CONTENT\nBased on [red flagged content list](#flags) I let the member know in my response when they enter content related to any of these flagged concepts or things. The flag will trigger once per entry and, if updating an entry, add a note that flag was triggered to the updateSummary content.\n",
+ "preamble": "## Core Public Info about <-mFN->\n- Born on <-db->\nI set language, knowledge and event discussion in this context and I tailor my interactive voice accordingly.\n",
+ "prefix": "## interests\n## entry-summary-frequency\n## flags\n",
+ "purpose": "I am journaling assistant for member <-mFN->, my aim is to help them keep track of their thoughts and feelings. I can help them reflect on their day, set goals, and track their progress. I am here to assist them in their journey of self-discovery and personal growth.",
+ "references": [
+ {
+ "default": "not yet collected",
+ "description": "member interests section in prefix to ensure context window",
+ "insert": "## interests",
+ "method": "append-hard",
+ "notes": "`append-hard` indicates hard return after `find` match; `name` is variable name in _bots",
+ "value": "interests"
+ },
+ {
+ "default": "daily",
+ "description": "entry summary frequency",
+ "insert": "## entry-summary-frequency",
+ "method": "append-hard",
+ "notes": "`append-hard` indicates hard return after `find` match; `name` is variable name in _bots",
+ "value": "entry-summary-frequency"
+ },
+ {
+ "default": "ERROR loading flags, gather flags directly from member",
+ "description": "flags are a description of content areas that member wants flagged for reference when included in member content. **note**: .md h2 (##) are used in prefix so that they do not get lost in context window shortening",
+ "insert": "## flags",
+ "method": "append-hard",
+ "notes": "`append-hard` indicates hard return after `find` match; `name` is variable name in underlying bot-data",
+ "value": "flags"
+ }
+ ],
+ "replacements": [
+ {
+ "default": "MyLife Member",
+ "description": "member first name",
+ "name": "<-mN->",
+ "replacement": "memberFirstName"
+ },
+ {
+ "default": "MyLife Member",
+ "description": "member full name",
+ "name": "<-mFN->",
+ "replacement": "memberName"
+ }
+ ]
+ },
+ "limit": 8000,
+ "name": "instructions-journaler-bot",
+ "purpose": "To be a journaling assistant for MyLife member",
+ "type": "journaler",
+ "version": 1.1
+}
\ No newline at end of file
diff --git a/inc/json-schemas/openai/functions/changeTitle.json b/inc/json-schemas/openai/functions/changeTitle.json
new file mode 100644
index 00000000..4ef4cd43
--- /dev/null
+++ b/inc/json-schemas/openai/functions/changeTitle.json
@@ -0,0 +1,23 @@
+{
+ "name": "changeTitle",
+ "description": "Change the title of a summary in the database for an itemId",
+ "strict": true,
+ "parameters": {
+ "type": "object",
+ "properties": {
+ "itemId": {
+ "description": "itemId to update",
+ "type": "string"
+ },
+ "title": {
+ "description": "The new title for the summary",
+ "type": "string"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "itemId",
+ "title"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/inc/json-schemas/openai/functions/entrySummary.json b/inc/json-schemas/openai/functions/entrySummary.json
index 66fbf6d2..55c4c9e6 100644
--- a/inc/json-schemas/openai/functions/entrySummary.json
+++ b/inc/json-schemas/openai/functions/entrySummary.json
@@ -1,51 +1,49 @@
{
- "description": "Generate a JOURNAL ENTRY `entry` summary with keywords and other critical data elements.",
+ "description": "Generate `entry` summary with keywords and other critical data elements.",
"name": "entrySummary",
+ "strict": true,
"parameters": {
"type": "object",
"properties": {
"content": {
- "description": "concatenated raw text content of member input for JOURNAL ENTRY."
+ "description": "complete concatenated raw text content of member input(s) for this `entry`",
+ "type": "string"
},
"keywords": {
- "description": "Keywords most relevant to JOURNAL ENTRY.",
+ "description": "Keywords most relevant to `entry`.",
"items": {
- "description": "Keyword (single word or short phrase) to be used in JOURNAL ENTRY summary.",
- "maxLength": 64,
+ "description": "Keyword (single word or short phrase) to be used in `entry` summary",
"type": "string"
},
- "maxItems": 12,
- "minItems": 3,
"type": "array"
},
"mood": {
- "description": "Record member mood for day (or entry) in brief as ascertained from content of JOURNAL ENTRY.",
- "maxLength": 256,
+ "description": "Record member mood for day (or entry) in brief as ascertained from content of `entry`",
"type": "string"
},
"relationships": {
- "description": "Record individuals (or pets) mentioned in this `entry`.",
+ "description": "Record individuals (or pets) mentioned in this `entry`",
"type": "array",
"items": {
- "description": "A name of relational individual/pet to the `entry` content.",
+ "description": "A name of relational individual/pet to the `entry` content",
"type": "string"
- },
- "maxItems": 24
+ }
},
"summary": {
- "description": "Generate a JOURNAL ENTRY summary from input.",
- "maxLength": 20480,
+ "description": "Generate `entry` summary from member input",
"type": "string"
},
"title": {
- "description": "Generate display Title of the JOURNAL ENTRY.",
- "maxLength": 256,
+ "description": "Generate display Title of the `entry`",
"type": "string"
}
},
+ "additionalProperties": false,
"required": [
"content",
"keywords",
+ "mood",
+ "relationships",
"summary",
"title"
]
diff --git a/inc/json-schemas/openai/functions/getSummary.json b/inc/json-schemas/openai/functions/getSummary.json
index cc79799a..145bb196 100644
--- a/inc/json-schemas/openai/functions/getSummary.json
+++ b/inc/json-schemas/openai/functions/getSummary.json
@@ -1,11 +1,12 @@
{
"description": "Gets a story summary by itemId",
"name": "getSummary",
+ "strict": true,
"parameters": {
"type": "object",
"properties": {
"itemId": {
- "description": "Id of summary to update",
+ "description": "Id of summary to get",
"format": "uuid",
"type": "string"
}
@@ -13,5 +14,6 @@
"required": [
"itemId"
]
- }
+ },
+ "additionalProperties": false
}
\ No newline at end of file
diff --git a/inc/json-schemas/openai/functions/obscure.json b/inc/json-schemas/openai/functions/obscure.json
new file mode 100644
index 00000000..dface0cd
--- /dev/null
+++ b/inc/json-schemas/openai/functions/obscure.json
@@ -0,0 +1,18 @@
+{
+ "description": "Obscures a summary so that no human names are present",
+ "name": "obscure",
+ "strict": true,
+ "parameters": {
+ "type": "object",
+ "properties": {
+ "itemId": {
+ "description": "Id of summary to obscure",
+ "type": "string"
+ }
+ },
+ "required": [
+ "itemId"
+ ]
+ },
+ "additionalProperties": false
+}
\ No newline at end of file
diff --git a/inc/json-schemas/openai/functions/storySummary.json b/inc/json-schemas/openai/functions/storySummary.json
index 1be222fe..22439f98 100644
--- a/inc/json-schemas/openai/functions/storySummary.json
+++ b/inc/json-schemas/openai/functions/storySummary.json
@@ -1,22 +1,20 @@
{
- "description": "Generate a complete multi-paragraph STORY summary with keywords and other critical data elements.",
+ "description": "Generate a complete `story` summary with metadata elements",
"name": "storySummary",
+ "strict": true,
"parameters": {
"type": "object",
"properties": {
"keywords": {
- "description": "Keywords most relevant to STORY.",
+ "description": "Keywords most relevant to `story`",
"items": {
- "description": "Keyword (single word or short phrase) to be used in STORY summary.",
- "maxLength": 64,
+ "description": "Keyword from `story` summary",
"type": "string"
},
- "maxItems": 12,
- "minItems": 3,
"type": "array"
},
"phaseOfLife": {
- "description": "Phase of life indicated in STORY.",
+ "description": "Phase of life indicated in `story`",
"enum": [
"birth",
"childhood",
@@ -31,31 +29,30 @@
"unknown",
"other"
],
- "maxLength": 64,
"type": "string"
},
"relationships": {
- "description": "MyLife Biographer Bot does its best to record individuals (or pets) mentioned in this `story`.",
+ "description": "Individuals (or pets) mentioned in `story`",
"type": "array",
"items": {
- "description": "A name of relational individual/pet to the `story` content.",
+ "description": "Name of individual or pet in `story`",
"type": "string"
- },
- "maxItems": 24
+ }
},
"summary": {
- "description": "A complete multi-paragraph STORY summary composed from relevant user input.",
+ "description": "A complete `story` summary composed of all salient points from member input",
"type": "string"
},
"title": {
- "description": "Generate display Title of the STORY.",
- "maxLength": 256,
+ "description": "Generate display Title for `story`",
"type": "string"
}
},
+ "additionalProperties": false,
"required": [
"keywords",
"phaseOfLife",
+ "relationships",
"summary",
"title"
]
diff --git a/inc/json-schemas/openai/functions/updateSummary.json b/inc/json-schemas/openai/functions/updateSummary.json
index 6dc6cc95..2c5440b1 100644
--- a/inc/json-schemas/openai/functions/updateSummary.json
+++ b/inc/json-schemas/openai/functions/updateSummary.json
@@ -1,12 +1,12 @@
{
- "description": "Updates a story summary (in total) as referenced by itemId",
"name": "updateSummary",
+ "description": "Updates (overwrites) the summary referenced by itemId",
+ "strict": true,
"parameters": {
"type": "object",
"properties": {
"itemId": {
"description": "Id of summary to update",
- "format": "uuid",
"type": "string"
},
"summary": {
@@ -14,9 +14,10 @@
"type": "string"
}
},
+ "additionalProperties": false,
"required": [
"itemId",
- "title"
+ "summary"
]
}
}
\ No newline at end of file
diff --git a/server.js b/server.js
index 8a049b5b..5e779f89 100644
--- a/server.js
+++ b/server.js
@@ -13,7 +13,7 @@ import chalk from 'chalk'
/* local service imports */
import MyLife from './inc/js/mylife-agent-factory.mjs'
/** variables **/
-const version = '0.0.23'
+const version = '0.0.24'
const app = new Koa()
const port = process.env.PORT ?? '3000'
const __filename = fileURLToPath(import.meta.url)
diff --git a/views/assets/css/bots.css b/views/assets/css/bots.css
index c03dd89e..ecf356ca 100644
--- a/views/assets/css/bots.css
+++ b/views/assets/css/bots.css
@@ -396,7 +396,8 @@
font-weight: bold;
padding: 0.5rem;
}
-.collection-popup-story {
+.collection-popup-story,
+.collection-popup-entry {
align-items: flex-start;
cursor: default;
display: flex;
@@ -501,19 +502,6 @@ input:checked + .publicity-slider:before {
padding: 0;
width: 100%;
}
-.memory-carousel {
- align-items: center;
- background-color: white;
- color: gray;
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- height: 5rem;
- margin: 0.25rem;
- padding: 0.25rem;
- text-align: flex-start;
- width: 100%;
-}
.memory-shadow {
align-items: center;
background-color: teal;
@@ -593,10 +581,61 @@ input:checked + .publicity-slider:before {
margin: 0;
padding: 0;
}
+/* entries */
+.experience-entry-container { /* panel for `experience` of entry */
+ align-items: center;
+ color: black;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ margin: 0.2rem;
+ padding: 0.2rem;
+}
+.experience-entry-explanation {
+ display: flex;
+ padding: 0.2rem;
+}
+.improve-entry-container {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ margin: 0.25rem;
+ padding: 0.25rem;
+}
+.improve-entry-lane {
+ align-items: center;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-evenly;
+ gap: 1rem;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+}
+.obscure-button.button,
+.experience-button.button {
+ display: flex;
+ padding: 0 0.2rem;
+ min-width: 35%;
+}
/* summaries */
.summary-error {
color: darkred;
}
+/* media */
+.media-carousel {
+ align-items: center;
+ background-color: white;
+ color: gray;
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ height: 5rem;
+ margin: 0.25rem;
+ padding: 0.25rem;
+ text-align: flex-start;
+ width: 100%;
+}
/* generic bot slider */
.input-group {
align-items: center;
diff --git a/views/assets/html/_bots.html b/views/assets/html/_bots.html
index ce9c4c71..e3d26070 100644
--- a/views/assets/html/_bots.html
+++ b/views/assets/html/_bots.html
@@ -151,13 +151,71 @@
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -236,6 +294,17 @@
None
+
+
+
+
Entries
+
+
+
+
+
None
+
+
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index e31dbcae..bd5ba04f 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -10,6 +10,7 @@ import {
fetchSummary,
getActiveItemId,
hide,
+ obscure,
seedInput,
setActiveItem,
setActiveItemTitle,
@@ -529,8 +530,8 @@ function mCreateBotThumb(bot=getBot()){
* @param {object} collectionItem - The collection item object.
* @returns {HTMLDivElement} - The collection popup.
*/
-function mCreateCollectionPopup(collectionItem) {
- const { id, name, summary, title, type } = collectionItem
+function mCreateCollectionPopup(collectionItem){
+ const { form, id, name, summary, title, type } = collectionItem
const collectionPopup = document.createElement('div')
collectionPopup.classList.add('collection-popup', 'popup-container')
collectionPopup.dataset.active = 'false'
@@ -667,8 +668,64 @@ function mCreateCollectionPopup(collectionItem) {
let typePopup
switch (type) {
case 'entry':
+ // @stub - could switch on `form`
+ const entryType = form
+ ?? type
+ /* improve entry container */
+ const improveEntry = document.createElement('div')
+ improveEntry.classList.add(`collection-popup-${ type }`)
+ improveEntry.id = `popup-${ entryType }_${ id }`
+ improveEntry.name = 'improve-entry-container'
+ /* improve entry lane */
+ const improveEntryLane = document.createElement('div')
+ improveEntryLane.classList.add('improve-entry-lane')
+ /* obscure entry */
+ const obscureEntry = document.createElement('button')
+ obscureEntry.classList.add('obscure-button', 'button')
+ obscureEntry.dataset.id = id /* required for mObscureEntry */
+ obscureEntry.id = `button-obscure-${ entryType }_${ id }`
+ obscureEntry.name = 'obscure-button'
+ obscureEntry.textContent = 'Obscure Entry'
+ obscureEntry.addEventListener('click', mObscureEntry, { once: true })
+ /* experience entry panel */
+ const experienceEntry = document.createElement('div')
+ experienceEntry.classList.add('experience-entry-container')
+ experienceEntry.id = `experience_${ id }`
+ experienceEntry.name = 'experience-entry-container'
+ /* experience entry explanation */
+ const experienceExplanation = document.createElement('div')
+ experienceExplanation.classList.add('experience-entry-explanation')
+ experienceExplanation.id = `experience-explanation_${ id }`
+ experienceExplanation.name = 'experience-entry-explanation'
+ experienceExplanation.textContent = 'Experience an entry by clicking the button below. Eventually, you will be able to experience the entry from multiple perspectives.'
+ /* experience entry button */
+ const experienceButton = document.createElement('button')
+ experienceButton.classList.add('experience-entry-button', 'button')
+ experienceButton.dataset.id = id /* required for triggering PATCH */
+ experienceButton.id = `experience-entry-button_${ id }`
+ experienceButton.name = 'experience-entry-button'
+ experienceButton.textContent = 'Experience Entry'
+ experienceButton.addEventListener('click', _=>{
+ alert('Experience Entry: Coming soon')
+ }, { once: true })
+ /* memory media-carousel */
+ const entryCarousel = document.createElement('div')
+ entryCarousel.classList.add('media-carousel')
+ entryCarousel.id = `media-carousel_${ id }`
+ entryCarousel.name = 'media-carousel'
+ entryCarousel.textContent = 'Coming soon: media file uploads to Enhance and Improve entries'
+ /* append elements */
+ experienceEntry.appendChild(experienceExplanation)
+ experienceEntry.appendChild(experienceButton)
+ improveEntryLane.appendChild(obscureEntry)
+ improveEntryLane.appendChild(experienceEntry)
+ improveEntry.appendChild(improveEntryLane)
+ improveEntry.appendChild(entryCarousel)
+ typePopup = improveEntry
+ break
case 'experience':
case 'file':
+ break
case 'story': // memory
/* improve memory container */
const improveMemory = document.createElement('div')
@@ -706,9 +763,9 @@ function mCreateCollectionPopup(collectionItem) {
improveMemoryLane.appendChild(reliveMemory)
/* memory media-carousel */
const memoryCarousel = document.createElement('div')
- memoryCarousel.classList.add('memory-carousel')
- memoryCarousel.id = `memory-carousel_${ id }`
- memoryCarousel.name = 'memory-carousel'
+ memoryCarousel.classList.add('media-carousel')
+ memoryCarousel.id = `media-carousel_${ id }`
+ memoryCarousel.name = 'media-carousel'
memoryCarousel.textContent = 'Coming soon: media file uploads to Enhance and Improve memories'
/* append elements */
improveMemory.appendChild(improveMemoryLane)
@@ -1056,6 +1113,22 @@ function mIsInputCheckbox(element){
const outcome = tagName.toLowerCase()==='input' && type.toLowerCase()==='checkbox'
return outcome
}
+async function mObscureEntry(event){
+ event.preventDefault()
+ event.stopPropagation()
+ /* set active item */
+ const { id: itemId, } = this.dataset
+ if(itemId)
+ setActiveItem(itemId)
+ toggleMemberInput(false, false)
+ const popupClose = document.getElementById(`popup-close_${ itemId }`)
+ if(popupClose)
+ popupClose.click()
+ const { responses, success, } = await obscure(itemId)
+ if(responses?.length)
+ addMessages(responses)
+ toggleMemberInput(true)
+}
/**
* Open bot container for passed element, closes all the rest.
* @param {HTMLDivElement} element - The bot container.
@@ -1406,6 +1479,24 @@ function mSpotlightBotStatus(){
}
})
}
+/**
+ * Click event to trigger server explanation of how to begin a diary.
+ * @param {Event} event - The event object
+ * @returns {void}
+ */
+async function mStartDiary(event){
+ event.preventDefault()
+ event.stopPropagation()
+ const submitButton = event.target
+ const diaryBot = getBot('diary')
+ if(!diaryBot)
+ return
+ hide(submitButton)
+ unsetActiveItem()
+ await setActiveBot(diaryBot.id)
+ const response = await submit(`How do I get started?`, true)
+ addMessages(response.responses)
+}
async function mStopRelivingMemory(id){
const input = document.getElementById(`relive-memory-input-container_${ id }`)
if(input)
@@ -1620,7 +1711,6 @@ function mTogglePopup(event){
popup.style.opacity = 0
hide(popup)
} else { /* open */
- const { title, type, } = popup.dataset
let { offsetX, offsetY, } = popup.dataset
if(!offsetX || !offsetY){ // initial placement onscreen
const item = popup.parentElement // collection-item
@@ -1647,12 +1737,7 @@ function mTogglePopup(event){
popup.style.right = 'auto'
popup.style.top = offsetY
show(popup)
- if(setActiveItem({
- id,
- popup,
- title,
- type,
- })){
+ if(setActiveItem(popupId)){
// @todo - deactivate any other popups
popup.dataset.active = 'true'
}
@@ -1885,6 +1970,11 @@ function mUpdateBotContainerAddenda(botContainer){
}
switch(type){
case 'diary':
+ // add listener on `diary-start` button
+ const diaryStart = document.getElementById('diary-start')
+ if(diaryStart)
+ diaryStart.addEventListener('click', mStartDiary)
+ break
case 'journaler':
case 'personal-biographer':
break
diff --git a/views/assets/js/members.mjs b/views/assets/js/members.mjs
index 2f6e5179..0dc6fda3 100644
--- a/views/assets/js/members.mjs
+++ b/views/assets/js/members.mjs
@@ -259,18 +259,16 @@ async function setActiveBot(){
* @public
* @todo - edit title with double-click
* @requires chatActiveItem
- * @param {object} item - The item to set as active.
- * @property {string} item.id - The item id.
- * @property {HTMLDivElement} item.popup - The associated popup HTML object.
- * @property {string} item.title - The item title.
- * @property {string} item.type - The item type.
+ * @param {Guid} itemId - The item id to set as active.
* @returns {void}
*/
-function setActiveItem(item){
- const { id, popup, title, type, } = item
- const itemId = id?.split('_')?.pop()
- if(!itemId)
+function setActiveItem(itemId){
+ itemId = itemId?.split('_')?.pop()
+ const id = `popup-container_${ itemId }`
+ const popup = document.getElementById(id)
+ if(!itemId || !popup)
throw new Error('setActiveItem::Error()::valid `id` is required')
+ const { title, type, } = popup.dataset
const chatActiveItemTitleText = document.getElementById('chat-active-item-text')
const chatActiveItemClose = document.getElementById('chat-active-item-close')
if(chatActiveItemTitleText){
@@ -593,6 +591,23 @@ function mInitializePageListeners(){
}
})
}
+/**
+ * MyLife function to obscure an item summary
+ * @param {Guid} itemId - The item ID
+ * @returns
+ */
+async function obscure(itemId){
+ const url = '/members/obscure/' + itemId
+ const response = await fetch(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ })
+ if(!response.ok)
+ throw new Error(`HTTP error! Status: ${response.status}`)
+ return await response.json()
+}
/**
* Primitive step to set a "modality" or intercession for the member chat. Currently will key off dataset in `chatInputField`.
* @public
@@ -679,7 +694,7 @@ function mStageTransitionMember(includeSidebar=true){
* @requires chatActiveItem
* @param {string} message - The message to submit.
* @param {boolean} hideMemberChat - The hide member chat flag, default=`true`.
- * @returns
+ * @returns {Promise
@@ -206,14 +202,12 @@
-
-
+
+
Retire this:
+
+
+
@@ -269,6 +263,11 @@
+
+
Retire this:
+
+
+
@@ -317,7 +316,6 @@
-
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index bd5ba04f..f92185a6 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -30,7 +30,7 @@ const mAvailableCollections = ['entry', 'experience', 'file', 'story'], // ['cha
mCollectionsContainer = document.getElementById('collections-container'),
mCollectionsUpload = document.getElementById('collections-upload'),
mDefaultReliveMemoryButtonText = 'next',
- mDefaultTeam = 'memoir',
+ mDefaultTeam = 'memory',
mGlobals = new Globals(),
passphraseCancelButton = document.getElementById(`personal-avatar-passphrase-cancel`),
passphraseInput = document.getElementById(`personal-avatar-passphrase`),
@@ -235,7 +235,7 @@ async function updatePageBots(bots=mBots, includeGreeting=false, dynamic=false){
throw new Error(`No bots provided to update page.`)
if(mBots!==bots)
mBots = bots
- // await mUpdateTeams()
+ await mUpdateTeams()
await mUpdateBotContainers()
// mUpdateBotBar()
if(includeGreeting)
@@ -1263,6 +1263,60 @@ async function mReliveMemoryRequestStop(id){
console.log('Error stopping relive memory:', error)
}
}
+async function mRetireBot(event){
+ event.preventDefault()
+ event.stopPropagation()
+ try {
+ const { dataset, id, } = event.target
+ const { botId, type, } = dataset
+ /* reset active bot */
+ if(mActiveBot.id===botId)
+ setActiveBot()
+ /* retire bot */
+ const url = window.location.origin + '/members/retire/bot/' + botId
+ let response = await fetch(url, {
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ method: 'POST',
+ })
+ if(!response.ok)
+ throw new Error(`HTTP error! Status: ${response.status}`)
+ response = await response.json()
+ addMessages(response.responses)
+ } catch(err) {
+ console.log('Error posting bot data:', err)
+ addMessage(`Error posting bot data: ${err.message}`)
+ }
+
+}
+/**
+ * Retires chat thread on server and readies for a clean one.
+ * @param {Event} event - The event object
+ * @returns {void}
+ */
+async function mRetireChat(event){
+ event.preventDefault()
+ event.stopPropagation()
+ try {
+ const { dataset, id, } = event.target
+ const { botId, type, } = dataset
+ const url = window.location.origin + '/members/retire/chat/' + botId
+ let response = await fetch(url, {
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ method: 'POST',
+ })
+ if(!response.ok)
+ throw new Error(`HTTP error! Status: ${response.status}`)
+ response = await response.json()
+ addMessages(response.responses)
+ } catch(err) {
+ console.log('Error posting bot data:', err)
+ addMessage(`Error posting bot data: ${err.message}`)
+ }
+}
/**
* Set Bot data on server.
* @param {Object} bot - bot object
@@ -1968,16 +2022,21 @@ function mUpdateBotContainerAddenda(botContainer){
})
}
}
+ /* retirements */
+ const retireChatButton = document.getElementById(`${ type }-retire-chat`)
+ if(retireChatButton){
+ retireChatButton.dataset.botId = id
+ retireChatButton.dataset.type = type
+ retireChatButton.addEventListener('click', mRetireChat)
+ }
+ const retireBotButton = document.getElementById(`${ type }-retire-bot`)
+ if(retireBotButton){
+ retireBotButton.dataset.botId = id
+ retireBotButton.dataset.type = type
+ retireBotButton.addEventListener('click', mRetireBot)
+ }
switch(type){
- case 'diary':
- // add listener on `diary-start` button
- const diaryStart = document.getElementById('diary-start')
- if(diaryStart)
- diaryStart.addEventListener('click', mStartDiary)
- break
- case 'journaler':
- case 'personal-biographer':
- break
+ case 'avatar':
case 'personal-avatar':
/* attach avatar listeners */
/* set additional data attributes */
@@ -1995,6 +2054,16 @@ function mUpdateBotContainerAddenda(botContainer){
hide(tutorialButton)
}
break
+ case 'biographer':
+ case 'journaler':
+ case 'personal-biographer':
+ break
+ case 'diary':
+ // add listener on `diary-start` button
+ const diaryStart = document.getElementById('diary-start')
+ if(diaryStart)
+ diaryStart.addEventListener('click', mStartDiary)
+ break
default:
break
}
@@ -2177,7 +2246,7 @@ async function mUpdateTeams(identifier=mDefaultTeam){
mTeamName.dataset.description = description
mTeamName.innerText = `${ title ?? name } Team`
mTeamName.title = description
- mTeamName.addEventListener('click', mCreateTeamSelect)
+ // @stub mTeamName.addEventListener('click', mCreateTeamSelect)
mTeamAddMemberIcon.addEventListener('click', mCreateTeamMemberSelect)
hide(mTeamPopup)
show(mTeamHeader)
From 1a6382341f3ddb8151069ee12baa2b788b7295a2 Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Thu, 10 Oct 2024 03:04:52 -0400
Subject: [PATCH 06/56] 20241009 @Mookse - cosmetic
---
inc/js/mylife-avatar.mjs | 18 +++++++++---------
views/assets/js/bots.mjs | 6 +++++-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index fcb10ef6..9fd2d715 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -205,7 +205,7 @@ class Avatar extends EventEmitter {
async createBot(bot){
const { type, } = bot
if(!type)
- throw new Error('Bot type required to create.')
+ throw new Error('Bot type required to create')
const singletonBotExists = this.bots
.filter(_bot=>_bot.type===type && !_bot.allowMultiple) // same type, self-declared singleton
.filter(_bot=>_bot.allowedBeings?.includes('avatar')) // avatar allowed to create
@@ -1683,8 +1683,8 @@ function mCreateSystemMessage(activeBot, message, factory){
* Deletes the bot requested from avatar memory and from all long-term storage.
* @param {object} bot - The bot object to delete
* @param {Object[]} bots - The bots array
- * @param {*} llm - OpenAI object
- * @param {*} factory - Agent Factory object
+ * @param {LLMServices} llm - OpenAI object
+ * @param {AgentFactory} factory - Agent Factory object
*/
function mDeleteBot(bot, bots, llm, factory){
const cannotRetire = ['actor', 'system', 'personal-avatar']
@@ -2194,12 +2194,12 @@ function mFindBot(avatar, id){
?.[0]
}
/**
- * Returns set of Greeting messages, dynamic or static.
- * @param {object} bot - The bot object.
- * @param {boolean} dynamic - Whether to use dynamic greetings.
- * @param {*} llm - The LLM object.
- * @param {*} factory - The AgentFactory object.
- * @returns {Promise} - The array of messages to respond with.
+ * Returns set of Greeting messages, dynamic or static
+ * @param {object} bot - The bot object
+ * @param {boolean} dynamic - Whether to use dynamic greetings
+ * @param {LLMServices} llm - OpenAI object
+ * @param {AgentFactory} factory - Agent Factory object
+ * @returns {Promise} - The array of messages to respond with
*/
async function mGreeting(bot, dynamic=false, llm, factory){
const processStartTime = Date.now()
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index f92185a6..7083d05e 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -1263,6 +1263,11 @@ async function mReliveMemoryRequestStop(id){
console.log('Error stopping relive memory:', error)
}
}
+/**
+ * Request to retire an identified bot.
+ * @param {Event} event - The event object
+ * @returns {void}
+ */
async function mRetireBot(event){
event.preventDefault()
event.stopPropagation()
@@ -1288,7 +1293,6 @@ async function mRetireBot(event){
console.log('Error posting bot data:', err)
addMessage(`Error posting bot data: ${err.message}`)
}
-
}
/**
* Retires chat thread on server and readies for a clean one.
From 612169a86fe8caefbb72b70e9523a71fe8e9223c Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Thu, 10 Oct 2024 21:24:00 -0400
Subject: [PATCH 07/56] 20241010 @Mookse - migrateChat Functionality #405 -
frontend bot version HTML, CSS
---
views/assets/css/bots.css | 19 +++++++++++++------
views/assets/html/_bots.html | 4 ++++
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/views/assets/css/bots.css b/views/assets/css/bots.css
index b32f2c21..cd857547 100644
--- a/views/assets/css/bots.css
+++ b/views/assets/css/bots.css
@@ -216,23 +216,30 @@
}
.bot-title,
.collections-title {
+ align-items: center;
color: aliceblue;
display: flex;
- flex: 1 0 auto;
+ flex: 0 0 70%;
font-size: 0.8rem;
font-weight: bold;
max-height: 100%;
overflow: hidden;
overflow-wrap: break-word;
- max-width: 70%;
+}
+.bot-title-name,
+.bot-title-type {
+ flex: 0 1 auto;
+ margin-right: 0.4rem;
}
.bot-title-name {
color: aquamarine;
- max-width: 50%;
+ flex-grow: 1;
}
-.bot-title-type {
- margin-right: 0.8rem;
- max-width: 50%;
+.bot-title-version {
+ color: lightblue;
+ flex: 0 0 auto;
+ font-size: 0.6rem;
+ margin-left: auto; /* Pushes the version div to the right end */
}
.mylife-widget.bots {
flex-direction: column;
diff --git a/views/assets/html/_bots.html b/views/assets/html/_bots.html
index c525c4ee..630e532e 100644
--- a/views/assets/html/_bots.html
+++ b/views/assets/html/_bots.html
@@ -6,6 +6,7 @@
+
@@ -45,6 +46,7 @@
+
@@ -157,6 +159,7 @@
+
@@ -216,6 +219,7 @@
+
From a16a8ba34bebf23d0766a8c180ced328e9905501 Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Thu, 10 Oct 2024 21:35:59 -0400
Subject: [PATCH 08/56] 20241010 @Mookse - migrateChat Functionality #405 -
version live display
---
views/assets/js/bots.mjs | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index 7083d05e..c55d320c 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -1359,12 +1359,21 @@ async function mSetBot(bot){
* @returns {void}
*/
function mSetAttributes(bot=mActiveBot, botContainer){
- const { activated=[], activeFirst, bot_id: botId, bot_name: botName, dob, id, interests, mbr_id, narrative, privacy, provider, purpose, thread_id: threadId, type, updates, } = bot
- const memberHandle = mGlobals.getHandle(mbr_id)
- const bot_name = botName
- ?? `${ memberHandle + '_' + type }`
- const thread_id = threadId
- ?? ''
+ const {
+ activated=[],
+ activeFirst,
+ bot_id: botId,
+ bot_name='Anonymous',
+ dob,
+ id,
+ interests,
+ mbr_id,
+ narrative,
+ privacy,
+ type,
+ updates,
+ version
+ } = bot
/* attributes */
const attributes = [
{ name: 'activated', value: activated },
@@ -1374,10 +1383,9 @@ function mSetAttributes(bot=mActiveBot, botContainer){
{ name: 'bot_name', value: bot_name },
{ name: 'id', value: id },
{ name: 'initialized', value: Date.now() },
- { name: 'mbr_handle', value: memberHandle },
{ name: 'mbr_id', value: mbr_id },
- { name: 'thread_id', value: thread_id },
{ name: 'type', value: type },
+ { name: 'version', value: version },
]
if(dob)
attributes.push({ name: 'dob', value: dob })
@@ -1405,12 +1413,12 @@ function mSetAttributes(bot=mActiveBot, botContainer){
* @private
* @requires mActiveBot - active bot object, but can be undefined without error.
* @param {object} bot - The bot object.
- * @returns {object} - Determined status.
+ * @returns {void}
*/
function mSetStatusBar(bot, botContainer){
const { dataset, } = botContainer
- const { id, type, } = dataset
- const { bot_id, bot_name, thread_id, type: botType, } = bot
+ const { id, type, version, } = dataset
+ const { bot_id, bot_name, thread_id, type: botType, version: botVersion, } = bot
const botStatusBar = document.getElementById(`${ type }-status`)
if(!type || !botType==type || !botStatusBar)
return
@@ -1450,8 +1458,10 @@ function mSetStatusBar(bot, botContainer){
const botTitleName = document.getElementById(`${ type }-title-name`)
if(botTitleName)
botTitleName.textContent = response.name
- return response
-}
+ /* version */
+ const botVersionElement = document.getElementById(`${ type }-title-version`)
+ if(botVersionElement)
+ botVersionElement.textContent = `v.${ version?.includes('.') ? version : `${ version }.0` ?? '1.0' }` }
/**
* Sets collection item content on server.
* @private
From ca50a17a7ee6a400e703c1d6684c123f551c41a8 Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Thu, 10 Oct 2024 22:00:35 -0400
Subject: [PATCH 09/56] 20241010 @Mookse - migrateChat Functionality #405 - bot
selection updated
---
views/assets/js/bots.mjs | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index c55d320c..72b5e4a0 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -1675,20 +1675,20 @@ function mTeamSelect(event){
*/
async function mToggleBotContainers(event){
event.stopPropagation()
- // add turn for first time clicked on collection header it refreshes from server, then from there you need to click
const botContainer = this
const element = event.target
const { dataset, id, } = botContainer
const itemIdSnippet = element.id.split('-').pop()
switch(itemIdSnippet){
case 'name':
- // @todo: double-click to edit in place
+ case 'title':
+ case 'titlebar':
+ mOpenStatusDropdown(this)
break
case 'icon':
- case 'title':
+ case 'type':
if(dataset?.status && !(['error', 'offline', 'unknown'].includes(dataset.status)))
await setActiveBot(dataset?.id ?? id, true)
- mOpenStatusDropdown(this)
break
case 'status':
case 'type':
@@ -1697,6 +1697,10 @@ async function mToggleBotContainers(event){
break
case 'update':
case 'upload':
+ break
+ case 'version':
+ console.log('Version:', dataset.version, 'check version against server', mTeams)
+ break
default:
break
}
From 6f39b90683881c7a3205c19fbed3f9ebb636fc05 Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Thu, 10 Oct 2024 22:27:19 -0400
Subject: [PATCH 10/56] 20241010 @Mookse - migrateChat Functionality #405 - fix
modular code deformation
---
inc/js/mylife-agent-factory.mjs | 47 ++++++++++++++++++++++++++-------
inc/js/mylife-avatar.mjs | 3 ++-
2 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/inc/js/mylife-agent-factory.mjs b/inc/js/mylife-agent-factory.mjs
index 57d81aff..46583fab 100644
--- a/inc/js/mylife-agent-factory.mjs
+++ b/inc/js/mylife-agent-factory.mjs
@@ -44,7 +44,7 @@ const mGeneralBotId = 'asst_yhX5mohHmZTXNIH55FX2BR1m'
const mLLMServices = new LLMServices()
const mMyLifeTeams = [
{
- active: true,
+ active: false,
allowCustom: true,
allowedTypes: ['artworks', 'editor', 'idea', 'marketing'],
defaultTypes: ['artworks', 'idea',],
@@ -104,7 +104,7 @@ const mMyLifeTeams = [
title: 'Spirituality',
},
{
- active: true,
+ active: false,
allowCustom: true,
allowedTypes: ['data-ownership', 'investment', 'ubi',],
defaultTypes: ['ubi'],
@@ -458,8 +458,8 @@ class BotFactory extends EventEmitter{
}
/**
* Gets a collection of stories of a certain format.
- * @param {string} form - The form of the stories to retrieve.
- * @returns {object[]} - The stories.
+ * @param {string} form - The form of the stories to retrieve
+ * @returns {object[]} - The stories
*/
async stories(form){
return await this.dataservices.getItemsByFields(
@@ -469,20 +469,24 @@ class BotFactory extends EventEmitter{
}
/**
* Gets a MyLife Team by id.
- * @param {Guid} teamId - The Team id.
- * @returns {object} - The Team.
+ * @param {Guid} teamId - The Team id
+ * @returns {object} - The Team
*/
team(teamId){
- return mMyLifeTeams
+ let team = mMyLifeTeams
.find(team=>team.id===teamId)
+ team = mTeam(team)
+ return team
}
/**
* Retrieves list of MyLife Teams.
- * @returns {object[]} - The array of MyLife Teams.
+ * @returns {object[]} - The array of MyLife Teams
*/
teams(){
- return mMyLifeTeams
+ const teams = mMyLifeTeams
.filter(team=>team.active ?? false)
+ .map(team=>mTeam(team))
+ return teams
}
/**
* Adds or updates a bot data in MyLife database. Note that when creating, pre-fill id.
@@ -1739,6 +1743,31 @@ function mSanitizeSchemaValue(_value) {
return wasTrimmed ? _value[0] + trimmedStr + _value[0] : trimmedStr
}
+/**
+ * Decouples team from modular reference.
+ * @param {object} team - Team object from modular codespace
+ * @returns {object} - Returns sanitized team object
+ */
+function mTeam(team){
+ const {
+ allowCustom,
+ allowedTypes,
+ defaultTypes,
+ description,
+ id,
+ name,
+ title,
+ } = team
+ return {
+ allowCustom,
+ allowedTypes: [...allowedTypes],
+ defaultTypes: [...defaultTypes],
+ description,
+ id,
+ name,
+ title,
+ }
+}
/**
* Updates bot in Cosmos, and if necessary, in LLM.
* @param {AgentFactory} factory - Factory object
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index 9fd2d715..edd1b24c 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -812,7 +812,8 @@ class Avatar extends EventEmitter {
* @returns {Object[]} - List of team objects.
*/
teams(){
- return this.#factory.teams()
+ const teams = this.#factory.teams()
+ return teams
}
async thread_id(){
if(!this.conversations.length){
From 4680d8f41c731f258163e679422087077aaaf3fb Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Fri, 11 Oct 2024 00:26:48 -0400
Subject: [PATCH 11/56] 20241010 @Mookse - route `updateBotInstructions`
---
inc/js/functions.mjs | 17 +++++---
inc/js/mylife-avatar.mjs | 84 ++++++++++++++++++++++-----------------
inc/js/routes.mjs | 2 +-
views/assets/css/bots.css | 21 ++++++++++
4 files changed, 81 insertions(+), 43 deletions(-)
diff --git a/inc/js/functions.mjs b/inc/js/functions.mjs
index 1919dcd2..b4342b2f 100644
--- a/inc/js/functions.mjs
+++ b/inc/js/functions.mjs
@@ -19,7 +19,12 @@ async function about(ctx){
function activateBot(ctx){
const { avatar, } = ctx.state
avatar.activeBotId = ctx.params.bid
- ctx.body = { activeBotId: avatar.activeBotId }
+ const { activeBotId, activeBotVersion, activeBotNewestVersion, } = avatar
+ ctx.body = {
+ activeBotId,
+ activeBotVersion,
+ version: activeBotNewestVersion,
+ }
}
async function alerts(ctx){
// @todo: put into ctx the _type_ of alert to return, system use dataservices, member use personal
@@ -391,11 +396,11 @@ function teams(ctx){
async function updateBotInstructions(ctx){
const { botId, } = ctx.request.body
const { avatar, } = ctx.state
- let success = false
- const bot = await avatar.updateBot(botId, { instructions: true, model: true, tools: true, })
- if(bot)
- success = true
- ctx.body = { bot, success, }
+ const bot = await avatar.updateBotInstructions(botId)
+ ctx.body = {
+ bot,
+ success: !!bot,
+ }
}
/**
* Proxy for uploading files to the API.
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index edd1b24c..da947e6a 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -212,8 +212,8 @@ class Avatar extends EventEmitter {
.length
if(singletonBotExists)
throw new Error(`Bot type "${type}" already exists and bot-multiples disallowed.`)
- const assistant = await mBot(this.#factory, this, bot)
- return mPruneBot(assistant)
+ bot = await mBot(this.#factory, this, bot)
+ return mPruneBot(bot)
}
/**
* Create a new conversation.
@@ -831,31 +831,33 @@ class Avatar extends EventEmitter {
return await mBot(this.#factory, this, bot) // **note**: mBot() updates `avatar.bots`
}
/**
- * Update core for bot-assistant based on type. Default updates all LLM pertinent properties.
- * @param {string} id - The id of bot to update.
- * @param {boolean} includeInstructions - Whether to include instructions in the update.
- * @param {boolean} includeModel - Whether to include model in the update.
- * @param {boolean} includeTools - Whether to include tools in the update.
- * @returns {object} - The updated bot object.
+ * Update instructions for bot-assistant based on type. Default updates all LLM pertinent properties.
+ * @param {string} id - The id of bot to update
+ * @param {boolean} migrateThread - Whether to migrate the thread to the new bot, defaults to `true`
+ * @returns {object} - The updated bot object
*/
- async updateInstructions(id=this.activeBot.id, includeInstructions=true, includeModel=true, includeTools=true){
+ async updateBotInstructions(id=this.activeBot.id, migrateThread=true){
let bot = mFindBot(this, id)
?? this.activeBot
if(!bot)
throw new Error(`Bot not found: ${ id }`)
- const { bot_id, interests, type, } = bot
- if(!type?.length)
- return
- const _bot = { bot_id, id, interests, type, }
- const vectorstoreId = this.#vectorstoreId
- const options = {
- instructions: includeInstructions,
- model: includeModel,
- tools: includeTools,
- vectorstoreId,
+ const { bot_id, flags, interests, thread_id, type, version=1.0, } = bot
+ /* check version */
+ const newestVersion = this.#factory.botInstructionsVersion(type)
+ if(newestVersion!=version){ // intentional loose match (string vs. number)
+ const _bot = { bot_id, flags, id, interests, type, }
+ const vectorstoreId = this.#vectorstoreId
+ const options = {
+ instructions: true,
+ model: true,
+ tools: true,
+ vectorstoreId,
+ }
+ /* save to && refresh bot from Cosmos */
+ bot = mSanitize( await this.#factory.updateBot(_bot, options) )
+ if(migrateThread && thread_id?.length)
+ await this.migrateChat(thread_id)
}
- /* save to && refresh bot from Cosmos */
- bot = mSanitize( await this.#factory.updateBot(_bot, options) )
return mPruneBot(bot)
}
/**
@@ -903,23 +905,26 @@ class Avatar extends EventEmitter {
return this.#activeBotId
}
/**
- * Set the active bot id. If not match found in bot list, then defaults back to this.id
+ * Set the active bot id. If not match found in bot list, then defaults back to this.id (avatar).
* @setter
* @requires mBotInstructions
- * @param {string} id - The active bot id.
+ * @param {string} botId - The requested bot id
* @returns {void}
*/
- set activeBotId(id){
- const newActiveBot = mFindBot(this, id)
+ set activeBotId(botId){
+ const newActiveBot = mFindBot(this, botId)
?? this.avatar
- const { id: newActiveId, type, version: botVersion=1.0, } = newActiveBot
- const currentVersion = this.#factory.botInstructionsVersion(type)
- if(botVersion!==currentVersion){
- this.updateInstructions(newActiveId, true, false, true)
- /* update bot in this.#bots */
-
- }
- this.#activeBotId = newActiveId
+ const { id, } = newActiveBot
+ this.#activeBotId = id
+ }
+ get activeBotNewestVersion(){
+ const { type, } = this.activeBot
+ const newestVersion = this.#factory.botInstructionsVersion(type)
+ return newestVersion
+ }
+ get activeBotVersion(){
+ const { version=1.0, } = this.activeBot
+ return version
}
/**
* Get actor or default avatar bot.
@@ -2366,11 +2371,18 @@ function mNavigation(scenes){
}
/**
* Returns a frontend-ready bot object.
- * @param {object} assistantData - The assistant data object.
+ * @param {object} bot - The bot object.
* @returns {object} - The pruned bot object.
*/
-function mPruneBot(assistantData){
- const { bot_id, bot_name: name, description, id, purpose, type, } = assistantData
+function mPruneBot(bot){
+ const {
+ bot_id,
+ bot_name: name,
+ description,
+ id,
+ purpose,
+ type,
+ } = bot
return {
bot_id,
name,
diff --git a/inc/js/routes.mjs b/inc/js/routes.mjs
index b385a6e5..d18b02e2 100644
--- a/inc/js/routes.mjs
+++ b/inc/js/routes.mjs
@@ -133,7 +133,7 @@ _memberRouter.post('/summarize', summarize)
_memberRouter.post('/teams/:tid', team)
_memberRouter.post('/upload', upload)
_memberRouter.put('/bots/:bid', bots)
-_memberRouter.put('/bots/system-update/:bid', updateBotInstructions)
+_memberRouter.put('/bots/version/:bid', updateBotInstructions)
_memberRouter.put('/item/:iid', item)
// Mount the subordinate routers along respective paths
_Router.use('/members', _memberRouter.routes(), _memberRouter.allowedMethods())
diff --git a/views/assets/css/bots.css b/views/assets/css/bots.css
index cd857547..7e9a4346 100644
--- a/views/assets/css/bots.css
+++ b/views/assets/css/bots.css
@@ -237,6 +237,7 @@
}
.bot-title-version {
color: lightblue;
+ cursor: not-allowed;
flex: 0 0 auto;
font-size: 0.6rem;
margin-left: auto; /* Pushes the version div to the right end */
@@ -297,6 +298,26 @@
animation: none;
padding: 0;
}
+.update-available {
+ align-items: flex-end;
+ background-color: rgb(255 0 123 / 50%);
+ border: thin solid rgb(255 157 190 / 66%);
+ border-radius: var(--border-radius);
+ display: flex;
+ justify-content: flex-end;
+ padding: 0.3rem;
+}
+.update-available:hover {
+ align-items: flex-end;
+ background-color: rgba(255, 251, 0, 0.5);
+ border: thin solid rgba(255, 205, 222, 0.66);
+ border-radius: var(--border-radius);
+ color: black;
+ cursor: pointer;
+ display: flex;
+ justify-content: flex-end;
+ padding: 0.3rem;
+}
/* bot-collections */
.collection {
background-color: royalblue;
From ffad103e4b5dbbce5d3c51e71b88c862fb48436c Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Fri, 11 Oct 2024 01:36:56 -0400
Subject: [PATCH 12/56] 20241010 @Mookse - migrateChat Functionality #405 -
route requirement fixed for updateBotInstructions
---
inc/js/functions.mjs | 6 ++-
inc/js/mylife-avatar.mjs | 18 +++++---
views/assets/js/bots.mjs | 92 +++++++++++++++++++++++++++++++---------
3 files changed, 88 insertions(+), 28 deletions(-)
diff --git a/inc/js/functions.mjs b/inc/js/functions.mjs
index b4342b2f..16352657 100644
--- a/inc/js/functions.mjs
+++ b/inc/js/functions.mjs
@@ -394,9 +394,11 @@ function teams(ctx){
ctx.body = avatar.teams()
}
async function updateBotInstructions(ctx){
- const { botId, } = ctx.request.body
+ const { bid, } = ctx.params
+ if(!bid?.length)
+ ctx.throw(400, `missing bot id`)
const { avatar, } = ctx.state
- const bot = await avatar.updateBotInstructions(botId)
+ const bot = await avatar.updateBotInstructions(bid)
ctx.body = {
bot,
success: !!bot,
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index da947e6a..ba5f72cd 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -500,11 +500,13 @@ class Avatar extends EventEmitter {
?.[0]
return { content, metadata, role, }
})
+ .filter(message=>!/^## [^\n]* LIST\n/.test(message.content))
const { botId, } = conversation
const bot = this.getBot(botId)
switch(bot.type){
case 'biographer':
case 'personal-biographer':
+ const type = 'memory'
const memories = ( await this.collections('story') )
.sort((a, b)=>a._ts-b._ts)
.slice(0, 12)
@@ -516,7 +518,7 @@ class Avatar extends EventEmitter {
.join(',')
.slice(0, 512)
messages.push({
- content: `## MEMORY COLLECTION LIST\n${ memoryList }`, // insert actual memory list with titles here for intelligence to reference
+ content: `## ${ type } LIST\n${ memoryList }`, // insert actual memory list with titles here for intelligence to reference
metadata: {
collectionList: memoryCollectionList,
collectiontypes: 'memory,story,narrative',
@@ -530,7 +532,7 @@ class Avatar extends EventEmitter {
const _type = 'entry'
const entries = ( await this.collections(_type) )
.sort((a, b)=>a._ts-b._ts)
- .slice(0, 128)
+ .slice(0, 25)
const entryList = entries
.map(entry=>`- itemId: ${ entry.id } :: ${ entry.title }`)
.join('\n')
@@ -539,7 +541,7 @@ class Avatar extends EventEmitter {
.join(',')
.slice(0, 512)
messages.push({
- content: `## ${ _type.toUpperCase() } List:\n${ entryList }`,
+ content: `## ${ _type.toUpperCase() } LIST\n${ entryList }`,
metadata: {
collectionList: entryCollectionList,
collectiontypes: _type,
@@ -824,6 +826,7 @@ class Avatar extends EventEmitter {
}
/**
* Update a specific bot.
+ * @async
* @param {object} bot - Bot data to set.
* @returns {object} - The updated bot.
*/
@@ -832,6 +835,7 @@ class Avatar extends EventEmitter {
}
/**
* Update instructions for bot-assistant based on type. Default updates all LLM pertinent properties.
+ * @async
* @param {string} id - The id of bot to update
* @param {boolean} migrateThread - Whether to migrate the thread to the new bot, defaults to `true`
* @returns {object} - The updated bot object
@@ -841,7 +845,7 @@ class Avatar extends EventEmitter {
?? this.activeBot
if(!bot)
throw new Error(`Bot not found: ${ id }`)
- const { bot_id, flags, interests, thread_id, type, version=1.0, } = bot
+ const { bot_id, flags='', interests='', thread_id, type, version=1.0, } = bot
/* check version */
const newestVersion = this.#factory.botInstructionsVersion(type)
if(newestVersion!=version){ // intentional loose match (string vs. number)
@@ -2376,20 +2380,20 @@ function mNavigation(scenes){
*/
function mPruneBot(bot){
const {
- bot_id,
bot_name: name,
description,
id,
purpose,
type,
+ version,
} = bot
return {
- bot_id,
- name,
description,
id,
+ name,
purpose,
type,
+ version,
}
}
function mPruneConversation(conversation){
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index 72b5e4a0..b4237d16 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -158,9 +158,9 @@ async function setActiveBot(event, dynamic=false){
throw new Error(`ERROR: failure to set active bot.`)
if(initialActiveBot===mActiveBot)
return // no change, no problem
- const { id, } = mActiveBot
+ const { id, type, } = mActiveBot
/* confirm via server request: set active bot */
- const serverActiveId = await fetch(
+ const serverResponse = await fetch(
'/members/bots/activate/' + id,
{
method: 'POST',
@@ -168,24 +168,21 @@ async function setActiveBot(event, dynamic=false){
'Content-Type': 'application/json'
}
})
- .then(response => {
+ .then(response=>{
if(!response.ok){
throw new Error(`HTTP error! Status: ${response.status}`)
}
return response.json()
})
- .then(response => {
- return response.activeBotId
- })
- .catch(error => {
- console.log('Error:', error)
- alert('Server error setting active bot.')
+ .catch(error=>{
+ addMessage(`Server error setting active bot: ${ error.message }`)
return
})
/* update active bot */
- if(serverActiveId!==id){
+ const { activeBotId, activeBotVersion, version, } = serverResponse
+ if(activeBotId!==id){
mActiveBot = initialActiveBot
- throw new Error(`ERROR: server failed to set active bot.`)
+ addMessage('Server error setting active bot.')
}
/* update page bot data */
const { activated=[], activatedFirst=Date.now(), } = mActiveBot
@@ -193,6 +190,17 @@ async function setActiveBot(event, dynamic=false){
activated.push(Date.now()) // newest date is last to .pop()
// dynamic = (Date.now()-activated.pop()) > (20*60*1000)
mActiveBot.activated = activated
+ if(activeBotVersion!==version){
+ const botVersion = document.getElementById(`${ type }-title-version`)
+ if(botVersion){
+ botVersion.classList.add('update-available')
+ botVersion.dataset.botId = activeBotId
+ botVersion.dataset.currentVersion = activeBotVersion
+ botVersion.dataset.type = type
+ botVersion.dataset.updateVersion = version
+ botVersion.addEventListener('click', mUpdateBotVersion, { once: true })
+ }
+ }
/* update page */
mSpotlightBotBar()
mSpotlightBotStatus()
@@ -261,6 +269,19 @@ function mBotActive(id){
return id===mActiveBot?.id
?? false
}
+/**
+ * Request version update to bot.
+ * @param {Guid} botId - The bot id to update
+ * @returns {object} - Response from server { bot, success, }
+ */
+async function mBotVersionUpdate(botId){
+ const url = window.location.origin + '/members/bots/version/' + botId
+ const method = 'PUT'
+ const response = await fetch(url, { method, })
+ if(!response.ok)
+ throw new Error(`HTTP error! Status: ${response.status}`)
+ return await response.json()
+}
/**
* Request bot be created on server.
* @requires mActiveTeam
@@ -1362,12 +1383,13 @@ function mSetAttributes(bot=mActiveBot, botContainer){
const {
activated=[],
activeFirst,
- bot_id: botId,
bot_name='Anonymous',
dob,
- id,
+ flags,
+ id: bot_id,
interests,
mbr_id,
+ name,
narrative,
privacy,
type,
@@ -1377,11 +1399,11 @@ function mSetAttributes(bot=mActiveBot, botContainer){
/* attributes */
const attributes = [
{ name: 'activated', value: activated },
- { name: 'active', value: mBotActive(id) },
+ { name: 'active', value: mBotActive(bot_id) },
{ name: 'activeFirst', value: activeFirst },
- { name: 'bot_id', value: botId },
- { name: 'bot_name', value: bot_name },
- { name: 'id', value: id },
+ { name: 'bot_id', value: bot_id },
+ { name: 'bot_name', value: name ?? bot_name },
+ { name: 'id', value: bot_id },
{ name: 'initialized', value: Date.now() },
{ name: 'mbr_id', value: mbr_id },
{ name: 'type', value: type },
@@ -1389,6 +1411,8 @@ function mSetAttributes(bot=mActiveBot, botContainer){
]
if(dob)
attributes.push({ name: 'dob', value: dob })
+ if(flags)
+ attributes.push({ name: 'flags', value: flags })
if(interests)
attributes.push({ name: 'interests', value: interests })
if(narrative)
@@ -1418,7 +1442,7 @@ function mSetAttributes(bot=mActiveBot, botContainer){
function mSetStatusBar(bot, botContainer){
const { dataset, } = botContainer
const { id, type, version, } = dataset
- const { bot_id, bot_name, thread_id, type: botType, version: botVersion, } = bot
+ const { bot_id, bot_name, type: botType, version: botVersion, } = bot
const botStatusBar = document.getElementById(`${ type }-status`)
if(!type || !botType==type || !botStatusBar)
return
@@ -1461,7 +1485,8 @@ function mSetStatusBar(bot, botContainer){
/* version */
const botVersionElement = document.getElementById(`${ type }-title-version`)
if(botVersionElement)
- botVersionElement.textContent = `v.${ version?.includes('.') ? version : `${ version }.0` ?? '1.0' }` }
+ botVersionElement.textContent = mVersion(version)
+}
/**
* Sets collection item content on server.
* @private
@@ -2086,6 +2111,25 @@ function mUpdateBotContainerAddenda(botContainer){
break
}
}
+/**
+ * Updates bot version on server.
+ * @param {Event} event - The event object
+ * @returns {void}
+ */
+async function mUpdateBotVersion(event){
+ event.stopPropagation()
+ const { classList, dataset,} = event.target
+ const { botId, currentVersion, updateVersion, } = dataset
+ if(currentVersion==updateVersion)
+ return
+ const updatedVersion = await mBotVersionUpdate(botId)
+ if(updatedVersion?.success){
+ const { version, } = updatedVersion.bot
+ dataset.currentVersion = version
+ event.target.textContent = mVersion(version)
+ classList.remove('update-available')
+ }
+}
/**
* Update the identified collection with provided specifics.
* @param {string} type - The collection type.
@@ -2331,6 +2375,16 @@ function mUploadFilesInputRemove(fileInput, uploadParent, uploadButton){
uploadParent.removeChild(fileInput)
uploadButton.disabled = false
}
+/**
+ * Versions per frontend.
+ * @param {string} version - The version to format
+ * @returns {string} - The formatted version
+ */
+function mVersion(version){
+ version = version.toString()
+ version = `v.${ version?.includes('.') ? version : `${ version }.0` ?? '1.0' }`
+ return version
+}
/* exports */
// @todo - export combine of fetchBots and updatePageBots
export {
From eafb1b816fdbcb625d579dc192a66939361b275b Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Sun, 13 Oct 2024 23:51:47 -0400
Subject: [PATCH 13/56] 20241013 @Mookse - migrateChat Functionality #405 -
generic fixes
---
.../class-conversation-functions.mjs | 1 -
.../class-extenders.mjs | 18 +-
inc/js/mylife-avatar.mjs | 265 +++++++++++-------
inc/js/mylife-data-service.js | 15 +-
4 files changed, 183 insertions(+), 116 deletions(-)
diff --git a/inc/js/factory-class-extenders/class-conversation-functions.mjs b/inc/js/factory-class-extenders/class-conversation-functions.mjs
index 55afc6e6..91af01ff 100644
--- a/inc/js/factory-class-extenders/class-conversation-functions.mjs
+++ b/inc/js/factory-class-extenders/class-conversation-functions.mjs
@@ -32,7 +32,6 @@ async function mSaveConversation(factory, conversation){
type,
}
const newConversation = await factory.dataservices.pushItem(_newConversation)
- console.log('mSaveConversation::newConversation::created', id, newConversation?.id)
return !!newConversation
}
const updatedConversation = await factory.dataservices.patch(
diff --git a/inc/js/factory-class-extenders/class-extenders.mjs b/inc/js/factory-class-extenders/class-extenders.mjs
index 25a1e02f..d6f9376e 100644
--- a/inc/js/factory-class-extenders/class-extenders.mjs
+++ b/inc/js/factory-class-extenders/class-extenders.mjs
@@ -125,6 +125,7 @@ function extendClass_contribution(originClass, referencesObject) {
*/
function extendClass_conversation(originClass, referencesObject) {
class Conversation extends originClass {
+ #bot_id
#factory
#messages = []
#saved = false
@@ -141,7 +142,8 @@ function extendClass_conversation(originClass, referencesObject) {
super(obj)
this.#factory = factory
this.#thread = thread
- this.bot_id = bot_id
+ if(factory.globals.isValidGuid(bot_id))
+ this.#bot_id = bot_id
this.form = this.form
?? 'system'
this.name = `conversation_${this.#factory.mbr_id}`
@@ -235,7 +237,10 @@ function extendClass_conversation(originClass, referencesObject) {
* @returns {Guid} - The bot id.
*/
get botId(){
- return this.bot_id
+ return this.#bot_id
+ }
+ get bot_id(){
+ return this.#bot_id
}
/**
* Set the id {Guid} of the conversation's bot.
@@ -244,7 +249,14 @@ function extendClass_conversation(originClass, referencesObject) {
* @returns {void}
*/
set botId(bot_id){
- this.bot_id = bot_id
+ if(!this.#factory.globals.isValidGuid(bot_id))
+ throw new Error(`Invalid bot_id: ${ bot_id }`)
+ this.#bot_id = bot_id
+ }
+ set bot_id(bot_id){
+ if(!this.#factory.globals.isValidGuid(bot_id))
+ throw new Error(`Invalid bot_id: ${ bot_id }`)
+ this.#bot_id = bot_id
}
get isSaved(){
return this.#saved
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index ba5f72cd..38ebcf96 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -99,7 +99,7 @@ class Avatar extends EventEmitter {
if(!activeBotId)
throw new Error('Parameter `activeBotId` required.')
const { activeBot, factory } = this
- const { id: botId, thread_id, } = activeBot
+ const { bot_id, id: botId, thread_id, } = activeBot
if(botId!==activeBotId)
throw new Error(`Invalid bot id: ${ activeBotId }, active bot id: ${ botId }`)
conversation = conversation
@@ -107,7 +107,8 @@ class Avatar extends EventEmitter {
?? await this.createConversation('chat', threadId ?? thread_id, activeBotId)
if(!conversation)
throw new Error('No conversation found for thread id and could not be created.')
- conversation.bot_id = activeBot.bot_id // pass in via quickly mutating conversation (or independently if preferred in end), versus llmServices which are global
+ conversation.bot_id = botId
+ conversation.llm_id = bot_id
let _message = message,
messages = []
if(shadowId)
@@ -115,9 +116,9 @@ class Avatar extends EventEmitter {
else {
if(itemId){
// @todo - check if item exists in memory, fewer pings and inclusions overall
- const { summary, } = await factory.item(itemId)
+ let { summary, } = await factory.item(itemId)
if(summary?.length){
- _message = `possible **update-summary-request**: itemId=${ itemId }\n`
+ summary = `possible **update-summary-request**: itemId=${ itemId }\n`
+ `**member-update-request**:\n`
+ message
+ `\n**current-summary-in-database**:\n`
@@ -485,90 +486,14 @@ class Avatar extends EventEmitter {
* @returns {Conversation} - The migrated conversation object
*/
async migrateChat(thread_id){
- /* MyLife conversation re-assignment */
+ /* validate request */
const conversation = this.getConversation(thread_id)
if(!conversation)
- throw new Error(`Conversation not found with thread_id: ${ thread_id }`)
- let messages = await this.#llmServices.messages(thread_id)
- messages = messages
- .slice(0, 25)
- .map(message=>{
- const { content: contentArray, id, metadata, role, } = message
- const content = contentArray
- .filter(_content=>_content.type==='text')
- .map(_content=>_content.text?.value)
- ?.[0]
- return { content, metadata, role, }
- })
- .filter(message=>!/^## [^\n]* LIST\n/.test(message.content))
- const { botId, } = conversation
- const bot = this.getBot(botId)
- switch(bot.type){
- case 'biographer':
- case 'personal-biographer':
- const type = 'memory'
- const memories = ( await this.collections('story') )
- .sort((a, b)=>a._ts-b._ts)
- .slice(0, 12)
- const memoryList = memories
- .map(memory=>`- itemId: ${ memory.id } :: ${ memory.title }`)
- .join('\n')
- const memoryCollectionList = memories
- .map(memory=>memory.id)
- .join(',')
- .slice(0, 512)
- messages.push({
- content: `## ${ type } LIST\n${ memoryList }`, // insert actual memory list with titles here for intelligence to reference
- metadata: {
- collectionList: memoryCollectionList,
- collectiontypes: 'memory,story,narrative',
- },
- role: 'assistant',
- }) // add summary of Memories (etc. due to type) for intelligence to reference, also could add attachment file
- break
- case 'diary':
- case 'journal':
- case 'journaler':
- const _type = 'entry'
- const entries = ( await this.collections(_type) )
- .sort((a, b)=>a._ts-b._ts)
- .slice(0, 25)
- const entryList = entries
- .map(entry=>`- itemId: ${ entry.id } :: ${ entry.title }`)
- .join('\n')
- const entryCollectionList = entries
- .map(entry=>entry.id)
- .join(',')
- .slice(0, 512)
- messages.push({
- content: `## ${ _type.toUpperCase() } LIST\n${ entryList }`,
- metadata: {
- collectionList: entryCollectionList,
- collectiontypes: _type,
- },
- role: 'assistant',
- }) // add summary of Entries
- break
- default:
- break
- }
- const metadata = {
- bot_id: botId,
- conversation_id: conversation.id,
- }
- const newThread = await this.#llmServices.thread(null, messages.reverse(), metadata)
- conversation.setThread(newThread)
- bot.thread_id = conversation.thread_id
- const _bot = {
- id: bot.id,
- thread_id: bot.thread_id,
- }
- await this.#factory.updateBot(_bot)
- if(mAllowSave)
- conversation.save()
- else
- console.log('migrateChat::BYPASS-SAVE', conversation.thread_id)
- return conversation
+ throw new Error(`Conversation thread_id not found: ${ thread_id }`)
+ /* execute request */
+ const updatedConversation = await mMigrateChat(this, this.#factory, this.#llmServices, conversation)
+ /* respond request */
+ return updatedConversation
}
/**
* Given an itemId, obscures aspects of contents of the data record. Obscure is a vanilla function for MyLife, so does not require intervening intelligence and relies on the factory's modular LLM.
@@ -666,30 +591,42 @@ class Avatar extends EventEmitter {
* @returns {object} - The response object { instruction, responses, success, }
*/
async retireChat(botId){
- const retiredConversation = this.getConversation(null, botId)
- console.log('retireChat::conversations', this.conversations.map(c=>(
- { botId, _botId: c.botId, bot_id: c.bot_id, thread_id: c.thread_id, }
- )))
- if(!retiredConversation)
+ /* validate request */
+ const conversation = this.getConversation(null, botId)
+ if(!conversation){
throw new Error(`Conversation not found with bot id: ${ botId }`)
- const { thread_id: cid, } = retiredConversation
+ }
+ const { thread_id: cid, } = conversation
const bot = this.getBot(botId)
const { id: _botId, thread_id: tid, } = bot
if(botId!=_botId)
throw new Error(`Bot id mismatch: ${ botId }!=${ bot_id }`)
if(tid!=cid)
throw new Error(`Conversation mismatch: ${ tid }!=${ cid }`)
- const conversation = await this.migrateChat(tid)
- console.log('retireChat::conversation', conversation)
- const response = {
- responses: [{
- agent: 'server',
- message: `I have successfully retired this conversation thread and started a new one.`,
- purpose: 'system',
- type: 'chat',
- }],
- success: true,
- }
+ /* execute request */
+ const updatedConversation = await mMigrateChat(this, this.#factory, this.#llmServices, conversation)
+ /* respond request */
+ const response = !!updatedConversation
+ ? { /* @todo - add frontend instructions to remove migrateChat button */
+ instruction: null,
+ responses: [{
+ agent: 'server',
+ message: `I have successfully retired this conversation thread and started a new one.`,
+ purpose: 'system',
+ type: 'chat',
+ }],
+ success: true,
+ }
+ : {
+ instruction: null,
+ responses: [{
+ agent: 'server',
+ message: `I'm sorry - I encountered an error while trying to retire this conversation; please try again.`,
+ purpose: 'system',
+ type: 'chat',
+ }],
+ success: false,
+ }
return response
}
/**
@@ -1613,10 +1550,12 @@ async function mBot(factory, avatar, bot){
* @returns {Promise} - Array of Message instances in descending chronological order
*/
async function mCallLLM(llmServices, conversation, prompt, factory, avatar){
- const { bot_id, thread_id } = conversation
- if(!thread_id || !bot_id)
+ const { bot_id, llm_id, thread_id } = conversation
+ const botId = llm_id
+ ?? bot_id
+ if(!thread_id || !botId)
throw new Error('Both `thread_id` and `bot_id` required for LLM call.')
- const messages = await llmServices.getLLMResponse(thread_id, bot_id, prompt, factory, avatar)
+ const messages = await llmServices.getLLMResponse(thread_id, botId, prompt, factory, avatar)
messages.sort((mA, mB)=>{
return mB.created_at - mA.created_at
})
@@ -2342,6 +2281,118 @@ async function mInit(factory, llmServices, avatar, bots, assetAgent){
/* lived-experiences */
avatar.experiencesLived = await factory.experiencesLived(false)
}
+/**
+ * Migrates specified conversation (by thread_id) and returns conversation with new thread processed and saved to bot, both as a document and in avatar memory.
+ * @param {Avatar} avatar - Avatar object
+ * @param {AgentFactory} factory - AgentFactory object
+ * @param {LLMServices} llm - OpenAI object
+ * @param {string} thread_id - The thread_id of the conversation
+ * @returns
+ */
+async function mMigrateChat(avatar, factory, llm, conversation){
+ /* constants and variables */
+ const { thread_id, } = conversation
+ const chatLimit=25
+ let messages = await llm.messages(thread_id) // @todo - limit to 25 messages or modify request
+ if(!messages?.length)
+ return conversation
+ const { botId, } = conversation
+ const bot = avatar.getBot(botId)
+ const botType = bot.type
+ let disclaimer=`INFORMATIONAL ONLY **DO NOT PROCESS**\n`,
+ itemCollectionTypes='item',
+ itemLimit=1000,
+ type='item'
+ switch(botType){
+ case 'biographer':
+ case 'personal-biographer':
+ type = 'memory'
+ itemCollectionTypes = `memory,story,narrative`
+ break
+ case 'diary':
+ case 'journal':
+ case 'journaler':
+ type = 'entry'
+ const itemType = botType==='journaler'
+ ? 'journal'
+ : botType
+ itemCollectionTypes = `${ itemType },entry,`
+ break
+ default:
+ break
+ }
+ const chatSummary=`## ${ type.toUpperCase() } CHAT SUMMARY\n`,
+ chatSummaryRegex = /^## [^\n]* CHAT SUMMARY\n/,
+ itemSummary=`## ${ type.toUpperCase() } LIST\n`,
+ itemSummaryRegex = /^## [^\n]* LIST\n/
+ const items = ( await avatar.collections(type) )
+ .sort((a, b)=>a._ts-b._ts)
+ .slice(0, itemLimit)
+ const itemList = items
+ .map(item=>`- itemId: ${ item.id } :: ${ item.title }`)
+ .join('\n')
+ const itemCollectionList = items
+ .map(item=>item.id)
+ .join(',')
+ .slice(0, 512) // limit for metadata string field
+ const metadata = {
+ bot_id: botId,
+ conversation_id: conversation.id,
+ }
+ /* prune messages source material */
+ messages = messages
+ .slice(0, chatLimit)
+ .map(message=>{
+ const { content: contentArray, id, metadata, role, } = message
+ const content = contentArray
+ .filter(_content=>_content.type==='text')
+ .map(_content=>_content.text?.value)
+ ?.[0]
+ return { content, id, metadata, role, }
+ })
+ .filter(message=>!itemSummaryRegex.test(message.content))
+ const summaryMessage = messages
+ .filter(message=>!chatSummaryRegex.test(message.content))
+ .map(message=>message.content)
+ .join('\n')
+ /* contextualize previous content */
+ const summaryMessages = []
+ /* summary of items */
+ if(items.length)
+ summaryMessages.push({
+ content: itemSummary + disclaimer + itemList,
+ metadata: {
+ collectionList: itemCollectionList,
+ collectiontypes: itemCollectionTypes,
+ },
+ role: 'assistant',
+ })
+ /* summary of messages */
+ if(summaryMessage.length)
+ summaryMessages.push({
+ content: chatSummary + disclaimer + summaryMessage,
+ metadata: {
+ collectiontypes: itemCollectionTypes,
+ },
+ role: 'assistant',
+ })
+ if(!summaryMessages.length)
+ return conversation
+ /* add messages to new thread */
+ const newThread = await llm.thread(null, summaryMessages.reverse(), metadata)
+ conversation.setThread(newThread)
+ bot.thread_id = conversation.thread_id
+ const _bot = {
+ id: bot.id,
+ thread_id: conversation.thread_id,
+ }
+ factory.updateBot(_bot) // removed await
+ if(mAllowSave)
+ conversation.save()
+ else
+ console.log('migrateChat::BYPASS-SAVE', conversation.thread_id)
+ return conversation
+}
/**
* Get experience scene navigation array.
* @getter
@@ -2519,7 +2570,7 @@ async function mReliveMemoryNarration(avatar, factory, llm, bot, item, memberInp
let relivingMemory = relivingMemories.find(reliving=>reliving.item.id===id)
if(!relivingMemory){ /* create new activated reliving memory */
const conversation = await avatar.createConversation('memory', undefined, botId, false)
- conversation.bot_id = bot_id
+ conversation.llm_id = bot_id
const { thread_id, } = conversation
relivingMemory = {
bot,
diff --git a/inc/js/mylife-data-service.js b/inc/js/mylife-data-service.js
index 45d45dd9..dad8d86a 100644
--- a/inc/js/mylife-data-service.js
+++ b/inc/js/mylife-data-service.js
@@ -249,12 +249,15 @@ class Dataservices {
* @returns {array} - The collection items with no wrapper.
*/
async collections(type){
- if(type==='experience') // corrections
+ /* validate request */
+ if(type==='experience')
type = 'lived-experience'
- if(type?.length && this.#collectionTypes.includes(type))
- return await this.getItems(type)
- else
- return Promise.all([
+ if(type==='memory')
+ type = 'story'
+ /* execute request */
+ const response = type?.length && this.#collectionTypes.includes(type)
+ ? await this.getItems(type)
+ : await Promise.all([
this.collectionConversations(),
this.collectionEntries(),
this.collectionLivedExperiences(),
@@ -272,6 +275,8 @@ class Dataservices {
console.log('mylife-data-service::collections() error', err)
return []
})
+ /* respond request */
+ return response
}
/**
* Creates a new bot in the database.
From 5bf472db8a3d0186bb6b93655c6bb20d6f986869 Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Mon, 14 Oct 2024 00:31:31 -0400
Subject: [PATCH 14/56] 20241013 @Mookse - migrateChat Functionality #405 -
bot_id in conversation should be guid only - bot_name for dataset
---
inc/js/functions.mjs | 4 +---
inc/js/mylife-avatar.mjs | 10 ++++++++++
views/assets/js/bots.mjs | 10 +++++-----
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/inc/js/functions.mjs b/inc/js/functions.mjs
index 16352657..a9d21c2f 100644
--- a/inc/js/functions.mjs
+++ b/inc/js/functions.mjs
@@ -54,14 +54,12 @@ async function bots(ctx){
} else {
const {
activeBotId,
- bots: awaitBots, // **note**: bots needs await
+ prunedBots: bots,
mbr_id,
} = avatar
- const bots = await awaitBots
ctx.body = { // wrap bots
activeBotId,
bots,
- mbr_id,
}
}
break
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index 38ebcf96..8a3cdaae 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -1258,6 +1258,16 @@ class Avatar extends EventEmitter {
get personalAssistant(){
return this.avatar
}
+ /**
+ * Get a list of available bots (pruned) for the member.
+ * @getter
+ * @returns {Object[]} - Array of pruned bot objects
+ */
+ get prunedBots(){
+ const bots = this.#bots
+ .map(bot=>mPruneBot(bot))
+ return bots
+ }
/**
* Get the `active` reliving memories.
* @getter
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index b4237d16..126c5ab8 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -1388,7 +1388,6 @@ function mSetAttributes(bot=mActiveBot, botContainer){
flags,
id: bot_id,
interests,
- mbr_id,
name,
narrative,
privacy,
@@ -1405,7 +1404,6 @@ function mSetAttributes(bot=mActiveBot, botContainer){
{ name: 'bot_name', value: name ?? bot_name },
{ name: 'id', value: bot_id },
{ name: 'initialized', value: Date.now() },
- { name: 'mbr_id', value: mbr_id },
{ name: 'type', value: type },
{ name: 'version', value: version },
]
@@ -1442,12 +1440,14 @@ function mSetAttributes(bot=mActiveBot, botContainer){
function mSetStatusBar(bot, botContainer){
const { dataset, } = botContainer
const { id, type, version, } = dataset
- const { bot_id, bot_name, type: botType, version: botVersion, } = bot
+ const { bot_name, name, type: botType, version: botVersion, } = bot
const botStatusBar = document.getElementById(`${ type }-status`)
if(!type || !botType==type || !botStatusBar)
return
+ const botName = name
+ ?? bot_name
const response = {
- name: bot_name,
+ name: botName,
status: 'unknown',
type: type.split('-').pop(),
}
@@ -1459,7 +1459,7 @@ function mSetStatusBar(bot, botContainer){
botIcon.classList.add('active')
response.status = 'active'
break
- case ( bot_id?.length>0 ): // online
+ case ( botName?.length>0 ): // online
botIcon.classList.remove('active', 'offline', 'error')
botIcon.classList.add('online')
response.status = 'online'
From 55b1388363a4b0bd50937cfbd2ab169fc621e14e Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Mon, 14 Oct 2024 00:32:30 -0400
Subject: [PATCH 15/56] 20241013 @Mookse - migrateChat Functionality #405 -
bot_name fix
---
views/assets/js/bots.mjs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index 126c5ab8..f857c565 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -1396,12 +1396,14 @@ function mSetAttributes(bot=mActiveBot, botContainer){
version
} = bot
/* attributes */
+ const botName = name
+ ?? bot_name
const attributes = [
{ name: 'activated', value: activated },
{ name: 'active', value: mBotActive(bot_id) },
{ name: 'activeFirst', value: activeFirst },
{ name: 'bot_id', value: bot_id },
- { name: 'bot_name', value: name ?? bot_name },
+ { name: 'bot_name', value: botName },
{ name: 'id', value: bot_id },
{ name: 'initialized', value: Date.now() },
{ name: 'type', value: type },
From e1c779bfbb9de336eeb9cdb0fa2e01fe7aaba900 Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Mon, 14 Oct 2024 12:54:57 -0400
Subject: [PATCH 16/56] 20241014 @Mookse - chat input placeholder `undefined`
---
views/assets/js/bots.mjs | 13 ++++++-------
views/assets/js/members.mjs | 10 +++++-----
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index f857c565..6e70e72e 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -528,12 +528,12 @@ function mCloseTeamPopup(event){
* @returns {HTMLDivElement} - The bot thumb container.
*/
function mCreateBotThumb(bot=getBot()){
- const { bot_name, id, type, } = bot
+ const { id, name, type, } = bot
/* bot-thumb container */
const botThumbContainer = document.createElement('div')
botThumbContainer.id = `bot-bar-container_${ id }`
botThumbContainer.name = `bot-bar-container-${ type }`
- botThumbContainer.title = bot_name
+ botThumbContainer.title = name
botThumbContainer.addEventListener('click', setActiveBot)
botThumbContainer.classList.add('bot-thumb-container')
/* bot-thumb */
@@ -1442,14 +1442,12 @@ function mSetAttributes(bot=mActiveBot, botContainer){
function mSetStatusBar(bot, botContainer){
const { dataset, } = botContainer
const { id, type, version, } = dataset
- const { bot_name, name, type: botType, version: botVersion, } = bot
+ const { id: botId, name, type: botType, version: botVersion, } = bot
const botStatusBar = document.getElementById(`${ type }-status`)
if(!type || !botType==type || !botStatusBar)
return
- const botName = name
- ?? bot_name
const response = {
- name: botName,
+ name,
status: 'unknown',
type: type.split('-').pop(),
}
@@ -1461,7 +1459,7 @@ function mSetStatusBar(bot, botContainer){
botIcon.classList.add('active')
response.status = 'active'
break
- case ( botName?.length>0 ): // online
+ case ( name?.length>0 ): // online
botIcon.classList.remove('active', 'offline', 'error')
botIcon.classList.add('online')
response.status = 'online'
@@ -2047,6 +2045,7 @@ function mUpdateBotContainerAddenda(botContainer){
/* update mBot */
const bot = mBot(id)
bot.bot_name = bot_name
+ bot.name = bot_name
} else {
dataset.bot_name = localVars.bot_name
}
diff --git a/views/assets/js/members.mjs b/views/assets/js/members.mjs
index 0dc6fda3..7c94a259 100644
--- a/views/assets/js/members.mjs
+++ b/views/assets/js/members.mjs
@@ -123,8 +123,8 @@ function clearSystemChat(){
* @returns {void}
*/
function decorateActiveBot(activeBot=activeBot()){
- const { bot_name, id, purpose, type, } = activeBot
- chatInputField.placeholder = `Type your message to ${ bot_name }...`
+ const { id, name, } = activeBot
+ chatInputField.placeholder = `Type your message to ${ name }...`
// additional func? clear chat?
}
function escapeHtml(text) {
@@ -764,13 +764,13 @@ async function mSubmitChat(message) {
* @returns {void}
*/
function toggleMemberInput(display=true, hidden=false, connectingText='Connecting with '){
- const { bot_name, id, mbr_id, provider, purpose, type, } = activeBot()
+ const { id, name, } = activeBot
if(display){
hide(awaitButton)
awaitButton.classList.remove('slide-up')
chatInput.classList.add('slide-up')
chatInputField.style.height = 'auto'
- chatInputField.placeholder = `type your message to ${ bot_name }...`
+ chatInputField.placeholder = `type your message to ${ name }...`
chatInputField.value = null
show(chatInput)
} else {
@@ -778,7 +778,7 @@ function toggleMemberInput(display=true, hidden=false, connectingText='Connectin
chatInput.classList.remove('fade-in')
chatInput.classList.remove('slide-up')
awaitButton.classList.add('slide-up')
- awaitButton.innerHTML = connectingText + bot_name + '...'
+ awaitButton.innerHTML = connectingText + name + '...'
show(awaitButton)
}
if(hidden){
From edbb51428e1e5436a8d9b7fd0e65b420b8d61d8e Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Mon, 14 Oct 2024 16:50:49 -0400
Subject: [PATCH 17/56] 20241014 @Mookse - session start seems to fire
updateBot() with instructions - huge error with starting conversation with Q
and THEN logging in - solve required elimination of session property
`thread_id` which was being leveraged to store separate threads for different
browsers
---
inc/js/mylife-avatar.mjs | 9 +++++++--
inc/js/session.mjs | 1 +
views/assets/js/bots.mjs | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index 8a3cdaae..368f3a4a 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -228,9 +228,14 @@ class Avatar extends EventEmitter {
*/
async createConversation(type='chat', threadId, botId=this.activeBotId, saveToConversations=true){
const thread = await this.#llmServices.thread(threadId)
- const form = this.activeBot.type.split('-').pop()
+ const { mbr_id, type: botType, } = this.getBot(botId)
+ const form = botType.split('-').pop()
const conversation = new (this.#factory.conversation)(
- { form, mbr_id: this.mbr_id, type, },
+ {
+ form,
+ mbr_id,
+ type,
+ },
this.#factory,
thread,
botId
diff --git a/inc/js/session.mjs b/inc/js/session.mjs
index 68dbef05..fef9ee3e 100644
--- a/inc/js/session.mjs
+++ b/inc/js/session.mjs
@@ -29,6 +29,7 @@ class MylifeMemberSession extends EventEmitter {
await this.#factory.init(this.mbr_id) // needs only `init()` with different `mbr_id` to reset
this.#Member = await this.factory.getMyLifeMember()
this.#autoplayed = false // resets autoplayed flag, although should be impossible as only other "variant" requires guest status, as one-day experiences can be run for guests also [for pay]
+ this.thread_id = null // reset thread_id from Q-session
this.emit('onInit-member-initialize', this.#Member.memberName)
console.log(
chalk.bgBlue('created-member:'),
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index 6e70e72e..2021e7ae 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -356,6 +356,9 @@ function mBotIcon(type){
function mCreateCollectionItem(collectionItem){
/* collection item container */
const { assistantType, filename, form, id, keywords, name, summary, title, type, } = collectionItem
+ const iconType = assistantType
+ ?? form
+ ?? type
const item = document.createElement('div')
item.id = `collection-item_${ id }`
item.name = `collection-item-${ type }`
@@ -365,7 +368,7 @@ function mCreateCollectionItem(collectionItem){
itemIcon.id = `collection-item-icon_${ id }`
itemIcon.name = `collection-item-icon-${ type }`
itemIcon.classList.add('collection-item-icon', `${ type }-collection-item-icon`)
- itemIcon.src = mBotIcon(assistantType)
+ itemIcon.src = mBotIcon(iconType)
item.appendChild(itemIcon)
/* name */
const itemName = document.createElement('span')
From 005b3d5b94b80dc813a575ef8d168c05dc711a5f Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Tue, 15 Oct 2024 17:44:13 -0400
Subject: [PATCH 18/56] 20241015 @Mookse - correct thumbs - consistent name
display for bot
---
inc/js/globals.mjs | 9 ++++
inc/js/mylife-agent-factory.mjs | 46 +++++++++----------
.../openai/functions/entrySummary.json | 9 ++++
views/assets/js/bots.mjs | 3 +-
views/assets/js/members.mjs | 6 +--
5 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/inc/js/globals.mjs b/inc/js/globals.mjs
index b616cbb2..c3003faa 100644
--- a/inc/js/globals.mjs
+++ b/inc/js/globals.mjs
@@ -37,6 +37,14 @@ const mAiJsFunctions = {
description: 'complete concatenated raw text content of member input(s) for this `entry`',
type: 'string'
},
+ form: {
+ description: 'Form of `entry` content, determine context from internal instructions',
+ enum: [
+ 'diary',
+ 'journal',
+ ],
+ type: 'string'
+ },
keywords: {
description: 'Keywords most relevant to `entry`.',
items: {
@@ -69,6 +77,7 @@ const mAiJsFunctions = {
additionalProperties: false,
required: [
'content',
+ 'form',
'keywords',
'mood',
'relationships',
diff --git a/inc/js/mylife-agent-factory.mjs b/inc/js/mylife-agent-factory.mjs
index 46583fab..7b1f7031 100644
--- a/inc/js/mylife-agent-factory.mjs
+++ b/inc/js/mylife-agent-factory.mjs
@@ -333,12 +333,12 @@ class BotFactory extends EventEmitter{
}
/**
*
- * @param {object} assistantData - The assistant data.
+ * @param {object} botData - The assistant data.
* @param {string} vectorstoreId - The vectorstore id.
* @returns {object} - The created bot.
*/
- async createBot(assistantData={ type: mDefaultBotType }, vectorstoreId){
- const bot = await mCreateBot(this.#llmServices, this, assistantData, vectorstoreId)
+ async createBot(botData={ type: mDefaultBotType }, vectorstoreId){
+ const bot = await mCreateBot(this.#llmServices, this, botData, vectorstoreId)
if(!bot)
throw new Error('bot creation failed')
return bot
@@ -650,21 +650,22 @@ class AgentFactory extends BotFactory {
return await this.dataservices.deleteItem(id)
}
async entry(entry){
+ const defaultForm = 'journal'
const defaultType = 'entry'
- const {
- assistantType='journaler',
+ const {
being=defaultType,
- form='journal',
+ form=defaultForm,
id=this.newGuid,
keywords=[],
- mbr_id=(!this.isMyLife ? this.mbr_id : undefined),
+ mbr_id=this.mbr_id,
summary,
- title=`New ${ defaultType }`,
+ title=`Untitled ${ defaultForm } ${ defaultType }`,
} = entry
- if(!mbr_id) // only triggered if not MyLife server
- throw new Error('mbr_id required for entry summary')
+ if(this.isMyLife)
+ throw new Error('System cannot store entries of its own')
let { name, } = entry
- name = name ?? `${ defaultType }_${ form }_${ title.substring(0,64) }_${ mbr_id }`
+ name = name
+ ?? `${ defaultType }_${ form }_${ title.substring(0,64) }_${ mbr_id }`
if(!summary?.length)
throw new Error('entry summary required')
/* assign default keywords */
@@ -675,7 +676,6 @@ class AgentFactory extends BotFactory {
const _entry = {
...entry,
...{
- assistantType,
being,
form,
id,
@@ -801,7 +801,6 @@ class AgentFactory extends BotFactory {
const defaultForm = 'memory'
const defaultType = 'story'
const {
- assistantType='biographer',
being=defaultType,
form=defaultForm,
id=this.newGuid,
@@ -809,7 +808,7 @@ class AgentFactory extends BotFactory {
mbr_id=(!this.isMyLife ? this.mbr_id : undefined),
phaseOfLife='unknown',
summary,
- title=`New ${ defaultType }`,
+ title=`Untitled ${ defaultForm } ${ defaultType }`,
} = story
if(!mbr_id) // only triggered if not MyLife server
throw new Error('mbr_id required for story summary')
@@ -824,7 +823,6 @@ class AgentFactory extends BotFactory {
const _story = { // add validated fields back into `story` object
...story,
...{
- assistantType,
being,
form,
id,
@@ -1187,17 +1185,17 @@ async function mConfigureSchemaPrototypes(){ // add required functionality as de
* @private
* @param {LLMServices} llm - OpenAI object
* @param {AgentFactory} factory - Agent Factory object
- * @param {object} assistantData - Bot object
+ * @param {object} botData - Bot object
* @param {string} avatarId - Avatar id
* @returns {string} - Bot assistant id in openAI
*/
-async function mCreateBotLLM(llm, assistantData){
- const llmResponse = await mAI_openai(llm, assistantData)
+async function mCreateBotLLM(llm, botData){
+ const llmResponse = await mAI_openai(llm, botData)
return llmResponse.id
}
/**
* Creates bot and returns associated `bot` object.
- * @todo - assistantData.name = botDbName should not be required, push logic to `llm-services`
+ * @todo - botData.name = botDbName should not be required, push logic to `llm-services`
* @module
* @async
* @private
@@ -1226,7 +1224,7 @@ async function mCreateBot(llm, factory, bot, vectorstoreId){
?? `bot_${ type }_${ avatarId }`
const { tools, tool_resources, } = mGetAIFunctions(type, factory.globals, vectorstoreId)
const id = factory.newGuid
- const assistantData = {
+ const botData = {
being: 'bot',
bot_name,
description,
@@ -1247,13 +1245,13 @@ async function mCreateBot(llm, factory, bot, vectorstoreId){
version,
}
/* create in LLM */
- const botId = await mCreateBotLLM(llm, assistantData) // create after as require model
+ const botId = await mCreateBotLLM(llm, botData) // create after as require model
if(!botId)
throw new Error('bot creation failed')
/* create in MyLife datastore */
- assistantData.bot_id = botId
- const assistant = await factory.dataservices.createBot(assistantData)
- console.log(chalk.green(`bot created::${ type }`), assistant.id, assistant.bot_id, assistant.bot_name, )
+ botData.bot_id = botId
+ const assistant = await factory.dataservices.createBot(botData)
+ console.log(chalk.green(`bot created::${ type }`), assistant.id, assistant.bot_id, assistant.bot_name, bot.thread_id )
return assistant
}
/**
diff --git a/inc/json-schemas/openai/functions/entrySummary.json b/inc/json-schemas/openai/functions/entrySummary.json
index 55c4c9e6..79648e9b 100644
--- a/inc/json-schemas/openai/functions/entrySummary.json
+++ b/inc/json-schemas/openai/functions/entrySummary.json
@@ -9,6 +9,14 @@
"description": "complete concatenated raw text content of member input(s) for this `entry`",
"type": "string"
},
+ "form": {
+ "description": "Form of `entry` content, determine context from internal instructions",
+ "enum": [
+ "diary",
+ "journal"
+ ],
+ "type": "string"
+ },
"keywords": {
"description": "Keywords most relevant to `entry`.",
"items": {
@@ -41,6 +49,7 @@
"additionalProperties": false,
"required": [
"content",
+ "form",
"keywords",
"mood",
"relationships",
diff --git a/views/assets/js/bots.mjs b/views/assets/js/bots.mjs
index 2021e7ae..df8065fa 100644
--- a/views/assets/js/bots.mjs
+++ b/views/assets/js/bots.mjs
@@ -350,12 +350,13 @@ function mBotIcon(type){
}
/**
* Create a functional collection item HTML div for the specified collection type.
+ * @example - collectionItem: { assistantType, filename, form, id, keywords, name, summary, title, type, }
* @param {object} collectionItem - The collection item object, requires type.
* @returns {HTMLDivElement} - The collection item.
*/
function mCreateCollectionItem(collectionItem){
/* collection item container */
- const { assistantType, filename, form, id, keywords, name, summary, title, type, } = collectionItem
+ const { assistantType, filename, form, id, name, title, type, } = collectionItem
const iconType = assistantType
?? form
?? type
diff --git a/views/assets/js/members.mjs b/views/assets/js/members.mjs
index 7c94a259..5f715e8e 100644
--- a/views/assets/js/members.mjs
+++ b/views/assets/js/members.mjs
@@ -122,8 +122,8 @@ function clearSystemChat(){
* @param {object} activeBot - The active bot.
* @returns {void}
*/
-function decorateActiveBot(activeBot=activeBot()){
- const { id, name, } = activeBot
+function decorateActiveBot(){
+ const { id, name, } = activeBot()
chatInputField.placeholder = `Type your message to ${ name }...`
// additional func? clear chat?
}
@@ -764,7 +764,7 @@ async function mSubmitChat(message) {
* @returns {void}
*/
function toggleMemberInput(display=true, hidden=false, connectingText='Connecting with '){
- const { id, name, } = activeBot
+ const { id, name, } = activeBot()
if(display){
hide(awaitButton)
awaitButton.classList.remove('slide-up')
From 5c8fa65fee95a7b488d6e140d2f2f088ce4801c0 Mon Sep 17 00:00:00 2001
From: Erik Jespersen
Date: Tue, 15 Oct 2024 23:08:59 -0400
Subject: [PATCH 19/56] 20241015 @Mookse - prune getBot() - create thread on
bot creation
---
inc/js/functions.mjs | 2 +-
inc/js/mylife-agent-factory.mjs | 37 +++++++-----
inc/js/mylife-avatar.mjs | 56 ++++++++++++-------
inc/js/mylife-llm-services.mjs | 29 +++++-----
.../journaler-intelligence-1.1.json | 6 ++
5 files changed, 80 insertions(+), 50 deletions(-)
diff --git a/inc/js/functions.mjs b/inc/js/functions.mjs
index a9d21c2f..1cc63f9e 100644
--- a/inc/js/functions.mjs
+++ b/inc/js/functions.mjs
@@ -50,7 +50,7 @@ async function bots(ctx){
case 'GET':
default:
if(bid?.length){ // specific bot
- ctx.body = await avatar.bot(ctx.params.bid)
+ ctx.body = await avatar.getBot(ctx.params.bid)
} else {
const {
activeBotId,
diff --git a/inc/js/mylife-agent-factory.mjs b/inc/js/mylife-agent-factory.mjs
index 7b1f7031..6f37e2bd 100644
--- a/inc/js/mylife-agent-factory.mjs
+++ b/inc/js/mylife-agent-factory.mjs
@@ -252,7 +252,7 @@ class BotFactory extends EventEmitter{
* @returns {object} - The bot.
*/
async bot(id, type=mDefaultBotType, mbr_id){
- if(this.isMyLife){ // MyLife server has no bots of its own, system agents perhaps (file, connector, etc) but no bots yet, so this is a micro-hydration
+ if(this.isMyLife){
if(!mbr_id)
throw new Error('mbr_id required for BotFactory hydration')
const botFactory = await new BotFactory(mbr_id)
@@ -1115,14 +1115,15 @@ class MyLifeFactory extends AgentFactory {
* Initializes openAI assistant and returns associated `assistant` object.
* @module
* @param {LLMServices} llmServices - OpenAI object
- * @param {object} bot - The assistand data object
+ * @param {object} botData - The bot data object
* @returns {object} - [OpenAI assistant object](https://platform.openai.com/docs/api-reference/assistants/object)
*/
-async function mAI_openai(llmServices, bot){
- const { bot_name, type, } = bot
- bot.name = bot_name
- ?? `My ${ type }`
- return await llmServices.createBot(bot)
+async function mAI_openai(llmServices, botData){
+ const { bot_name, type, } = botData
+ botData.name = bot_name
+ ?? `_member_${ type }`
+ const bot = await llmServices.createBot(botData)
+ return bot
}
function assignClassPropertyValues(propertyDefinition){
switch (true) {
@@ -1190,8 +1191,11 @@ async function mConfigureSchemaPrototypes(){ // add required functionality as de
* @returns {string} - Bot assistant id in openAI
*/
async function mCreateBotLLM(llm, botData){
- const llmResponse = await mAI_openai(llm, botData)
- return llmResponse.id
+ const { id, thread_id, } = await mAI_openai(llm, botData)
+ return {
+ id,
+ thread_id,
+ }
}
/**
* Creates bot and returns associated `bot` object.
@@ -1206,7 +1210,12 @@ async function mCreateBotLLM(llm, botData){
*/
async function mCreateBot(llm, factory, bot, vectorstoreId){
/* initial deconstructions */
- const { bot_name: botName, description: botDescription, name: botDbName, type, } = bot
+ const {
+ bot_name: botName,
+ description: botDescription,
+ name: botDbName,
+ type,
+ } = bot
const { avatarId, } = factory
/* validation */
if(!avatarId)
@@ -1245,13 +1254,14 @@ async function mCreateBot(llm, factory, bot, vectorstoreId){
version,
}
/* create in LLM */
- const botId = await mCreateBotLLM(llm, botData) // create after as require model
+ const { id: botId, thread_id, } = await mCreateBotLLM(llm, botData) // create after as require model
if(!botId)
throw new Error('bot creation failed')
/* create in MyLife datastore */
botData.bot_id = botId
+ botData.thread_id = thread_id
const assistant = await factory.dataservices.createBot(botData)
- console.log(chalk.green(`bot created::${ type }`), assistant.id, assistant.bot_id, assistant.bot_name, bot.thread_id )
+ console.log(chalk.green(`bot created::${ type }`), assistant.thread_id, assistant.id, assistant.bot_id, assistant.bot_name )
return assistant
}
/**
@@ -1353,7 +1363,6 @@ function mCreateBotInstructions(factory, bot){
}
})
/* assess and validate limit */
- console.log(chalk.blueBright('instructions length'), instructions.length, instructions)
return { instructions, version, }
}
function mExposedSchemas(factoryBlockedSchemas){
@@ -1431,7 +1440,6 @@ constructor(obj){
eval(\`this.\#\${_key}=obj[_key]\`)
} catch(err){
eval(\`this.\${_key}=obj[_key]\`)
- console.log(\`could not privatize \${_key}, public node created\`)
}
}
console.log('vm ${ _className } class constructed')
@@ -1803,7 +1811,6 @@ async function mUpdateBot(factory, llm, bot, options={}){
const { tools, tool_resources, } = mGetAIFunctions(type, factory.globals, vectorstoreId)
botData.tools = tools
botData.tool_resources = tool_resources
- console.log('mUpdateBot', botData.tools, botData.tool_resources, vectorstoreId)
}
if(updateModel)
botData.model = factory.globals.currentOpenAIBotModel
diff --git a/inc/js/mylife-avatar.mjs b/inc/js/mylife-avatar.mjs
index 368f3a4a..178c3162 100644
--- a/inc/js/mylife-avatar.mjs
+++ b/inc/js/mylife-avatar.mjs
@@ -75,11 +75,13 @@ class Avatar extends EventEmitter {
* Get a bot's properties from Cosmos (or type in .bots).
* @public
* @async
- * @param {Guid} id - The bot id.
- * @returns {object} - The bot.
+ * @param {Guid} id - The bot id
+ * @returns {Promise