@yrpri/api 9.0.139 → 9.0.141

package/models/post.cjs

@@ -212,10 +212,10 @@ module.exports = (sequelize, DataTypes) => {
     };
     Post.addFullTextIndex = () => {
         if (sequelize.options.dialect !== 'postgres') {
-            console.log('Not creating search index, must be using POSTGRES to do this');
+            log.info('Not creating search index, must be using POSTGRES to do this');
             return;
         }
-        console.log("Adding full text index");
+        log.debug("Adding full text index");
         const searchFields = ['name', 'description'];
         const vectorName = sequelize.models.Post.getSearchVector();
         sequelize.queryInterface.describeTable("posts").then((data) => {
@@ -223,30 +223,30 @@ module.exports = (sequelize, DataTypes) => {
                 sequelize
                     .query('ALTER TABLE "' + sequelize.models.Post.tableName + '" ADD COLUMN "' + vectorName + '" TSVECTOR')
                     .then(() => {
-                    console.log("addFullTextIndex: 1");
+                    log.info("addFullTextIndex: 1");
                     return sequelize
                         .query('UPDATE "' + sequelize.models.Post.tableName + '" SET "' + vectorName + '" = to_tsvector(\'english\', ' + searchFields.join(' || \' \' || ') + ')');
                 }).then(() => {
-                    console.log("addFullTextIndex: 2");
+                    log.info("addFullTextIndex: 2");
                     return sequelize
                         .query('CREATE INDEX post_search_idx ON "' + sequelize.models.Post.tableName + '" USING gin("' + vectorName + '");');
                 }).then(() => {
-                    console.log("addFullTextIndex: 3");
+                    log.info("addFullTextIndex: 3");
                     return sequelize
                         .query('CREATE TRIGGER post_vector_update BEFORE INSERT OR UPDATE ON "' + sequelize.models.Post.tableName + '" FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger("' + vectorName + '", \'pg_catalog.english\', ' + searchFields.join(', ') + ')');
                 }).catch(error => {
-                    console.log(error);
+                    log.info(error);
                 });
             }
             else {
-                log.info("PostText search index is already setup");
+                log.debug("PostText search index is already setup");
             }
         });
     };
     Post.search = (query, groupId, modelCategory) => {
-        console.log("In search for " + query);
+        log.info("In search for " + query);
         if (sequelize.options.dialect !== 'postgres') {
-            console.log('Search is only implemented on POSTGRES database');
+            log.info('Search is only implemented on POSTGRES database');
             return;
         }
         if (query) {
@@ -254,7 +254,7 @@ module.exports = (sequelize, DataTypes) => {
                 term = term.replace(/'/g, "''"); // Escape single quotes
                 return term + ':*';
             }).join(' & ');
-            console.log("Using tsQuery: " + tsQuery);
+            log.info("Using tsQuery: " + tsQuery);
             return sequelize.models.Post.findAll({
                 order: [
                     ["created_at", "DESC"],

package/models/user.cjs

@@ -587,7 +587,7 @@ module.exports = (sequelize, DataTypes) => {
     User.prototype.validatePassword = function (password, done) {
         let verified = this.encrypted_password ? bcrypt.compareSync(password, this.encrypted_password) : null;
         if (verified) {
-            console.log(`User ${this.id} has verified password`);
+            log.info(`User ${this.id} has verified password`);
             done(null, this);
         }
         else {

package/models/video.cjs

@@ -580,7 +580,7 @@ module.exports = (sequelize, DataTypes) => {
                 }
             }
             else {
-                console.error("Can't find collection for Ziggeo video");
+                log.error("Can't find collection for Ziggeo video");
             }
             resolve();
         });
@@ -606,7 +606,7 @@ module.exports = (sequelize, DataTypes) => {
                 resolve();
             }
             catch (error) {
-                console.error(error);
+                log.error(error);
                 res.sendStatus(500);
                 reject();
             }
@@ -830,11 +830,11 @@ module.exports = (sequelize, DataTypes) => {
                             }
                             log.info("foramts", { formats });
                             await mediaManager.deleteMediaFormatsUrls(formats);
-                            console.log("Deleted video", { videoId: req.params.videoId });
+                            log.info("Deleted video", { videoId: req.params.videoId });
                             res.sendStatus(200);
                         }
                         catch (error) {
-                            console.error("Could not delete video", { error, video });
+                            log.error("Could not delete video", { error, video });
                             res.sendStatus(500);
                         }
                     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.139",
+  "version": "9.0.141",
   "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.105",
+    "@policysynth/agents": "^1.3.111",
     "async": "^3.2.6",
     "authorized": "^1.0.0",
     "aws-sdk": "^2.1692.0",
@@ -138,12 +138,12 @@
     "publish_live": "npm run build:dev;npm pack && node repack && node publish.js https://registry.npmjs.org/",
     "publish_local": "npm run build;npm pack && node repack && node publish.js http://localhost:4873",
     "start": "nodemon -e ts ts-out/server.js",
-    "watch-start": "DEBUG=router:* tsc --project ./src --outDir ./ts-out -w & nodemon -q ./ts-out/server.js",
+    "watch-start": "DEBUG=router:* tsc --outDir ./ts-out -w & nodemon -q ./ts-out/server.js",
     "dev": "nodemon --config nodemon.json ./ts-out/server.js",
     "heroku-postbuild": "echo 'Skipping build'",
     "dev:debug": "nodemon --config nodemon.json --inspect-brk api_app.ts",
-    "build": "tsc --project ./src --outDir ./dist && ncp src/views dist/views && ncp config dist/config && ncp src/services/email_templates dist/services/email_templates && ncp src/services/locales dist/services/locales",
-    "build:dev": "tsc --project ./src --outDir ./ts-out && ncp src/views ts-out/views && ncp config ts-out/config && ncp src/services/email_templates ts-out/services/email_templates && ncp src/services/locales ts-out/services/locales"
+    "build": "tsc --outDir ./dist && ncp src/views dist/views && ncp config dist/config && ncp src/services/email_templates dist/services/email_templates && ncp src/services/locales dist/services/locales",
+    "build:dev": "tsc  --outDir ./ts-out && ncp src/views ts-out/views && ncp config ts-out/config && ncp src/services/email_templates ts-out/services/email_templates && ncp src/services/locales ts-out/services/locales"
   },
   "cacheDirectories": [
     "node_modules"

package/scripts/addRatingUsersToGroup.js

@@ -44,7 +44,7 @@ models.Rating.findAll({
             callback();
         });
     }, (error) => {
-        error ? console.error(error) : console.log("Done");
+        error ? log.error(error) : log.info("Done");
         process.exit();
     });
 });

