@yrpri/api 9.0.123 → 9.0.125

package/agents/managers/newAiModelSetup.js

@@ -575,7 +575,7 @@ export class NewAiModelSetup {
         });
         const gemini25ProPreview1Config = {
             type: PsAiModelType.TextReasoning,
-            modelSize: PsAiModelSize.Medium,
+            modelSize: PsAiModelSize.Large,
             provider: "google",
             prices: {
                 costInTokensPerMillion: 1.25,
@@ -612,7 +612,7 @@ export class NewAiModelSetup {
         });
         const gemini25ProConfig = {
             type: PsAiModelType.TextReasoning,
-            modelSize: PsAiModelSize.Medium,
+            modelSize: PsAiModelSize.Large,
             provider: "google",
             prices: {
                 costInTokensPerMillion: 1.25,
@@ -644,6 +644,43 @@ export class NewAiModelSetup {
             await gemini25ProPreview2.save();
             console.log("Google model already exists: Gemini 2.5 Pro");
         }
+        const gemini25FlashPreview1 = await PsAiModel.findOne({
+            where: { name: "Gemini 2.5 Flash Preview 1" },
+        });
+        const gemini25FlashPreview1Config = {
+            type: PsAiModelType.TextReasoning,
+            modelSize: PsAiModelSize.Medium,
+            provider: "google",
+            prices: {
+                costInTokensPerMillion: 0.15,
+                costOutTokensPerMillion: 0.6,
+                costInCachedContextTokensPerMillion: 0.09,
+                longContextTokenThreshold: 200000,
+                longContextCostInTokensPerMillion: 0.3,
+                longContextCostInCachedContextTokensPerMillion: 0.21,
+                longContextCostOutTokensPerMillion: 2.4,
+                currency: "USD",
+            },
+            model: "gemini-2.5-flash-preview-05-20",
+            active: true,
+            maxTokensOut: 100000,
+            defaultTemperature: 0.0
+        };
+        if (!gemini25FlashPreview1) {
+            await PsAiModel.create({
+                name: "Gemini 2.5 Flash Preview 1",
+                organization_id: 1,
+                user_id: userId,
+                configuration: gemini25FlashPreview1Config,
+            });
+            console.log("Created Google model: Gemini 2.5 Flash Preview 1");
+        }
+        else {
+            gemini25FlashPreview1.set("configuration", gemini25FlashPreview1Config);
+            gemini25FlashPreview1.changed("configuration", true);
+            await gemini25FlashPreview1.save();
+            console.log("Google model already exists: Gemini 2.5 Pro");
+        }
     }
     /**
      * Master seeding function which calls the provider-specific functions
@@ -753,6 +790,7 @@ export class NewAiModelSetup {
             { 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 Flash Preview 1", envKey: "GEMINI_API_KEY" },
             { name: "o1 24", envKey: "OPENAI_API_KEY" },
             { name: "o3 mini", envKey: "OPENAI_API_KEY" },
             { name: "o4 mini", envKey: "OPENAI_API_KEY" },

package/app.js

@@ -502,7 +502,15 @@ export class YourPrioritiesApi {
         this.app.use(requestIp.mw());
         this.app.use(bodyParser.json({ limit: "100mb", strict: false }));
         this.app.use(bodyParser.urlencoded({ limit: "100mb", extended: true }));
-        this.app.use(cors());
+        if (process.env.ALLOWED_ORIGINS) {
+            this.app.use(cors({
+                origin: process.env.ALLOWED_ORIGINS.split(","),
+                credentials: true,
+            }));
+        }
+        else {
+            this.app.use(cors());
+        }
         this.app.use(compression());
         this.app.set("views", __dirname + "/views");
         this.app.set("view engine", "pug");
@@ -510,13 +518,19 @@ export class YourPrioritiesApi {
         if (!process.env.SESSION_SECRET) {
             throw new Error("SESSION_SECRET is not set");
         }
+        let cookieValues = {
+            autoSubDomain: true,
+        };
+        if (process.env.ALLOWED_ORIGINS) {
+            cookieValues.sameSite = "none";
+        }
         const sessionConfig = {
             store: store,
             name: "yrpri.sid",
             secret: process.env.SESSION_SECRET,
             resave: false,
             proxy: process.env.USING_NGINX_PROXY ? true : undefined,
-            cookie: { autoSubDomain: true },
+            cookie: cookieValues,
             saveUninitialized: false,
         };
         if (this.app.get("env") === "production") {

package/package.json

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

package/scripts/agents/generateAgentWorkflowTemplateFromAgentClass.js

@@ -1,4 +1,4 @@
-import { PsAgentClass, PsAgent, PsAiModel } from "@policysynth/agents/dbModels/index.js";
+import { initializeModels, PsAgentClass, PsAgent, PsAiModel, } from "@policysynth/agents/dbModels/index.js";
 import models from "../../models/index.cjs";
 import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
 (async () => {
@@ -14,7 +14,8 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
         process.exit(1);
     }
     try {
-        await NewAiModelSetup.initializeModels();
+        await initializeModels();
+        await NewAiModelSetup.seedAiModels(1);
         const domain = await models.Domain.findByPk(domainId);
         if (!domain) {
             throw new Error(`Domain ${domainId} not found`);
@@ -40,7 +41,29 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
             user_agent: "generateAgentWorkflowTemplateFromAgentClass.ts",
             configuration: { groupType: 3, agents: {} },
         });
-        // Create PsAgent from class
+        // Create top level agent for the workflow
+        const topLevelUuid = process.env.CLASS_ID_FOR_TOP_LEVEL_AGENT;
+        if (!topLevelUuid) {
+            throw new Error("CLASS_ID_FOR_TOP_LEVEL_AGENT environment variable not set");
+        }
+        const topLevelClass = await PsAgentClass.findOne({
+            where: { class_base_id: topLevelUuid },
+        });
+        if (!topLevelClass) {
+            throw new Error("Top level agent class not found");
+        }
+        const topLevelAgent = await PsAgent.create({
+            user_id: topLevelClass.user_id,
+            class_id: topLevelClass.id,
+            group_id: group.id,
+            configuration: { name: `${group.name} Top-Level Agent` },
+        });
+        // Update group configuration with top level agent id
+        group.configuration.agents = { topLevelAgentId: topLevelAgent.id };
+        group.changed("configuration", true);
+        await group.save();
+        await NewAiModelSetup.setupApiKeysForGroup(group);
+        // Create working agent from class and attach to top level agent
         const agentClass = await PsAgentClass.findByPk(agentClassId);
         if (!agentClass) {
             throw new Error(`PsAgentClass ${agentClassId} not found`);
@@ -49,6 +72,7 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
             user_id: agentClass.user_id,
             class_id: agentClass.id,
             group_id: group.id,
+            parent_agent_id: topLevelAgent.id,
             configuration: {},
         });
         // Add Gemini 2.5 Pro Preview 2 model
@@ -71,11 +95,7 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
         else {
             throw new Error("Gemini 2.0 Flash model not found");
         }
-        // Update group configuration with top level agent id
-        group.configuration.agents = { topLevelAgentId: psAgent.id };
-        group.changed("configuration", true);
-        await group.save();
-        console.log(`Created community ${community.id}, group ${group.id}, agent ${psAgent.id}`);
+        console.log(`Created community ${community.id}, group ${group.id}, top-level agent ${topLevelAgent.id}, working agent ${psAgent.id}`);
     }
     catch (error) {
         console.error(error);