@yrpri/api 9.0.137 → 9.0.139

package/agents/controllers/policySynthAgents.d.ts

@@ -41,6 +41,8 @@ export declare class PolicySynthAgentsController {
     controlAgent: (req: express.Request, res: express.Response) => Promise<void>;
     getAgentStatus: (req: express.Request, res: express.Response) => Promise<void>;
     updateAgentStatus: (req: express.Request, res: express.Response) => Promise<void>;
+    private recursiveDeleteAgent;
+    deleteAgent: (req: YpRequest, res: express.Response) => Promise<void>;
     startAgentProcessing: (req: express.Request, res: express.Response) => Promise<void>;
     pauseAgentProcessing: (req: express.Request, res: express.Response) => Promise<void>;
     getAgentCosts: (req: express.Request, res: express.Response) => Promise<void>;

package/agents/controllers/policySynthAgents.js

@@ -6,6 +6,7 @@ import { AgentConnectorManager } from "@policysynth/agents/operations/agentConne
 import { AgentRegistryManager } from "@policysynth/agents/operations/agentRegistryManager.js";
 import { PsAiModel } from "@policysynth/agents/dbModels/aiModel.js";
 import auth from "../../authorization.cjs";
+import { PsAgent } from "@policysynth/agents/dbModels/agent.js";
 import { NewAiModelSetup } from "../managers/newAiModelSetup.js";
 export class PolicySynthAgentsController {
     constructor(wsClients) {
@@ -315,6 +316,22 @@ export class PolicySynthAgentsController {
                 res.status(500).send("Internal Server Error");
             }
         };
+        this.deleteAgent = async (req, res) => {
+            try {
+                const agentId = parseInt(req.params.agentId);
+                await this.recursiveDeleteAgent(agentId);
+                res.json({ message: "Agent deleted" });
+            }
+            catch (error) {
+                console.error("Error deleting agent:", error);
+                if (error instanceof Error) {
+                    res.status(500).json({ error: error.message });
+                }
+                else {
+                    res.status(500).json({ error: "An unexpected error occurred" });
+                }
+            }
+        };
         this.startAgentProcessing = async (req, res) => {
             const agentId = parseInt(req.params.id);
             try {
@@ -409,5 +426,19 @@ export class PolicySynthAgentsController {
         this.router.get("/:groupId/:agentId/memory", auth.can("edit group"), this.getAgentMemory);
         this.router.post("/:groupId/:agentId/inputConnectors/existing", auth.can("edit group"), this.addExistingConnector);
         this.router.post("/:groupId/:agentId/outputConnectors/existing", auth.can("edit group"), this.addExistingConnector);
+        this.router.delete("/:groupId/:agentId", auth.can("edit group"), this.deleteAgent);
+    }
+    async recursiveDeleteAgent(agentId) {
+        const agent = await PsAgent.findByPk(agentId, {
+            include: [{ model: PsAgent, as: "SubAgents" }],
+        });
+        if (!agent)
+            return;
+        if (agent.SubAgents) {
+            for (const sub of agent.SubAgents) {
+                await this.recursiveDeleteAgent(sub.id);
+            }
+        }
+        await agent.destroy();
     }
 }

package/agents/managers/newAiModelSetup.js

@@ -371,9 +371,9 @@ export class NewAiModelSetup {
             modelSize: PsAiModelSize.Medium,
             provider: "openai",
             prices: {
-                costInTokensPerMillion: 10.0,
-                costOutTokensPerMillion: 40.0,
-                costInCachedContextTokensPerMillion: 2.5,
+                costInTokensPerMillion: 2.0,
+                costOutTokensPerMillion: 8.0,
+                costInCachedContextTokensPerMillion: 0.5,
                 currency: "USD",
             },
             maxTokensOut: 100000,
@@ -570,45 +570,8 @@ export class NewAiModelSetup {
             await gemini20Flash.save();
             console.log("Google model already exists: Gemini 2.0 Flash");
         }
-        const gemini25ProPreview1 = await PsAiModel.findOne({
-            where: { name: "Gemini 2.5 Pro Preview 1" },
-        });
-        const gemini25ProPreview1Config = {
-            type: PsAiModelType.TextReasoning,
-            modelSize: PsAiModelSize.Large,
-            provider: "google",
-            prices: {
-                costInTokensPerMillion: 1.25,
-                costOutTokensPerMillion: 10,
-                costInCachedContextTokensPerMillion: 0.875,
-                longContextTokenThreshold: 200000,
-                longContextCostInTokensPerMillion: 2.5,
-                longContextCostInCachedContextTokensPerMillion: 1.75,
-                longContextCostOutTokensPerMillion: 15,
-                currency: "USD",
-            },
-            model: "gemini-2.5-pro-preview-04-17",
-            active: true,
-            maxTokensOut: 100000,
-            defaultTemperature: 0.0
-        };
-        if (!gemini25ProPreview1) {
-            await PsAiModel.create({
-                name: "Gemini 2.5 Pro Preview 1",
-                organization_id: 1,
-                user_id: userId,
-                configuration: gemini25ProPreview1Config,
-            });
-            console.log("Created Google model: Gemini 2.5 Pro Preview 1");
-        }
-        else {
-            gemini25ProPreview1.set("configuration", gemini25ProPreview1Config);
-            gemini25ProPreview1.changed("configuration", true);
-            await gemini25ProPreview1.save();
-            console.log("Google model already exists: Gemini 2.5 Pro Preview 1");
-        }
-        const gemini25ProPreview2 = await PsAiModel.findOne({
-            where: { name: "Gemini 2.5 Pro Preview 2" },
+        const gemini25Pro = await PsAiModel.findOne({
+            where: { name: "Gemini 2.5 Pro" },
         });
         const gemini25ProConfig = {
             type: PsAiModelType.TextReasoning,
@@ -624,14 +587,14 @@ export class NewAiModelSetup {
                 longContextCostOutTokensPerMillion: 15,
                 currency: "USD",
             },
-            model: "gemini-2.5-pro-preview-05-06",
+            model: "gemini-2.5-pro",
             active: true,
             maxTokensOut: 100000,
             defaultTemperature: 0.0
         };
-        if (!gemini25ProPreview2) {
+        if (!gemini25Pro) {
             await PsAiModel.create({
-                name: "Gemini 2.5 Pro Preview 2",
+                name: "Gemini 2.5 Pro",
                 organization_id: 1,
                 user_id: userId,
                 configuration: gemini25ProConfig,
@@ -639,53 +602,16 @@ export class NewAiModelSetup {
             console.log("Created Google model: Gemini 2.5 Pro");
         }
         else {
-            gemini25ProPreview2.set("configuration", gemini25ProConfig);
-            gemini25ProPreview2.changed("configuration", true);
-            await gemini25ProPreview2.save();
+            gemini25Pro.set("configuration", gemini25ProConfig);
+            gemini25Pro.changed("configuration", true);
+            await gemini25Pro.save();
             console.log("Google model already exists: Gemini 2.5 Pro");
         }
-        const gemini25ProFinalPreview = await PsAiModel.findOne({
-            where: { name: "Gemini 2.5 Pro Final Preview" },
-        });
-        const gemini25ProFinalConfig = {
-            type: PsAiModelType.TextReasoning,
-            modelSize: PsAiModelSize.Large,
-            provider: "google",
-            prices: {
-                costInTokensPerMillion: 1.25,
-                costOutTokensPerMillion: 10,
-                costInCachedContextTokensPerMillion: 0.875,
-                longContextTokenThreshold: 200000,
-                longContextCostInTokensPerMillion: 2.5,
-                longContextCostInCachedContextTokensPerMillion: 1.75,
-                longContextCostOutTokensPerMillion: 15,
-                currency: "USD",
-            },
-            model: "gemini-2.5-pro-preview-06-05",
-            active: true,
-            maxTokensOut: 100000,
-            defaultTemperature: 0.0,
-        };
-        if (!gemini25ProFinalPreview) {
-            await PsAiModel.create({
-                name: "Gemini 2.5 Pro Final Preview",
-                organization_id: 1,
-                user_id: userId,
-                configuration: gemini25ProFinalConfig,
-            });
-            console.log("Created Google model: Gemini 2.5 Pro Final Preview");
-        }
-        else {
-            gemini25ProFinalPreview.set("configuration", gemini25ProFinalConfig);
-            gemini25ProFinalPreview.changed("configuration", true);
-            await gemini25ProFinalPreview.save();
-            console.log("Google model already exists: Gemini 2.5 Pro Final Preview");
-        }
         const gemini25FlashPreview1 = await PsAiModel.findOne({
             where: { name: "Gemini 2.5 Flash Preview 1" },
         });
         const gemini25FlashPreview1Config = {
-            type: PsAiModelType.TextReasoning,
+            type: PsAiModelType.Text,
             modelSize: PsAiModelSize.Medium,
             provider: "google",
             prices: {
@@ -858,9 +784,7 @@ export class NewAiModelSetup {
             { name: "Gemini 1.5 Pro 2", envKey: "GEMINI_API_KEY" },
             { name: "Gemini 1.5 Flash 2", envKey: "GEMINI_API_KEY" },
             { name: "Gemini 2.0 Flash", envKey: "GEMINI_API_KEY" },
-            { name: "Gemini 2.5 Pro Preview 1", envKey: "GEMINI_API_KEY" },
-            { name: "Gemini 2.5 Pro Preview 2", envKey: "GEMINI_API_KEY" },
-            { name: "Gemini 2.5 Pro Final Preview", envKey: "GEMINI_API_KEY" },
+            { name: "Gemini 2.5 Pro", envKey: "GEMINI_API_KEY" },
             { name: "Gemini 2.5 Flash Preview 1", envKey: "GEMINI_API_KEY" },
             { name: "Gemini 2.5 Flash Preview", envKey: "GEMINI_API_KEY" },
             { name: "o1 24", envKey: "OPENAI_API_KEY" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.137",
+  "version": "9.0.139",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {

package/scripts/agents/changeModelForWorkflowGroupTemplate.js

@@ -1,6 +1,7 @@
 import { initializeModels, PsAgent, PsAiModel, } from "@policysynth/agents/dbModels/index.js";
-import { PsAiModelSize, PsAiModelType } from "@policysynth/agents/aiModelTypes.js";
+import { PsAiModelSize, PsAiModelType, } from "@policysynth/agents/aiModelTypes.js";
 import models from "../../models/index.cjs";
+import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
 (async () => {
     const [groupIdArg, sizeArg, typeArg, modelNameArg] = process.argv.slice(2);
     if (!groupIdArg || !sizeArg || !typeArg || !modelNameArg) {
@@ -53,16 +54,38 @@ import models from "../../models/index.cjs";
         if (!newModel) {
             throw new Error(`AI model with configuration.model ${modelNameArg} not found`);
         }
+        if (newModel.configuration?.type !== modelType ||
+            newModel.configuration?.modelSize !== size) {
+            throw new Error(`Model '${modelNameArg}' exists, but its configuration is ` +
+                `type=${newModel.configuration?.type ?? "∅"}, ` +
+                `size=${newModel.configuration?.modelSize ?? "∅"} – expected ` +
+                `${modelType}/${size}.`);
+        }
+        await NewAiModelSetup.setupApiKeysForGroup(group);
         const privateConfig = (group.private_access_configuration ?? []);
         for (const agent of subAgents) {
+            console.log(`Updating agent ${agent.id} to use model ${newModel.name}`);
             const currentModels = await agent.getAiModels();
+            console.log(`Current models: ${currentModels.length}`);
             for (const current of currentModels) {
                 const cfg = current.configuration || {};
                 if (cfg.modelSize === size && cfg.type === modelType) {
                     await agent.removeAiModel(current);
                     const entry = privateConfig.find((p) => p.aiModelId === current.id);
-                    if (entry)
+                    if (entry) {
+                        console.log(`Updating entry ${entry.id} to use model ${newModel.name}`);
                         entry.aiModelId = newModel.id;
+                    }
+                    else {
+                        console.log(`Adding entry for agent ${agent.id} to use model ${newModel.name}`);
+                        privateConfig.push({
+                            aiModelId: newModel.id,
+                            agentId: agent.id,
+                        });
+                    }
+                }
+                else {
+                    console.log(`Skipping model ${current.name} for agent ${agent.id} because it does not match size ${size} and type ${modelType}`);
                 }
             }
             await agent.addAiModel(newModel);

package/scripts/agents/generateAgentWorkflowTemplateFromAgentClass.js

@@ -75,15 +75,15 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
             parent_agent_id: topLevelAgent.id,
             configuration: {},
         });
-        // Add Gemini 2.5 Pro Preview 2 model
+        // Add Gemini 2.5 Pro model
         const geminiReasoning = await PsAiModel.findOne({
-            where: { name: "Gemini 2.5 Pro Preview 2" },
+            where: { name: "Gemini 2.5 Pro" },
         });
         if (geminiReasoning) {
             await psAgent.addAiModel(geminiReasoning);
         }
         else {
-            throw new Error("Gemini 2.5 Pro Preview 2 model not found");
+            throw new Error("Gemini 2.5 Pro model not found");
         }
         // Add Gemini 2.0 Flash model
         const geminiFlash = await PsAiModel.findOne({