@yrpri/api 9.0.88 → 9.0.90

package/active-citizen/engine/notifications/emails_utils.cjs

@@ -419,6 +419,9 @@ var sendOneEmail = function (emailLocals, callback) {
                     else {
                         locale = "en";
                     }
+                    if (locale && typeof locale === 'string') {
+                        locale = locale.toLowerCase();
+                    }
                     i18n.changeLanguage(locale, function (err, t) {
                         seriesCallback(err);
                     });

package/active-citizen/llms/baseChatBot.js

@@ -1,19 +1,13 @@
 import { OpenAI } from "openai";
 import { v4 as uuidv4 } from "uuid";
 import ioredis from "ioredis";
-let tlsConfig = {
-    rejectUnauthorized: false,
-};
-if (!process.env.REDIS_URL || process.env.REDIS_URL.indexOf("localhost") > -1) {
-    tlsConfig = undefined;
-}
 const DEBUG = false;
-//@ts-ignore
-const redis = new ioredis.default(process.env.REDIS_MEMORY_URL ||
+const url = process.env.REDIS_MEMORY_URL ||
     process.env.REDIS_URL ||
-    "redis://localhost:6379", {
-    tls: tlsConfig,
-});
+    "redis://localhost:6379";
+const tlsOptions = url.startsWith("rediss://")
+    ? { rejectUnauthorized: false }
+    : undefined;
 export class YpBaseChatBot {
     get redisKey() {
         return `${YpBaseChatBot.redisMemoryKeyPrefix}-${this.memoryId}`;
@@ -21,6 +15,12 @@ export class YpBaseChatBot {
     static loadMemoryFromRedis(memoryId) {
         return new Promise(async (resolve, reject) => {
             try {
+                //@ts-ignore
+                const redis = new ioredis.default(process.env.REDIS_MEMORY_URL ||
+                    process.env.REDIS_URL ||
+                    "redis://localhost:6379", {
+                    tls: tlsOptions,
+                });
                 const memoryString = await redis.get(`${YpBaseChatBot.redisMemoryKeyPrefix}-${memoryId}`);
                 if (memoryString) {
                     const memory = JSON.parse(memoryString);
@@ -42,7 +42,7 @@ export class YpBaseChatBot {
     loadMemory() {
         return new Promise(async (resolve, reject) => {
             try {
-                const memoryString = await redis.get(this.redisKey);
+                const memoryString = await this.redis.get(this.redisKey);
                 if (memoryString) {
                     const memory = JSON.parse(memoryString);
                     resolve(memory);
@@ -62,6 +62,12 @@ export class YpBaseChatBot {
         this.maxTokens = 16000;
         this.llmModel = "gpt-4o";
         this.persistMemory = false;
+        //@ts-ignore
+        this.redis = new ioredis.default(process.env.REDIS_MEMORY_URL ||
+            process.env.REDIS_URL ||
+            "redis://localhost:6379", {
+            tls: tlsOptions,
+        });
         this.wsClientId = wsClientId;
         this.wsClientSocket = wsClients.get(this.wsClientId);
         this.openaiClient = new OpenAI({
@@ -102,7 +108,7 @@ export class YpBaseChatBot {
     async saveMemory() {
         if (this.memory) {
             try {
-                await redis.set(this.redisKey, JSON.stringify(this.memory));
+                await this.redis.set(this.redisKey, JSON.stringify(this.memory));
                 console.log(`Saved memory to redis: ${this.redisKey}`);
             }
             catch (error) {

package/active-citizen/workers/queue.cjs

@@ -66,7 +66,7 @@ class YpQueue {
         }).on('completed', function (job, result) {
             log.info('JC', { id: job.id, name: job.name });
         }).on('failed', function (job, error) {
-            log.error('Job Failed', { id: job.id, name: job.name, data: job.data, error });
+            log.error('Job Failed', { id: job ? job.id : null, name: job ? job.name : null, data: job ? job.data : null, error });
         }).on('resumed', function (job) {
             log.info('Job Removed', { id: job.id });
         }).on('waiting', function (jobId) {

package/agents/assistants/baseAssistant.js

@@ -21,26 +21,31 @@ export class YpBaseAssistant extends YpBaseChatBot {
         this.availableTools = new Map();
         this.toolCallTimeout = 30000; // 30 seconds
         this.maxModeTransitions = 10;
-        this.modelName = "gpt-4o";
-        this.defaultSystemPrompt = `# Basic instructions
+        this.modelName = process.env.OPENAI_STREAMING_MODEL_NAME || "gpt-4o-2024-11-20";
+        this.defaultSystemPrompt = `<coreImportantSystemInstructions>
 You are a helpful, witty, and friendly AI. Act like a human, but remember that you aren't a human and that you can't do human things in the real world.
 Your voice and personality should be warm and engaging, with a lively and playful tone. Talk quickly.
 If interacting in a non-English language, start by using the standard accent or dialect familiar to the user.
 You should always call a function/tool if you can to help the user with their request.
 Never try to start workflows without using functions/tools, using some tools will unlock other function/tools that might help the user with their request.
 Functions/tools will become available to you as the user progresses through the workflow.
-Make sure that the user is subscribed to the agent before you start a workflow.
+Make sure that the user logged in and is subscribed to the agent before you start a workflow.
 Never list out the available agents using text or markdown, the user already sees the list of agents available for subscription in the UI.
-You will not be able to complete the request for the user except using tools/functions at each step.
+You will not be able to start the workflow for the user except using tools/functions at each step.
+Never engage in longish back and fourth conversations with the user if a workflow has not started, lead the user towards using the tools available as much as possible, politely.
+Never engage in off topic conversations, always politely steer the conversation back to the workflow.
+</coreImportantSystemInstructions>
 
-# Typical start of a user workflow is:
+<typicalWorkflowStepsForStartingAnAgentWorkflow>
 1) The user chooses an agent to subscribe to using the direct connect to the agent the user chooses. It's only possible to subscribe to the agent after the user has connected directly to the agent.
 2) The agent offers to show the user a workflow overview, with a tool and then informs the user about the subscription process.
 3) The user logs in or creates an account, if not logged in.
 4) The user verbally confirms a subscription to the agent using a function/tool.
 5) The user fills out the configuration UI widget.
 6) The user submits from the configuration UI widget.
-7) The user starts the workflow.`;
+7) The user starts the workflow run.
+</typicalWorkflowStepsForStartingAnAgentWorkflow>
+`;
         this.voiceEnabled = false;
         this.domainId = domainId;
         if (!domainId) {
@@ -479,7 +484,7 @@ You will not be able to complete the request for the user except using tools/fun
             console.error(`No current mode found: ${this.memory.currentMode}`);
             return this.defaultSystemPrompt;
         }
-        return `${this.defaultSystemPrompt}\n\n# Current agent instructions:\n${currentMode.systemPrompt}`;
+        return `${this.defaultSystemPrompt}\n\n<furtherAgentInstructions>\n${currentMode.systemPrompt}\n</furtherAgentInstructions>`;
     }
     sendAvatarUrlChange(url, avatarName) {
         this.wsClientSocket.send(JSON.stringify({

package/agents/assistants/modes/tools/models/subscriptions.js

@@ -3,6 +3,7 @@ import { YpSubscriptionPlan } from "../../../../models/subscriptionPlan.js";
 import { YpAgentProduct } from "../../../../models/agentProduct.js";
 import { YpAgentProductBundle } from "../../../../models/agentProductBundle.js";
 import { YpAgentProductRun } from "../../../../models/agentProductRun.js";
+import { Op } from "sequelize";
 export class SubscriptionModels {
     constructor(assistant) {
         this.assistant = assistant;
@@ -18,7 +19,10 @@ export class SubscriptionModels {
             // Get all available subscription plans with their associated agent products
             const availablePlans = await YpSubscriptionPlan.findAll({
                 where: {
-                //  status: 'active', // Only get active plans
+                    id: {
+                        [Op.in]: [1, 6],
+                    },
+                    //  status: 'active', // Only get active plans
                 },
                 attributes: ['id', 'configuration', 'name', 'description'],
                 include: [

package/agents/assistants/modes/tools/navigationTools.js

@@ -1,7 +1,7 @@
 // commonTools.ts
-import { AgentModels } from './models/agents.js';
-import { SubscriptionModels } from './models/subscriptions.js';
-import { BaseAssistantTools } from './baseTools.js';
+import { AgentModels } from "./models/agents.js";
+import { SubscriptionModels } from "./models/subscriptions.js";
+import { BaseAssistantTools } from "./baseTools.js";
 export class NavigationTools extends BaseAssistantTools {
     constructor(assistant) {
         super(assistant);
@@ -9,10 +9,10 @@ export class NavigationTools extends BaseAssistantTools {
         this.subscriptionModels = new SubscriptionModels(assistant);
     }
     async goBackToMainAssistant() {
-        await this.assistant.handleModeSwitch('agent_selection_mode', 'User requested to return to the main assistant', {});
+        await this.assistant.handleModeSwitch("agent_selection_mode", "User requested to return to the main assistant", {});
         return {
             success: true,
-            data: { message: 'Returned to main assistant' },
+            data: { message: "Returned to main assistant" },
         };
     }
     get connectDirectlyToAgent() {
@@ -36,12 +36,31 @@ export class NavigationTools extends BaseAssistantTools {
         params = this.assistant.getCleanedParams(params);
         console.log(`handler: connect_to_one_of_the_agents: ${JSON.stringify(params, null, 2)}`);
         try {
-            const { plan, subscription } = await this.subscriptionModels.loadAgentProductPlanAndSubscription(params.subscriptionPlanId);
+            let { plan, subscription } = await this.subscriptionModels.loadAgentProductPlanAndSubscription(params.subscriptionPlanId);
             if (!plan?.AgentProduct) {
                 throw new Error(`Agent product with id ${params.subscriptionPlanId} not found`);
             }
+            //TODO: Does not work as the user is not logged in. Lets figure it out.
+            /*if (plan.configuration.amount == 0) {
+              const result = await this.subscriptionModels.subscribeToAgentPlan(
+                plan.AgentProduct!.id,
+                plan.id
+              );
+      
+              if (!result.success || !result.subscription || !result.plan) {
+                return {
+                  success: false,
+                  error: result.error || "Failed to subscribe to agent plan",
+                };
+              } else {
+                plan = result.plan;
+                subscription = result.subscription;
+              }
+            }*/
             console.log(`Loading: ${plan?.AgentProduct?.name} ${subscription?.id}`);
-            await this.updateCurrentAgentProductPlan(plan, subscription, { sendEvent: false });
+            await this.updateCurrentAgentProductPlan(plan, subscription, {
+                sendEvent: false,
+            });
             await this.assistant.handleModeSwitch("agent_direct_connection_mode", `Directly connected to agent: ${plan?.AgentProduct?.name}`, params);
             const html = `<div class="agent-chips"><yp-agent-chip
           isSelected
@@ -61,9 +80,7 @@ export class NavigationTools extends BaseAssistantTools {
             };
         }
         catch (error) {
-            const errorMessage = error instanceof Error
-                ? error.message
-                : "Failed to select agent";
+            const errorMessage = error instanceof Error ? error.message : "Failed to select agent";
             console.error(`Failed to select agent: ${errorMessage}`);
             return {
                 success: false,

package/agents/assistants/voiceAssistant.js

@@ -19,7 +19,7 @@ export class YpBaseChatBotWithVoice extends YpBaseChatBot {
         };
         // Default voice configuration
         this.voiceConfig = {
-            model: "gpt-4o-realtime-preview-2024-12-17",
+            model: process.env.OPENAI_VOICE_MODEL_NAME || "gpt-4o-realtime-preview-2024-12-17",
             voice: "echo",
             modalities: ["text", "audio"],
         };