Merge pull request #468 from MyLife-Services/version-0031-updates

Version 0031 updates

Author: Mookse

inc/js/agents/system/bot-agent.mjs

@@ -394,9 +394,11 @@ class BotAgent {
 	 * @param {String} type - The type of conversation, defaults to `chat`
 	 * @param {String} form - The form of conversation, defaults to `system-avatar`
 	 * @param {String} prompt - The prompt for the conversation (optional)
+	 * @param {Guid} scriptAdvisorLlmId - The script advisor llm id (optional)
+	 * @param {String} mbr_id - The member id to use for conversation (optional)
 	 * @returns {Promise<Conversation>} - The Conversation instance
 	 */
-	async conversationStart(type='chat', form='system-avatar', prompt, scriptAdvisorLlmId){
+async conversationStart(type='chat', form='system-avatar', prompt, scriptAdvisorLlmId, mbr_id){
 		let { id, llm_id, } = this.avatar
 		if(type==='experience'){
 			id = this.#factory.actor.id
@@ -405,7 +407,7 @@ class BotAgent {
 			// use  member avatar?
 			llm_id = scriptAdvisorLlmId
 		}
-		const Conversation = await mConversationStart(type, form, id, null, llm_id, this.#llm, this.#factory, prompt)
+    const Conversation = await mConversationStart(type, form, id, undefined, llm_id, this.#llm, this.#factory, prompt, undefined, mbr_id)
 		return Conversation
 	}
     /**
@@ -462,7 +464,7 @@ class BotAgent {
 				role: 'user',
 			})
 			memberInput = `${ message }Let's begin to LIVE MEMORY, id: ${ item.id }, MEMORY SUMMARY starts this conversation`
-			const Conversation = await mConversationStart('memory', type, bot_id, null, llm_id, this.#llm, this.#factory, memberInput, messages)
+			const Conversation = await mConversationStart('memory', type, bot_id, undefined, llm_id, this.#llm, this.#factory, memberInput, messages)
 			Conversation.action = 'living'
 			livingMemory.Conversation = Conversation
 			livingMemory.id = this.#factory.newGuid
@@ -1084,11 +1086,17 @@ async function mConversationDelete(Conversation, factory, llm){
  * @param {AgentFactory} factory - Agent Factory object
  * @param {string} prompt - The prompt for the conversation (optional)
  * @param {Message[]} messages - The array of messages to seed the conversation
+ * @param {String} mbr_id_Override - The member id to use for conversation (optional)
  * @returns {Conversation} - The conversation object
  */
-async function mConversationStart(type='chat', form='system', bot_id, thread_id, llm_id, llm, factory, prompt, messages){
-	const { mbr_id, newGuid: id, } = factory
-	const metadata = { bot_id, conversation_id: id, mbr_id, },
+async function mConversationStart(type='chat', form='system', bot_id, thread_id, llm_id, llm, factory, prompt, messages, mbr_id_Override){
+	const { mbr_id: mbr_id_innate, newGuid: id, } = factory
+	const mbr_id = mbr_id_Override
+		?? mbr_id_innate
+	const metadata = {
+			bot_id,
+			conversation_id: id,
+		},
 		processStartTime = Date.now(),
 		thread = await mThread(llm, thread_id, messages, metadata)
 	const Conversation = new (factory.conversation)(
@@ -1212,7 +1220,7 @@ function mGetGPTResources(globals, toolName, vectorstoreId){
 async function mInit(BotAgent, bots, Avatar, factory, llm){
 	const { vectorstoreId, } = BotAgent
 	bots.push(...await mInitBots(vectorstoreId, Avatar, factory, llm))
-	BotAgent.setActiveBot(null, false)
+	BotAgent.setActiveBot(undefined, false)
 }
 /**
  * Initializes active bots based upon criteria.
@@ -1345,7 +1353,7 @@ async function mMigrateChat(Bot, llm, saveConversation=false){
     if(!summaryMessages.length)
         return
     /* add messages to new thread */
-	const newThread = await mThread(llm, null, summaryMessages.reverse(), metadata)
+	const newThread = await mThread(llm, undefined, summaryMessages.reverse(), metadata)
 	if(!!conversation){
 	    conversation.setThread(newThread)
 		if(saveConversation)

inc/js/agents/system/experience-agent.mjs

@@ -1,5 +1,5 @@
-import LLMServices from "../../mylife-llm-services.mjs"
 import BotAgent from "./bot-agent.mjs"
+import { Share, } from '../../mylife-models.mjs'
 import { Marked } from 'marked'
 /* module constants */
 const mAvailableEventActionMap = {
@@ -272,7 +272,6 @@ class ExperienceAgent {
             Experience = mExperience(experienceData, this.#botAgent, this.#llm, this.#factory, this.#variables)
             this.#experiences.push(Experience)
         }
-        console.log()
         await Experience.run(memberInput)
         return Experience
     }
@@ -376,6 +375,203 @@ class ExperienceEvent {
         this.#portrayed = !!portrayed
     }
 }
+/* ShareAgent class */
+/**
+ * @class ShareAgent
+ * Handles the `sharing` process for Mylife currently only via System Avatar.
+ */
+class ShareAgent {
+    /* private properties */
+    #avatar
+    #botAgent // @todo - unclear if necessary
+    #factory
+    #llm
+    #shares=[] // current-list of active shares
+    constructor(obj={}, avatar, factory, llm){
+        this.#avatar = avatar
+        this.#factory = factory
+        this.#llm = llm
+        obj = this.#factory.globals.sanitize(obj)
+        Object.assign(this, obj)
+    }
+    /* public functions */
+    /**
+     * Accepts the warnings for a share.
+     * @param {Guid} instanceId - The Share instance id
+     * @returns {Boolean} - The Share acceptance status
+     */
+    acceptWarnings(instanceId){
+        const Share = this.share(instanceId)
+        if(!!Share)
+            return Share.acceptWarnings()
+        else
+            throw new Error('Share not found')
+    }
+    /**
+     * Create share with new data.
+     * @param {object} shareData - The share data object
+     * @returns {Promise<object>} - The updated Share object
+     */
+    async create(shareData){
+        const share = await this.#factory.createShare(shareData)
+        this.#shares.push(share.id)
+        return share
+    }
+    /**
+     * Deletes a share from MyLife `shares` container and associated object (get itemId from `share` itself).
+     * @param {Guid} sid - The Share id
+     * @returns {Promise<Boolean>} - Success or failure of the operation
+     */
+    async delete(shareId){
+        const { itemId, } = await this.getShare(shareId)
+        this.#factory.deleteShare(shareId, itemId)
+        this.#shares = this.#shares.filter(share=>share!==shareId)
+        return true
+    }
+    /**
+     * Get a share data by id.
+     * @param {Guid} sid - The share id
+     * @returns {Promise<object>} - The MemberShare document
+     */
+    async getShare(shareId){
+        let response = await this.#factory.getShare(shareId, this.#factory.mbr_id)
+        response = this.#factory.globals.sanitize(response)
+        return response
+    }
+    /**
+     * Gets all owned relevant shares from MyLife `shares` container, either by item or member.
+     * @param {Guid} itemId - The item id (optional)
+     * @returns {Promise<object[]>} - The MemberShare array
+     */
+    async getShares(itemId){
+        let response = await this.#factory.getShares(itemId)
+        if(Array.isArray(response))
+            response = response.map(share=>this.#factory.globals.sanitize(share))
+        return response
+    }
+    /**
+     * Get a memory `Header`.
+	 * @param {guid} instanceId - Share instanceId
+     * @returns {Promise<object>} - shareHeader object
+     */
+    async header(instanceId){
+        const Share = this.share(instanceId)
+        if(Share && !Share.header){
+            let MemberAvatar = await this.#factory.avatarProxy(Share.mbr_id)
+            const shareData = await MemberAvatar.cleanShare(Share) // operates directly upon Shared Memory Share
+            Share.header = shareData
+        }
+        return Share?.header
+    }
+    /**
+     * Plays a public share.
+     * @param {Guid} instanceId - The instance id
+     * @param {object} input - The recipient input
+     * @returns {object} - The next message(s) in the share experience
+     */
+    async play(instanceId, input){
+        const Share = this.share(instanceId)
+        if(!Share)
+            throw new Error('Share not found')
+        else if(!Share.header || !Share.warningsAccepted)
+            return await this.shareHeader(instanceId)
+        else if(!Share.initialized)
+            await this.shareInit(Share)
+        const shareContent = await Share.play(input)
+        shareContent.scene = new Marked().parse(shareContent.scene)
+        return shareContent
+    }
+    share(instanceId, shareId){
+        let Share
+        if(this.#factory.globals.isValidGuid(instanceId))
+            Share = this.#shares.find(share=>share.instanceId===instanceId)
+        else if(this.#factory.globals.isValidGuid(shareId))
+            Share = this.#shares.find(share=>share.id===shareId)
+        return Share
+    }
+    /**
+     * Initializes a share experience.
+     * @param {Share} Share - The Share instance
+     * @returns {object} - The first message(s) in the share experience
+     */
+    async shareInit(Share){
+        if(!Share.header) // set header if not already set
+            await this.shareHeader(Share.instanceId)
+        /* scene creation */
+        let prompt = `# Scenes\n`
+        const shareData = {}
+        if(Share.conclusion?.length)
+            prompt += `- conclusion: ${ Share.conclusion }\n`
+        if(Share.voice?.length)
+            prompt += `- voice: ${ Share.voice }\n`
+        prompt += `- summary: ${ Share.summary }`
+        const messages = await this.#llm.getLLMResponse(undefined, mDefaultScriptAdvisorLLMId, prompt)
+        if(messages?.[0]){
+            const { content, thread_id, } = messages[0]
+            const message = content
+                .filter(_content=>_content.type==='text')
+                ?.[0]
+                ?.text
+                ?.value
+            if(message?.length){
+                const scenes = JSON.parse(message).scenes
+                if(scenes.length===1)
+                    scenes = scenes.first()
+                        .split(/(?=(scene\s*\d+:?\n?))/i)
+                        .filter(item =>item.trim()!=='')
+                const lastItem = scenes[scenes.length - 1].trim()
+                shareData.scenes = scenes
+            }
+            if(thread_id?.length)
+                this.#llm.deleteThread(thread_id) // no await
+        }
+        /* set Conversation */
+        shareData.Conversation = await this.#avatar.conversationStart('share', 'share-agent', Share.mbr_id)
+        Share.init(shareData)
+        setTimeout(_=>{ // @todo - incorporate lock
+            if(this.share(Share.instanceId))
+                this.#shares = this.#shares.filter(share=>share.instanceId!==Share.instanceId)
+                Share.stop()
+        }, 10 * 60 * 1000)
+    }
+    /**
+     * Stops a share experience.
+     * @param {Guid} instanceId - The Share instance id
+     * @returns {Promise<object>} - The share stop object
+     */
+    async stop(instanceId){
+        const Share = this.share(instanceId)
+        if(Share){
+            this.#shares = this.#shares.filter(share=>share.instanceId!==Share.instanceId)
+            return {
+                responses: Share.stop(),
+                success: true
+            }
+        }
+    }
+    /**
+     * Update a share with provided data.
+     * @param {object} shareData - The share data object
+     * @returns {Promise<object>} - The updated Share object
+     */
+    async update(shareData){
+        return await this.#factory.updateShare(shareData)
+    }
+    async validateShare(shareId){
+        if(!this.share(shareId)){ // protect in case instanceId sent
+            const share = await this.#factory.getShare(shareId)
+            if(!share)
+                throw new Error(`Share not found: ${ shareId }`)
+            share.instanceId = this.#factory.newGuid
+            const _Share = new Share(share)
+            if(!_Share.mbr_id)
+                throw new Error('Invalid Share, no Member associated with content')
+            shareId = _Share.instanceId
+            this.#shares.push(_Share)
+        }
+        return shareId
+    }
+}
 /* module functions */
 /**
  * Creates cast and returns associated `cast` object.
@@ -403,7 +599,7 @@ function mCast(cast, botAgent, Factory){
             case 'member':
             case 'member-bot':
             default:
-                Bot = botAgent.bot(null, form)
+                Bot = botAgent.bot(undefined, form)
                 break
             }
         const Actor = new CastMember(castMember, Bot, Factory)
@@ -922,7 +1118,7 @@ function mLocation(Experience, eid){
     eid = eid
         ?? scriptEvents[0].id
     const iteration = 0
-    const sid = Experience.scene(null, eid).id
+    const sid = Experience.scene(undefined, eid).id
     return { xid, eid, iteration, sid, }
 }
 /**
@@ -969,4 +1165,7 @@ function mReplaceVariables(prompt, variableList, variableValues){
     return prompt
 }
 /* exports */
-export default ExperienceAgent
+export {
+    ExperienceAgent,
+    ShareAgent,
+}

inc/js/api-functions.mjs

@@ -44,7 +44,7 @@ async function entry(ctx){
 async function experienceBuilder(ctx){
     await mAPIKeyValidation(ctx)
     const { assistantType, mbr_id } = ctx.state
-    const { eid, sid } = ctx.params
+    const { eid, } = ctx.params
     const { experience } = ctx.request.body?.experience
     if(!experience)
         ctx.throw(400, 'No experience provided for builder. Use `experience` field.')
@@ -314,9 +314,9 @@ async function upload(ctx){
  * @returns {Promise<void>}
  */
 async function mAPIKeyValidation(ctx){ // transforms ctx.state
-    if(ctx.params.mid === ':mid')
-        ctx.params.mid = undefined
-    const memberId = ctx.params?.mid
+    if(ctx.query.mid === ':mid')
+        ctx.query.mid = undefined
+    const memberId = ctx.query?.mid
         ??  ctx.request.body?.mbr_id
         ??  ctx.request.body?.memberKey
         ??  ctx.session?.APIMemberKey

inc/js/core.mjs

@@ -236,7 +236,9 @@ class Organization extends Member {	//	form=organization
 }
 class MyLife extends Organization {	// form=server
 	#avatar // MyLife's private class avatar, _same_ object reference as Member Class's `#avatar`
+	#currentShares = [] // array of current shares
 	#factory
+	#shareAgent
 	#version = '0.0.0' // indicates error
 	constructor(Factory){ // no session presumed to exist
 		super(Factory)

inc/js/factory-class-extenders/class-conversation-functions.mjs

@@ -12,6 +12,7 @@ async function mSaveConversation(Conversation, factory){
         form,
         id,
         isSaved=false,
+        mbr_id,
         name,
         thread,
         type,
@@ -26,6 +27,7 @@ async function mSaveConversation(Conversation, factory){
             form,
             id,
             messages,
+            mbr_id,
             name,
             thread,
             type,
@@ -35,7 +37,7 @@ async function mSaveConversation(Conversation, factory){
     }
     const updatedConversation = await factory.dataservices.patch(
         id,
-        { messages, }
+        { mbr_id, messages, }
     )
     return !!updatedConversation
 }