package/scripts/addUserToOrganization.js

@@ -48,23 +48,23 @@ var getOrganizationAndUser = function (organizationId, userId, callback) {
         }
     });
 };
-console.log(userIdArg);
-console.log(organizationIdArg);
+log.info(userIdArg);
+log.info(organizationIdArg);
 getOrganizationAndUser(organizationIdArg, userIdArg, function (error, organization, user) {
-    console.log(error);
-    console.log(user);
-    console.log(organization);
+    log.info(error);
+    log.info(user);
+    log.info(organization);
     if (error) {
-        console.error(error);
+        log.error(error);
     }
     else if (user && organization) {
         organization.addOrganizationUsers(user).then(function (results) {
-            console.log("Completed");
+            log.info("Completed");
             process.exit();
         });
     }
     else {
-        console.error("Not found");
+        log.error("Not found");
         process.exit();
     }
 });

package/scripts/agents/changeModelForWorkflowGroupTemplate.js

@@ -2,15 +2,16 @@ import { initializeModels, PsAgent, PsAiModel, } from "@policysynth/agents/dbMod
 import { PsAiModelSize, PsAiModelType, } from "@policysynth/agents/aiModelTypes.js";
 import models from "../../models/index.cjs";
 import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
+import log from "../../utils/loggerTs.js";
 (async () => {
     const [groupIdArg, sizeArg, typeArg, modelNameArg] = process.argv.slice(2);
     if (!groupIdArg || !sizeArg || !typeArg || !modelNameArg) {
-        console.error("Usage: ts-node changeModelForWorkflowGroupTemplate.ts <groupId> <modelSize (small, medium, large)> <modeltype: text, textReasoning> <model_name>");
+        log.error("Usage: ts-node changeModelForWorkflowGroupTemplate.ts <groupId> <modelSize (small, medium, large)> <modeltype: text, textReasoning> <model_name>");
         process.exit(1);
     }
     const groupId = Number(groupIdArg);
     if (isNaN(groupId)) {
-        console.error("groupId must be a number");
+        log.error("groupId must be a number");
         process.exit(1);
     }
     const sizeMap = {
@@ -25,11 +26,11 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
     const size = sizeMap[sizeArg.toLowerCase()];
     const modelType = typeMap[typeArg.toLowerCase()];
     if (!size) {
-        console.error("modelSize must be one of small, medium or large");
+        log.error("modelSize must be one of small, medium or large");
         process.exit(1);
     }
     if (!modelType) {
-        console.error("modeltype must be text or textReasoning");
+        log.error("modeltype must be text or textReasoning");
         process.exit(1);
     }
     try {
@@ -64,20 +65,20 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
         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}`);
+            log.info(`Updating agent ${agent.id} to use model ${newModel.name}`);
             const currentModels = await agent.getAiModels();
-            console.log(`Current models: ${currentModels.length}`);
+            log.info(`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) {
-                        console.log(`Updating entry ${entry.id} to use model ${newModel.name}`);
+                        log.info(`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}`);
+                        log.info(`Adding entry for agent ${agent.id} to use model ${newModel.name}`);
                         privateConfig.push({
                             aiModelId: newModel.id,
                             agentId: agent.id,
@@ -85,19 +86,19 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
                     }
                 }
                 else {
-                    console.log(`Skipping model ${current.name} for agent ${agent.id} because it does not match size ${size} and type ${modelType}`);
+                    log.info(`Skipping model ${current.name} for agent ${agent.id} because it does not match size ${size} and type ${modelType}`);
                 }
             }
             await agent.addAiModel(newModel);
-            console.log(`Updated agent ${agent.id} to use model ${newModel.name}`);
+            log.info(`Updated agent ${agent.id} to use model ${newModel.name}`);
         }
         group.set("private_access_configuration", privateConfig);
         group.changed("private_access_configuration", true);
         await group.save();
-        console.log(`Group ${groupId} updated successfully`);
+        log.info(`Group ${groupId} updated successfully`);
     }
     catch (error) {
-        console.error(error);
+        log.error(error);
     }
     finally {
         await models.sequelize.close();

package/scripts/agents/generateAgentWorkflowTemplateFromAgentClass.js

@@ -1,16 +1,17 @@
 import { initializeModels, PsAgentClass, PsAgent, PsAiModel, } from "@policysynth/agents/dbModels/index.js";
 import models from "../../models/index.cjs";
 import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
+import log from "../../utils/loggerTs.js";
 (async () => {
     const [domainIdArg, agentClassIdArg] = process.argv.slice(2);
     if (!domainIdArg || !agentClassIdArg) {
-        console.error("Usage: ts-node generateAgentWorkflowTemplateFromAgentClass.ts <domainId> <psAgentClassId>");
+        log.error("Usage: ts-node generateAgentWorkflowTemplateFromAgentClass.ts <domainId> <psAgentClassId>");
         process.exit(1);
     }
     const domainId = Number(domainIdArg);
     const agentClassId = Number(agentClassIdArg);
     if (isNaN(domainId) || isNaN(agentClassId)) {
-        console.error("Both domainId and psAgentClassId must be valid numbers");
+        log.error("Both domainId and psAgentClassId must be valid numbers");
         process.exit(1);
     }
     try {
@@ -95,10 +96,10 @@ import { NewAiModelSetup } from "../../agents/managers/newAiModelSetup.js";
         else {
             throw new Error("Gemini 2.0 Flash model not found");
         }
-        console.log(`Created community ${community.id}, group ${group.id}, top-level agent ${topLevelAgent.id}, working agent ${psAgent.id}`);
+        log.info(`Created community ${community.id}, group ${group.id}, top-level agent ${topLevelAgent.id}, working agent ${psAgent.id}`);
     }
     catch (error) {
-        console.error(error);
+        log.error(error);
     }
     finally {
         await models.sequelize.close();

package/scripts/analyseRatingsForCommunity.js

@@ -142,9 +142,9 @@ async.series([
     }*/
 ], function (error) {
     if (error) {
-        console.error(error);
+        log.error(error);
     }
-    console.log(csvOut);
+    log.info(csvOut);
     process.exit();
 });
 export {};

package/scripts/analyzeAndFixBrokenPointUsers.js

@@ -6,11 +6,11 @@ models.Point.findAll({
         models.PointRevision
     ]
 }).then(function (points) {
-    console.log("Points count " + points.length);
+    log.info("Points count " + points.length);
     var counter = 0;
     async.eachSeries(points, function (point, callback) {
         if (point.user_id != point.PointRevisions[0].user_id) {
-            console.log("Not matching for post_id " + point.post_id + " Revision count " + point.PointRevisions.length + " date" + point.created_at);
+            log.info("Not matching for post_id " + point.post_id + " Revision count " + point.PointRevisions.length + " date" + point.created_at);
             counter += 1;
             point.user_id = point.PointRevisions[0].user_id;
             point.save().then(function () {
@@ -21,7 +21,7 @@ models.Point.findAll({
             callback();
         }
     }, function () {
-        console.log("Done, counted " + counter);
+        log.info("Done, counted " + counter);
         process.exit();
     });
 });

package/scripts/analyzeEndorsementsByCountry.js

@@ -8,7 +8,7 @@ const mmDbPath = process.argv[3];
 const clean = (text) => {
     if (text) {
         var newText = text.replace('"', "'").replace('\n', '').replace('\r', '').replace(/(\r\n|\n|\r)/gm, "").replace(/"/gm, "'").replace(',', ';').trim();
-        //console.log("After:" + newText);
+        //log.info("After:" + newText);
         return newText.replace(/´/g, '');
     }
     else {
@@ -52,17 +52,17 @@ Reader.open(mmDbPath, {}).then(reader => {
                 countriesDownCount[country] += 1;
             }
         }
-        console.log("All count");
+        log.info("All count");
         for (const property in countriesCount) {
-            console.log(`${property},${countriesCount[property]}`);
+            log.info(`${property},${countriesCount[property]}`);
         }
-        console.log("\n\nUp votes count");
+        log.info("\n\nUp votes count");
         for (const property in countriesUpCount) {
-            console.log(`${property},${countriesUpCount[property]}`);
+            log.info(`${property},${countriesUpCount[property]}`);
         }
-        console.log("\n\nDown votes count");
+        log.info("\n\nDown votes count");
         for (const property in countriesDownCount) {
-            console.log(`${property},${countriesDownCount[property]}`);
+            log.info(`${property},${countriesDownCount[property]}`);
         }
         process.exit();
     });

package/scripts/analyzePostsForCommunity.js

@@ -179,7 +179,7 @@ async.series([
         });
     }
 ], function () {
-    console.log(csv);
+    log.info(csv);
     process.exit();
 });
 export {};

package/scripts/bulkStatusUpdates/listUpdates.js

@@ -5,10 +5,10 @@ var moment = require('moment');
 var id = process.argv[2];
 models.BulkStatusUpdate.findAll({}).then(function (bulkStatusUpdates) {
     _.forEach(bulkStatusUpdates, function (update) {
-        console.log("Update: " + update.id + " name: " + update.name);
+        log.info("Update: " + update.id + " name: " + update.name);
     });
     process.exit();
 }).catch(function (error) {
-    console.error(error);
+    log.error(error);
 });
 export {};

package/scripts/bulkStatusUpdates/mergeLatestPostsToUpdate.js

@@ -12,7 +12,7 @@ const getUpdatedPostsForGroup = (groupId) => {
             return updatedConfig.groups[i].posts;
         }
     }
-    console.error("Found no posts for group id: " + groupId);
+    log.error("Found no posts for group id: " + groupId);
     return [];
 };
 const hasPost = (updatePosts, post) => {
@@ -30,13 +30,13 @@ const getUpdatedPosts = (currentPosts, updatedPosts, currentGroupName) => {
             posts.push(currentPosts[i]);
         }
         else {
-            console.log(`Post removed from ${currentGroupName}: ${currentPosts[i].name}`);
+            log.info(`Post removed from ${currentGroupName}: ${currentPosts[i].name}`);
         }
     }
     for (let i = 0; i < updatedPosts.length; i++) {
         if (!hasPost(currentPosts, updatedPosts[i])) {
             posts.push(updatedPosts[i]);
-            console.log(`Post added to ${currentGroupName}: ${updatedPosts[i].name}`);
+            log.info(`Post added to ${currentGroupName}: ${updatedPosts[i].name}`);
         }
     }
     return posts;
@@ -102,9 +102,9 @@ async.series([
     },
 ], error => {
     if (error)
-        console.error();
+        log.error();
     else
-        console.log("Completed");
+        log.info("Completed");
     process.exit();
 });
 export {};

package/scripts/bulkStatusUpdates/performUpdate.js

@@ -8,7 +8,7 @@ var getTemplate = function (templates, title) {
     var returnTemplate;
     if (title) {
         _.forEach(templates, function (template) {
-            //  console.log(template);
+            //  log.info(template);
             if (title == template.title) {
                 returnTemplate = template;
             }
@@ -21,14 +21,14 @@ models.BulkStatusUpdate.findOne({
         id: id
     }
 }).then(function (update) {
-    console.log("Update: " + update.id + " name: " + update.name);
-    console.log(update.config);
-    console.log(update.templates);
+    log.info("Update: " + update.id + " name: " + update.name);
+    log.info(update.config);
+    log.info(update.templates);
     if (update.config.groups) {
         async.eachSeries(update.config.groups, function (group, groupCallback) {
             if (group.posts) {
                 async.eachSeries(group.posts, function (post, postCallback) {
-                    //            console.log("New status: "+post.newOfficialStatus+" template: "+post.selectedTemplateName+ " content: "+getTemplateContent(update.templates,post.selectedTemplateName));
+                    //            log.info("New status: "+post.newOfficialStatus+" template: "+post.selectedTemplateName+ " content: "+getTemplateContent(update.templates,post.selectedTemplateName));
                     if (post.newOfficialStatus) {
                         var template = getTemplate(update.templates, post.selectedTemplateName);
                         var templateContent = template ? template.content : null;
@@ -36,7 +36,7 @@ models.BulkStatusUpdate.findOne({
                             templateContent = post.uniqueStatusMessage;
                         }
                         if (templateContent) {
-                            console.log(post.id + ": " + templateContent);
+                            log.info(post.id + ": " + templateContent);
                             async.series([
                                 function (doCallback) {
                                     models.User.findOne({
@@ -104,13 +104,13 @@ models.BulkStatusUpdate.findOne({
             }
         }, function (error) {
             if (error) {
-                console.error(error);
+                log.error(error);
             }
-            console.log("Bulk status update has been applied.");
+            log.info("Bulk status update has been applied.");
             process.exit();
         });
     }
 }).catch(function (error) {
-    console.error(error);
+    log.error(error);
 });
 export {};

package/scripts/bulkStatusUpdates/performUpdateForGroup.cjs

@@ -3,6 +3,7 @@ var models = require('../../models/index.cjs');
 var async = require('async');
 var _ = require('lodash');
 var moment = require('moment');
+const log = require('../../utils/logger.cjs');
 var id = process.argv[2];
 var userIdToPostNewsStory = process.argv[3];
 var groupId = process.argv[4];
@@ -10,7 +11,7 @@ var getTemplate = function (templates, title) {
     var returnTemplate;
     if (title) {
         _.forEach(templates, function (template) {
-            //  console.log(template);
+            //  log.info(template);
             if (title == template.title) {
                 returnTemplate = template;
             }
@@ -23,15 +24,15 @@ models.BulkStatusUpdate.findOne({
         id: id
     }
 }).then(function (update) {
-    console.log("Update: " + update.id + " name: " + update.name);
-    console.log(update.config);
-    console.log(update.templates);
+    log.info("Update: " + update.id + " name: " + update.name);
+    log.info(update.config);
+    log.info(update.templates);
     if (update.config.groups) {
         async.eachSeries(update.config.groups, function (group, groupCallback) {
             if (group.id == groupId) {
                 if (group.posts) {
                     async.eachSeries(group.posts, function (post, postCallback) {
-                        //            console.log("New status: "+post.newOfficialStatus+" template: "+post.selectedTemplateName+ " content: "+getTemplateContent(update.templates,post.selectedTemplateName));
+                        //            log.info("New status: "+post.newOfficialStatus+" template: "+post.selectedTemplateName+ " content: "+getTemplateContent(update.templates,post.selectedTemplateName));
                         if (post.newOfficialStatus) {
                             var template = getTemplate(update.templates, post.selectedTemplateName);
                             var templateContent = template ? template.content : null;
@@ -39,7 +40,7 @@ models.BulkStatusUpdate.findOne({
                                 templateContent = post.uniqueStatusMessage;
                             }
                             if (templateContent) {
-                                console.log(post.id + ": " + templateContent);
+                                log.info(post.id + ": " + templateContent);
                                 async.series([
                                     function (doCallback) {
                                         models.User.findOne({
@@ -103,22 +104,22 @@ models.BulkStatusUpdate.findOne({
                     });
                 }
                 else {
-                    console.log("No posts group id: " + group.id);
+                    log.info("No posts group id: " + group.id);
                     groupCallback();
                 }
             }
             else {
-                console.log("Not performing group id: " + group.id);
+                log.info("Not performing group id: " + group.id);
                 groupCallback();
             }
         }, function (error) {
             if (error) {
-                console.error(error);
+                log.error(error);
             }
-            console.log("Bulk status update has been applied.");
+            log.info("Bulk status update has been applied.");
             process.exit();
         });
     }
 }).catch(function (error) {
-    console.error(error);
+    log.error(error);
 });