@yrpri/api 9.0.113 → 9.0.115

package/agents/managers/newAiModelSetup.js

@@ -54,21 +54,22 @@ export class NewAiModelSetup {
         const anthropicSonnet = await PsAiModel.findOne({
             where: { name: "Anthropic Sonnet 3.5" },
         });
+        const anthropicSonnetConfig = {
+            type: PsAiModelType.Text,
+            modelSize: PsAiModelSize.Medium,
+            provider: "anthropic",
+            prices: {
+                costInTokensPerMillion: 3,
+                costOutTokensPerMillion: 15,
+                costInCachedContextTokensPerMillion: 0.3,
+                currency: "USD",
+            },
+            maxTokensOut: 8000,
+            defaultTemperature: 0.7,
+            model: "claude-3-5-sonnet-20240620",
+            active: true,
+        };
         if (!anthropicSonnet) {
-            const anthropicSonnetConfig = {
-                type: PsAiModelType.Text,
-                modelSize: PsAiModelSize.Medium,
-                provider: "anthropic",
-                prices: {
-                    costInTokensPerMillion: 3,
-                    costOutTokensPerMillion: 15,
-                    currency: "USD",
-                },
-                maxTokensOut: 8000,
-                defaultTemperature: 0.7,
-                model: "claude-3-5-sonnet-20240620",
-                active: true,
-            };
             const createdModel = await PsAiModel.create({
                 name: "Anthropic Sonnet 3.5",
                 organization_id: 1,
@@ -79,6 +80,9 @@ export class NewAiModelSetup {
         }
         else {
             console.log("Anthropic model already exists: Anthropic Sonnet 3.5");
+            anthropicSonnet.set("configuration", anthropicSonnetConfig);
+            anthropicSonnet.changed("configuration", true);
+            await anthropicSonnet.save();
         }
     }
     static async seedAnthropic37Models(userId) {
@@ -92,6 +96,7 @@ export class NewAiModelSetup {
             prices: {
                 costInTokensPerMillion: 3,
                 costOutTokensPerMillion: 15,
+                costInCachedContextTokensPerMillion: 0.3,
                 currency: "USD",
             },
             maxTokensOut: 8000,
@@ -110,6 +115,9 @@ export class NewAiModelSetup {
         }
         else {
             console.log("Anthropic model already exists: Anthropic Sonnet 3.7");
+            anthropicSonnet.set("configuration", anthropicSonnetConfig);
+            anthropicSonnet.changed("configuration", true);
+            await anthropicSonnet.save();
         }
     }
     /**
@@ -129,6 +137,7 @@ export class NewAiModelSetup {
             prices: {
                 costInTokensPerMillion: 2.5,
                 costOutTokensPerMillion: 10,
+                costInCachedContextTokensPerMillion: 1.25,
                 currency: "USD",
             },
             maxTokensOut: 16384,
@@ -155,21 +164,22 @@ export class NewAiModelSetup {
         const openAiGpt4Mini = await PsAiModel.findOne({
             where: { name: "GPT-4o Mini" },
         });
+        const openAiGpt4oMiniConfig = {
+            type: PsAiModelType.Text,
+            modelSize: PsAiModelSize.Small,
+            provider: "openai",
+            prices: {
+                costInTokensPerMillion: 0.15,
+                costOutTokensPerMillion: 0.6,
+                costInCachedContextTokensPerMillion: 0.075,
+                currency: "USD",
+            },
+            maxTokensOut: 16384,
+            defaultTemperature: 0.0,
+            model: "gpt-4o-mini",
+            active: true,
+        };
         if (!openAiGpt4Mini) {
-            const openAiGpt4oMiniConfig = {
-                type: PsAiModelType.Text,
-                modelSize: PsAiModelSize.Small,
-                provider: "openai",
-                prices: {
-                    costInTokensPerMillion: 0.15,
-                    costOutTokensPerMillion: 0.6,
-                    currency: "USD",
-                },
-                maxTokensOut: 16384,
-                defaultTemperature: 0.0,
-                model: "gpt-4o-mini",
-                active: true,
-            };
             await PsAiModel.create({
                 name: "GPT-4o Mini",
                 organization_id: 1,
@@ -179,27 +189,31 @@ export class NewAiModelSetup {
             console.log("Created OpenAI model: GPT-4o Mini");
         }
         else {
+            openAiGpt4Mini.set("configuration", openAiGpt4oMiniConfig);
+            openAiGpt4Mini.changed("configuration", true);
+            await openAiGpt4Mini.save();
             console.log("OpenAI model already exists: GPT-4o Mini");
         }
         // o1 Mini
         const openAio1Mini = await PsAiModel.findOne({
             where: { name: "o1 Mini" },
         });
+        const openAio1MiniConfig = {
+            type: PsAiModelType.TextReasoning,
+            modelSize: PsAiModelSize.Small,
+            provider: "openai",
+            prices: {
+                costInTokensPerMillion: 1.1,
+                costOutTokensPerMillion: 4.4,
+                costInCachedContextTokensPerMillion: 0.55,
+                currency: "USD",
+            },
+            maxTokensOut: 32000,
+            defaultTemperature: 0.0,
+            model: "o1-mini",
+            active: true,
+        };
         if (!openAio1Mini) {
-            const openAio1MiniConfig = {
-                type: PsAiModelType.TextReasoning,
-                modelSize: PsAiModelSize.Small,
-                provider: "openai",
-                prices: {
-                    costInTokensPerMillion: 3.0,
-                    costOutTokensPerMillion: 12.0,
-                    currency: "USD",
-                },
-                maxTokensOut: 32000,
-                defaultTemperature: 0.0,
-                model: "o1-mini",
-                active: true,
-            };
             await PsAiModel.create({
                 name: "o1 Mini",
                 organization_id: 1,
@@ -209,27 +223,31 @@ export class NewAiModelSetup {
             console.log("Created OpenAI model: o1 Mini");
         }
         else {
+            openAio1Mini.set("configuration", openAio1MiniConfig);
+            openAio1Mini.changed("configuration", true);
+            await openAio1Mini.save();
             console.log("OpenAI model already exists: o1 Mini");
         }
         // o1 Preview
         const openAio1Preview = await PsAiModel.findOne({
             where: { name: "o1 Preview" },
         });
+        const openAio1PreviewConfig = {
+            type: PsAiModelType.TextReasoning,
+            modelSize: PsAiModelSize.Medium,
+            provider: "openai",
+            prices: {
+                costInTokensPerMillion: 15.0,
+                costOutTokensPerMillion: 60.0,
+                costInCachedContextTokensPerMillion: 7.5,
+                currency: "USD",
+            },
+            maxTokensOut: 32000,
+            defaultTemperature: 0.0,
+            model: "o1-preview",
+            active: true,
+        };
         if (!openAio1Preview) {
-            const openAio1PreviewConfig = {
-                type: PsAiModelType.TextReasoning,
-                modelSize: PsAiModelSize.Medium,
-                provider: "openai",
-                prices: {
-                    costInTokensPerMillion: 15.0,
-                    costOutTokensPerMillion: 60.0,
-                    currency: "USD",
-                },
-                maxTokensOut: 32000,
-                defaultTemperature: 0.0,
-                model: "o1-preview",
-                active: true,
-            };
             await PsAiModel.create({
                 name: "o1 Preview",
                 organization_id: 1,
@@ -239,6 +257,9 @@ export class NewAiModelSetup {
             console.log("Created OpenAI model: o1 Preview");
         }
         else {
+            openAio1Preview.set("configuration", openAio1PreviewConfig);
+            openAio1Preview.changed("configuration", true);
+            await openAio1Preview.save();
             console.log("OpenAI model already exists: o1 Preview");
         }
         // o1 24
@@ -252,6 +273,7 @@ export class NewAiModelSetup {
             prices: {
                 costInTokensPerMillion: 15.0,
                 costOutTokensPerMillion: 60.0,
+                costInCachedContextTokensPerMillion: 7.5,
                 currency: "USD",
             },
             maxTokensOut: 100000,
@@ -278,21 +300,22 @@ export class NewAiModelSetup {
         const openAio3Mini = await PsAiModel.findOne({
             where: { name: "o3 mini" },
         });
+        const openAio3MiniConfig = {
+            type: PsAiModelType.TextReasoning,
+            modelSize: PsAiModelSize.Small,
+            provider: "openai",
+            prices: {
+                costInTokensPerMillion: 1.1,
+                costOutTokensPerMillion: 4.4,
+                costInCachedContextTokensPerMillion: 0.55,
+                currency: "USD",
+            },
+            maxTokensOut: 100000,
+            defaultTemperature: 0.0,
+            model: "o3-mini",
+            active: true,
+        };
         if (!openAio3Mini) {
-            const openAio3MiniConfig = {
-                type: PsAiModelType.TextReasoning,
-                modelSize: PsAiModelSize.Small,
-                provider: "openai",
-                prices: {
-                    costInTokensPerMillion: 1.1,
-                    costOutTokensPerMillion: 4.4,
-                    currency: "USD",
-                },
-                maxTokensOut: 100000,
-                defaultTemperature: 0.0,
-                model: "o3-mini",
-                active: true,
-            };
             await PsAiModel.create({
                 name: "o3 mini",
                 organization_id: 1,
@@ -302,6 +325,9 @@ export class NewAiModelSetup {
             console.log("Created OpenAI model: o3 mini");
         }
         else {
+            openAio3Mini.set("configuration", openAio3MiniConfig);
+            openAio3Mini.changed("configuration", true);
+            await openAio3Mini.save();
             console.log("OpenAI model already exists: o3 mini");
         }
         const openAiGpt45 = await PsAiModel.findOne({
@@ -314,6 +340,7 @@ export class NewAiModelSetup {
             prices: {
                 costInTokensPerMillion: 75,
                 costOutTokensPerMillion: 150,
+                costInCachedContextTokensPerMillion: 37.5,
                 currency: "USD",
             },
             maxTokensOut: 100000,
@@ -331,7 +358,10 @@ export class NewAiModelSetup {
             console.log("Created OpenAI model: GPT-4.5 Preview");
         }
         else {
-            console.log("OpenAI model already exists: GPT-4.5 Preview updating");
+            openAiGpt45.set("configuration", openAiGpt45Config);
+            openAiGpt45.changed("configuration", true);
+            await openAiGpt45.save();
+            console.log("OpenAI model already exists: GPT-4.5 Preview");
         }
         const openAio3 = await PsAiModel.findOne({
             where: { name: "o3" },
@@ -343,7 +373,7 @@ export class NewAiModelSetup {
             prices: {
                 costInTokensPerMillion: 10.0,
                 costOutTokensPerMillion: 40.0,
-                cacheCostInTokensPerMillion: 2.5,
+                costInCachedContextTokensPerMillion: 2.5,
                 currency: "USD",
             },
             maxTokensOut: 100000,
@@ -376,7 +406,7 @@ export class NewAiModelSetup {
             prices: {
                 costInTokensPerMillion: 1.1,
                 costOutTokensPerMillion: 4.4,
-                cacheCostInTokensPerMillion: 0.275,
+                costInCachedContextTokensPerMillion: 0.275,
                 currency: "USD",
             },
             maxTokensOut: 100000,
@@ -394,6 +424,9 @@ export class NewAiModelSetup {
             console.log("Created OpenAI model: o4 mini");
         }
         else {
+            openAio4mini.set("configuration", openAio4miniConfig);
+            openAio4mini.changed("configuration", true);
+            await openAio4mini.save();
             console.log("OpenAI model already exists: o4 mini");
         }
         const openAiGpt41 = await PsAiModel.findOne({
@@ -407,7 +440,7 @@ export class NewAiModelSetup {
                 costInTokensPerMillion: 2,
                 costOutTokensPerMillion: 8,
                 currency: "USD",
-                cacheCostInTokensPerMillion: 0.5,
+                costInCachedContextTokensPerMillion: 0.5,
             },
             maxTokensOut: 100000,
             defaultTemperature: 0.7,
@@ -424,6 +457,9 @@ export class NewAiModelSetup {
             console.log("Created OpenAI model: GPT-4.1");
         }
         else {
+            openAiGpt41.set("configuration", openAiGpt41Config);
+            openAiGpt41.changed("configuration", true);
+            await openAiGpt41.save();
             console.log("OpenAI model already exists: GPT-4.1");
         }
     }
@@ -436,21 +472,22 @@ export class NewAiModelSetup {
         const geminiPro = await PsAiModel.findOne({
             where: { name: "Gemini 1.5 Pro 2" },
         });
+        const geminiProConfig = {
+            type: PsAiModelType.Text,
+            modelSize: PsAiModelSize.Medium,
+            provider: "google",
+            prices: {
+                costInTokensPerMillion: 1.25,
+                costOutTokensPerMillion: 5.0,
+                costInCachedContextTokensPerMillion: 0.875,
+                currency: "USD",
+            },
+            maxTokensOut: 8192,
+            defaultTemperature: 0.0,
+            model: "gemini-1.5-pro-002",
+            active: true,
+        };
         if (!geminiPro) {
-            const geminiProConfig = {
-                type: PsAiModelType.Text,
-                modelSize: PsAiModelSize.Medium,
-                provider: "google",
-                prices: {
-                    costInTokensPerMillion: 1.25,
-                    costOutTokensPerMillion: 5.0,
-                    currency: "USD",
-                },
-                maxTokensOut: 8192,
-                defaultTemperature: 0.0,
-                model: "gemini-1.5-pro-002",
-                active: true,
-            };
             await PsAiModel.create({
                 name: "Gemini 1.5 Pro 2",
                 organization_id: 1,
@@ -460,27 +497,31 @@ export class NewAiModelSetup {
             console.log("Created Google model: Gemini 1.5 Pro 2");
         }
         else {
+            geminiPro.set("configuration", geminiProConfig);
+            geminiPro.changed("configuration", true);
+            await geminiPro.save();
             console.log("Google model already exists: Gemini 1.5 Pro 2");
         }
         // Gemini 1.5 Flash 2
         const geminiPro15Flash = await PsAiModel.findOne({
             where: { name: "Gemini 1.5 Flash 2" },
         });
+        const geminiPro15FlashConfig = {
+            type: PsAiModelType.Text,
+            modelSize: PsAiModelSize.Small,
+            provider: "google",
+            prices: {
+                costInTokensPerMillion: 0.075,
+                costOutTokensPerMillion: 0.3,
+                costInCachedContextTokensPerMillion: 0.525,
+                currency: "USD",
+            },
+            maxTokensOut: 8192,
+            defaultTemperature: 0.0,
+            model: "gemini-1.5-flash-002",
+            active: true,
+        };
         if (!geminiPro15Flash) {
-            const geminiPro15FlashConfig = {
-                type: PsAiModelType.Text,
-                modelSize: PsAiModelSize.Small,
-                provider: "google",
-                prices: {
-                    costInTokensPerMillion: 0.075,
-                    costOutTokensPerMillion: 0.3,
-                    currency: "USD",
-                },
-                maxTokensOut: 8192,
-                defaultTemperature: 0.0,
-                model: "gemini-1.5-flash-002",
-                active: true,
-            };
             await PsAiModel.create({
                 name: "Gemini 1.5 Flash 2",
                 organization_id: 1,
@@ -490,27 +531,31 @@ export class NewAiModelSetup {
             console.log("Created Google model: Gemini 1.5 Flash 2");
         }
         else {
+            geminiPro15Flash.set("configuration", geminiPro15FlashConfig);
+            geminiPro15Flash.changed("configuration", true);
+            await geminiPro15Flash.save();
             console.log("Google model already exists: Gemini 1.5 Flash 2");
         }
         // Gemini 2.0 Flash
         const gemini20Flash = await PsAiModel.findOne({
             where: { name: "Gemini 2.0 Flash" },
         });
+        const gemini20FlashConfig = {
+            type: PsAiModelType.Text,
+            modelSize: PsAiModelSize.Medium,
+            provider: "google",
+            prices: {
+                costInTokensPerMillion: 0.1,
+                costOutTokensPerMillion: 0.4,
+                costInCachedContextTokensPerMillion: 0.07,
+                currency: "USD",
+            },
+            maxTokensOut: 8192,
+            defaultTemperature: 0.0,
+            model: "gemini-2.0-flash",
+            active: true,
+        };
         if (!gemini20Flash) {
-            const gemini20FlashConfig = {
-                type: PsAiModelType.Text,
-                modelSize: PsAiModelSize.Medium,
-                provider: "google",
-                prices: {
-                    costInTokensPerMillion: 0.1,
-                    costOutTokensPerMillion: 0.4,
-                    currency: "USD",
-                },
-                maxTokensOut: 8192,
-                defaultTemperature: 0.0,
-                model: "gemini-2.0-flash",
-                active: true,
-            };
             await PsAiModel.create({
                 name: "Gemini 2.0 Flash",
                 organization_id: 1,
@@ -520,8 +565,85 @@ export class NewAiModelSetup {
             console.log("Created Google model: Gemini 2.0 Flash");
         }
         else {
+            gemini20Flash.set("configuration", gemini20FlashConfig);
+            gemini20Flash.changed("configuration", true);
+            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.Medium,
+            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 gemini25ProConfig = {
+            type: PsAiModelType.TextReasoning,
+            modelSize: PsAiModelSize.Medium,
+            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-05-06",
+            active: true,
+            maxTokensOut: 100000,
+            defaultTemperature: 0.0
+        };
+        if (!gemini25ProPreview2) {
+            await PsAiModel.create({
+                name: "Gemini 2.5 Pro Preview 2",
+                organization_id: 1,
+                user_id: userId,
+                configuration: gemini25ProConfig,
+            });
+            console.log("Created Google model: Gemini 2.5 Pro");
+        }
+        else {
+            gemini25ProPreview2.set("configuration", gemini25ProConfig);
+            gemini25ProPreview2.changed("configuration", true);
+            await gemini25ProPreview2.save();
+            console.log("Google model already exists: Gemini 2.5 Pro");
+        }
     }
     /**
      * Master seeding function which calls the provider-specific functions
@@ -629,6 +751,8 @@ 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: "o1 24", envKey: "OPENAI_API_KEY" },
             { name: "o3 mini", envKey: "OPENAI_API_KEY" },
             { name: "o4 mini", envKey: "OPENAI_API_KEY" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.113",
+  "version": "9.0.115",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {
@@ -25,7 +25,7 @@
     "@google-cloud/vertexai": "^1.10.0",
     "@google-cloud/vision": "^5.1.0",
     "@node-saml/passport-saml": "^5.0.1",
-    "@policysynth/agents": "^1.3.92",
+    "@policysynth/agents": "^1.3.94",
     "async": "^3.2.6",
     "authorized": "^1.0.0",
     "aws-sdk": "^2.1692.0",

package/services/engine/old/exporters/dataset_tools.d.ts

@@ -1,3 +1,3 @@
-export function replaceBetterReykjavikCategoryId(id: any): 1 | 2 | 5 | 4 | 7 | 3 | 6 | 10 | 12 | 8 | 9 | 11 | 13 | undefined;
+export function replaceBetterReykjavikCategoryId(id: any): 1 | 2 | 5 | 4 | 7 | 3 | 6 | 10 | 8 | 9 | 12 | 11 | 13 | undefined;
 export function clean(string: any): any;
 export function shuffleArray(array: any): any;

package/services/models/index.cjs

@@ -1,35 +0,0 @@
-'use strict';
-const fs = require('fs');
-const path = require('path');
-const Sequelize = require('sequelize');
-const basename = path.basename(__filename);
-const env = process.env.NODE_ENV || 'development';
-// TODO: Replace this with your actual database configuration
-// It might come from a central config file or environment variables
-const config = require(__dirname + '/../../config/config.json')[env]; // Assuming a config file structure
-const db = {};
-let sequelize;
-if (config.use_env_variable) {
-    sequelize = new Sequelize(process.env[config.use_env_variable], config);
-}
-else {
-    sequelize = new Sequelize(config.database, config.username, config.password, config);
-}
-fs
-    .readdirSync(__dirname)
-    .filter(file => {
-    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-4) === '.cjs') && file.startsWith('ac_');
-})
-    .forEach(file => {
-    // Sequelize V6 style model import
-    const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes);
-    db[model.name] = model;
-});
-Object.keys(db).forEach(modelName => {
-    if (db[modelName].associate) {
-        db[modelName].associate(db);
-    }
-});
-db.sequelize = sequelize;
-db.Sequelize = Sequelize;
-module.exports = db;

package/services/models/index.d.cts

@@ -1,2 +0,0 @@
-export = db;
-declare const db: typeof import("services/models/index.cjs");