@yrpri/api 9.0.110 → 9.0.112

package/agents/assistants/baseAssistant.d.ts

@@ -2,7 +2,7 @@ import { OpenAI } from "openai";
 import WebSocket from "ws";
 import ioredis from "ioredis";
 import { type ChatCompletionMessageParam } from "openai/resources/chat/completions";
-import { YpBaseChatBot } from "../../active-citizen/llms/baseChatBot.js";
+import { YpBaseChatBot } from "../../services/llms/baseChatBot.js";
 import { YpAgentProduct } from "../models/agentProduct.js";
 /**
  * Common modes that implementations might use

package/agents/assistants/baseAssistant.js

@@ -1,6 +1,6 @@
 import { OpenAI } from "openai";
 import { EventEmitter } from "events";
-import { YpBaseChatBot } from "../../active-citizen/llms/baseChatBot.js";
+import { YpBaseChatBot } from "../../services/llms/baseChatBot.js";
 import { YpAgentProduct } from "../models/agentProduct.js";
 import { YpSubscription } from "../models/subscription.js";
 import { YpSubscriptionPlan } from "../models/subscriptionPlan.js";

package/agents/assistants/modes/tools/baseTools.d.ts

@@ -1,4 +1,4 @@
-import { YpAgentAssistant } from "agents/assistants/agentAssistant.js";
+import { YpAgentAssistant } from "../../agentAssistant.js";
 export declare class BaseAssistantTools {
     protected assistant: YpAgentAssistant;
     constructor(assistant: YpAgentAssistant);

package/agents/assistants/modes/tools/models/agents.d.ts

@@ -1,5 +1,5 @@
 import { SubscriptionModels } from "./subscriptions.js";
-import { YpAgentAssistant } from "../../../../assistants/agentAssistant.js";
+import { YpAgentAssistant } from "../../../agentAssistant.js";
 export declare class AgentModels {
     subscriptionModels: SubscriptionModels;
     assistant: YpAgentAssistant;

package/agents/assistants/modes/tools/models/subscriptions.d.ts

@@ -1,4 +1,4 @@
-import { YpAgentAssistant } from "../../../../assistants/agentAssistant.js";
+import { YpAgentAssistant } from "../../../agentAssistant.js";
 export declare class SubscriptionModels {
     assistant: YpAgentAssistant;
     constructor(assistant: YpAgentAssistant);

package/agents/assistants/modes/tools/models/users.d.ts

@@ -1,4 +1,4 @@
-import { YpAgentAssistant } from "agents/assistants/agentAssistant.js";
+import { YpAgentAssistant } from "../../../agentAssistant.js";
 export declare class UserModels {
     assistant: YpAgentAssistant;
     constructor(assistant: YpAgentAssistant);

package/agents/assistants/voiceAssistant.d.ts

@@ -1,4 +1,4 @@
-import { YpBaseChatBot } from "../../active-citizen/llms/baseChatBot.js";
+import { YpBaseChatBot } from "../../services/llms/baseChatBot.js";
 import { YpBaseAssistant } from "./baseAssistant.js";
 import WebSocket from "ws";
 import ioredis from "ioredis";

package/agents/assistants/voiceAssistant.js

@@ -1,4 +1,4 @@
-import { YpBaseChatBot } from "../../active-citizen/llms/baseChatBot.js";
+import { YpBaseChatBot } from "../../services/llms/baseChatBot.js";
 import WebSocket from "ws";
 // Extend the base class with voice capabilities
 export class YpBaseChatBotWithVoice extends YpBaseChatBot {

package/agents/controllers/policySynthAgents.js

@@ -6,11 +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 models from "../../models/index.cjs";
 import { NewAiModelSetup } from "../managers/newAiModelSetup.js";
-const dbModels = models;
-const Group = dbModels.Group;
-const User = dbModels.User;
 export class PolicySynthAgentsController {
     constructor(wsClients) {
         this.path = "/api/agents";

package/agents/managers/emailInvitesManager.js

@@ -1,7 +1,7 @@
 // AgentNotificationEmailService.ts
 import models from "../../models/index.cjs";
 import { EmailTemplateRenderer } from "./emailTemplateRenderer.js";
-import queue from "../../active-citizen/workers/queue.cjs";
+import queue from "../../services/workers/queue.cjs";
 import { NotificationAgentQueueManager } from "./notificationAgentQueueManager.js";
 const dbModels = models;
 const Group = dbModels.Group;

package/agents/managers/newAiModelSetup.js

@@ -1,4 +1,4 @@
-import { sequelize as psSequelize } from "@policysynth/agents/dbModels/index.js";
+import { sequelize as psSequelize, User, } from "@policysynth/agents/dbModels/index.js";
 import { PsAiModel } from "@policysynth/agents/dbModels/aiModel.js";
 import { PsAgentClass } from "@policysynth/agents/dbModels/agentClass.js";
 import { PsAgentClassCategories } from "@policysynth/agents/agentCategories.js";
@@ -11,9 +11,6 @@ import { PsAgentConnector } from "@policysynth/agents/dbModels/agentConnector.js
 import { PsAgentConnectorClass } from "@policysynth/agents/dbModels/agentConnectorClass.js";
 import { PsAgentRegistry } from "@policysynth/agents/dbModels/agentRegistry.js";
 import { PsAiModelSize, PsAiModelType, } from "@policysynth/agents/aiModelTypes.js";
-import models from "../../models/index.cjs";
-const dbModels = models;
-const Group = dbModels.Group; // for reference elsewhere if needed
 // List of models that need to be initialized/associated
 const psModels = {
     PsAgentClass,
@@ -33,15 +30,15 @@ export class NewAiModelSetup {
      */
     static async initializeModels() {
         try {
+            if (process.env.FORCE_DB_SYNC || process.env.NODE_ENV === "development") {
+                await psSequelize.sync();
+            }
             console.log("All Models Loaded Init");
             for (const modelName of Object.keys(psModels)) {
                 if (typeof psModels[modelName].associate === "function") {
                     await psModels[modelName].associate(psSequelize.models);
                 }
             }
-            if (process.env.FORCE_DB_SYNC || process.env.NODE_ENV === "development") {
-                await psSequelize.sync();
-            }
             console.log("All models initialized successfully.");
         }
         catch (error) {
@@ -410,7 +407,7 @@ export class NewAiModelSetup {
                 costInTokensPerMillion: 2,
                 costOutTokensPerMillion: 8,
                 currency: "USD",
-                cacheCostInTokensPerMillion: 0.5
+                cacheCostInTokensPerMillion: 0.5,
             },
             maxTokensOut: 100000,
             defaultTemperature: 0.7,
@@ -587,7 +584,15 @@ export class NewAiModelSetup {
     static setupAiModels(userId) {
         setTimeout(async () => {
             console.log("Seeding AI models");
-            await NewAiModelSetup.seedAiModels(userId);
+            const user = await User.findOne({
+                attributes: ["id"],
+                where: { id: userId },
+            });
+            if (!user) {
+                console.error("User not found");
+                return;
+            }
+            await NewAiModelSetup.seedAiModels(user.id);
         }, 100);
     }
     /**

package/agents/managers/notificationAgentQueueManager.js

@@ -8,7 +8,7 @@ import { YpSubscriptionPlan } from "../models/subscriptionPlan.js";
 import { YpAgentProduct } from "../models/agentProduct.js";
 import { YpSubscription } from "../models/subscription.js";
 import { YpAgentProductBundle } from "../models/agentProductBundle.js";
-import queue from "../../active-citizen/workers/queue.cjs";
+import queue from "../../services/workers/queue.cjs";
 import { EmailTemplateRenderer } from "./emailTemplateRenderer.js";
 const dbModels = models;
 const Group = dbModels.Group;

package/app.js

@@ -22,10 +22,10 @@ if (process.env.NEW_RELIC_APP_NAME) {
 }
 import auth from "./authorization.cjs";
 import index from "./controllers/index.cjs";
-import news_feeds from "./active-citizen/controllers/news_feeds.cjs";
-import activities from "./active-citizen/controllers/activities.cjs";
-import notifications from "./active-citizen/controllers/notifications.cjs";
-import recommendations from "./active-citizen/controllers/recommendations.cjs";
+import news_feeds from "./services/controllers/news_feeds.cjs";
+import activities from "./services/controllers/activities.cjs";
+import notifications from "./services/controllers/notifications.cjs";
+import recommendations from "./services/controllers/recommendations.cjs";
 import posts from "./controllers/posts.cjs";
 import groups from "./controllers/groups.cjs";
 import communities from "./controllers/communities.cjs";

package/controllers/allOurIdeas.js

@@ -19,10 +19,10 @@ const defaultHeader = {
     ...defaultAuthHeader,
 };
 //import auth from "../authorization.js";
-import { AiHelper } from "../active-citizen/engine/allOurIdeas/aiHelper.js";
-import { ExplainAnswersAssistant } from "../active-citizen/engine/allOurIdeas/explainAnswersAssistant.js";
+import { AiHelper } from "../services/engine/allOurIdeas/aiHelper.js";
+import { ExplainAnswersAssistant } from "../services/engine/allOurIdeas/explainAnswersAssistant.js";
 import OpenAI from "openai";
-import queue from "../active-citizen/workers/queue.cjs";
+import queue from "../services/workers/queue.cjs";
 export class AllOurIdeasController {
     constructor(wsClients) {
         this.path = "/api/allOurIdeas";

package/controllers/audios.cjs

@@ -7,7 +7,7 @@ var multerMultipartResolver = multer({ dest: 'uploads/' }).single('file');
 var auth = require('../authorization.cjs');
 var log = require('../utils/logger.cjs');
 var toJson = require('../utils/to_json.cjs');
-var queue = require('../active-citizen/workers/queue.cjs');
+var queue = require('../services/workers/queue.cjs');
 router.get('/hasAudioUploadSupport', (req, res) => {
     res.send({
         hasAudioUploadSupport: (process.env.S3_AUDIO_UPLOAD_BUCKET != null &&

package/controllers/bulkStatusUpdates.cjs

@@ -7,7 +7,7 @@ var log = require('../utils/logger.cjs');
 var toJson = require('../utils/to_json.cjs');
 var _ = require('lodash');
 var async = require('async');
-var queue = require('../active-citizen/workers/queue.cjs');
+var queue = require('../services/workers/queue.cjs');
 var sendBulkStatusUpdateOrError = function (res, bulkStatusUpdate, context, user, error, errorStatus) {
     if (error || !bulkStatusUpdate) {
         if (errorStatus == 404) {

package/controllers/communities.cjs

@@ -8,10 +8,10 @@ var toJson = require("../utils/to_json.cjs");
 var _ = require("lodash");
 var async = require("async");
 var crypto = require("crypto");
-var queue = require("../active-citizen/workers/queue.cjs");
+var queue = require("../services/workers/queue.cjs");
 const { Op, literal } = require("sequelize");
-const getAllModeratedItemsByCommunity = require("../active-citizen/engine/moderation/get_moderation_items.cjs").getAllModeratedItemsByCommunity;
-const performSingleModerationAction = require("../active-citizen/engine/moderation/process_moderation_items.cjs").performSingleModerationAction;
+const getAllModeratedItemsByCommunity = require("../services/engine/moderation/get_moderation_items.cjs").getAllModeratedItemsByCommunity;
+const performSingleModerationAction = require("../services/engine/moderation/process_moderation_items.cjs").performSingleModerationAction;
 const getLoginsExportDataForCommunity = require("../utils/export_utils.cjs").getLoginsExportDataForCommunity;
 const getUsersForCommunity = require("../utils/export_utils.cjs").getUsersForCommunity;
 var sanitizeFilename = require("sanitize-filename");
@@ -22,20 +22,20 @@ const fs = require("fs");
 const readline = require("readline");
 const stream = require("stream");
 const { getMapForCommunity } = require("../utils/community_mapping_tools.cjs");
-const { getPlausibleStats, plausibleStatsProxy, } = require("../active-citizen/engine/analytics/plausible/manager.cjs");
-const { countAllModeratedItemsByCommunity, } = require("../active-citizen/engine/moderation/get_moderation_items.cjs");
+const { getPlausibleStats, plausibleStatsProxy, } = require("../services/engine/analytics/plausible/manager.cjs");
+const { countAllModeratedItemsByCommunity, } = require("../services/engine/moderation/get_moderation_items.cjs");
 const { isValidDbId } = require("../utils/is_valid_db_id.cjs");
 const { copyGroup, copyCommunity } = require("../utils/copy_utils.cjs");
 const { recountCommunity } = require("../utils/recount_utils.cjs");
-const getFromAnalyticsApi = require("../active-citizen/engine/analytics/manager.cjs").getFromAnalyticsApi;
-const triggerSimilaritiesTraining = require("../active-citizen/engine/analytics/manager.cjs").triggerSimilaritiesTraining;
-const sendBackAnalyticsResultsOrError = require("../active-citizen/engine/analytics/manager.cjs").sendBackAnalyticsResultsOrError;
-const countModelRowsByTimePeriod = require("../active-citizen/engine/analytics/statsCalc.cjs").countModelRowsByTimePeriod;
-const getCommunityIncludes = require("../active-citizen/engine/analytics/statsCalc.cjs").getCommunityIncludes;
-const getPointCommunityIncludes = require("../active-citizen/engine/analytics/statsCalc.cjs").getPointCommunityIncludes;
-const getParsedSimilaritiesContent = require("../active-citizen/engine/analytics/manager.cjs").getParsedSimilaritiesContent;
-const getTranslatedTextsForCommunity = require("../active-citizen/utils/translation_helpers.cjs").getTranslatedTextsForCommunity;
-const updateTranslationForCommunity = require("../active-citizen/utils/translation_helpers.cjs").updateTranslationForCommunity;
+const getFromAnalyticsApi = require("../services/engine/analytics/manager.cjs").getFromAnalyticsApi;
+const triggerSimilaritiesTraining = require("../services/engine/analytics/manager.cjs").triggerSimilaritiesTraining;
+const sendBackAnalyticsResultsOrError = require("../services/engine/analytics/manager.cjs").sendBackAnalyticsResultsOrError;
+const countModelRowsByTimePeriod = require("../services/engine/analytics/statsCalc.cjs").countModelRowsByTimePeriod;
+const getCommunityIncludes = require("../services/engine/analytics/statsCalc.cjs").getCommunityIncludes;
+const getPointCommunityIncludes = require("../services/engine/analytics/statsCalc.cjs").getPointCommunityIncludes;
+const getParsedSimilaritiesContent = require("../services/engine/analytics/manager.cjs").getParsedSimilaritiesContent;
+const getTranslatedTextsForCommunity = require("../services/utils/translation_helpers.cjs").getTranslatedTextsForCommunity;
+const updateTranslationForCommunity = require("../services/utils/translation_helpers.cjs").updateTranslationForCommunity;
 var sendCommunityOrError = function (res, community, context, user, error, errorStatus) {
     if (error || !community) {
         if (errorStatus === 404 ||

package/controllers/domains.cjs

@@ -7,22 +7,22 @@ var log = require('../utils/logger.cjs');
 var toJson = require('../utils/to_json.cjs');
 var _ = require('lodash');
 var async = require('async');
-var queue = require('../active-citizen/workers/queue.cjs');
-var performSingleModerationAction = require('../active-citizen/engine/moderation/process_moderation_items.cjs').performSingleModerationAction;
-const getAllModeratedItemsByDomain = require('../active-citizen/engine/moderation/get_moderation_items.cjs').getAllModeratedItemsByDomain;
+var queue = require('../services/workers/queue.cjs');
+var performSingleModerationAction = require('../services/engine/moderation/process_moderation_items.cjs').performSingleModerationAction;
+const getAllModeratedItemsByDomain = require('../services/engine/moderation/get_moderation_items.cjs').getAllModeratedItemsByDomain;
 const getLoginsExportDataForDomain = require('../utils/export_utils.cjs').getLoginsExportDataForDomain;
 var sanitizeFilename = require("sanitize-filename");
 var moment = require('moment');
-const { plausibleStatsProxy } = require("../active-citizen/engine/analytics/plausible/manager.cjs");
-const { countAllModeratedItemsByDomain } = require("../active-citizen/engine/moderation/get_moderation_items.cjs");
+const { plausibleStatsProxy } = require("../services/engine/analytics/plausible/manager.cjs");
+const { countAllModeratedItemsByDomain } = require("../services/engine/moderation/get_moderation_items.cjs");
 const { isValidDbId } = require("../utils/is_valid_db_id.cjs");
-const getFromAnalyticsApi = require('../active-citizen/engine/analytics/manager.cjs').getFromAnalyticsApi;
-const triggerSimilaritiesTraining = require('../active-citizen/engine/analytics/manager.cjs').triggerSimilaritiesTraining;
-const sendBackAnalyticsResultsOrError = require('../active-citizen/engine/analytics/manager.cjs').sendBackAnalyticsResultsOrError;
-const countModelRowsByTimePeriod = require('../active-citizen/engine/analytics/statsCalc.cjs').countModelRowsByTimePeriod;
-const getDomainIncludes = require('../active-citizen/engine/analytics/statsCalc.cjs').getDomainIncludes;
-const getPointDomainIncludes = require('../active-citizen/engine/analytics/statsCalc.cjs').getPointDomainIncludes;
-const getParsedSimilaritiesContent = require('../active-citizen/engine/analytics/manager.cjs').getParsedSimilaritiesContent;
+const getFromAnalyticsApi = require('../services/engine/analytics/manager.cjs').getFromAnalyticsApi;
+const triggerSimilaritiesTraining = require('../services/engine/analytics/manager.cjs').triggerSimilaritiesTraining;
+const sendBackAnalyticsResultsOrError = require('../services/engine/analytics/manager.cjs').sendBackAnalyticsResultsOrError;
+const countModelRowsByTimePeriod = require('../services/engine/analytics/statsCalc.cjs').countModelRowsByTimePeriod;
+const getDomainIncludes = require('../services/engine/analytics/statsCalc.cjs').getDomainIncludes;
+const getPointDomainIncludes = require('../services/engine/analytics/statsCalc.cjs').getPointDomainIncludes;
+const getParsedSimilaritiesContent = require('../services/engine/analytics/manager.cjs').getParsedSimilaritiesContent;
 const crypto = require('crypto');
 var sendDomainOrError = function (res, domain, context, user, error, errorStatus) {
     if (error || !domain) {

package/controllers/groups.cjs

@@ -18,26 +18,26 @@ const { v4: uuidv4 } = require("uuid");
 const { Op, literal } = require("sequelize");
 var moment = require("moment");
 var sanitizeFilename = require("sanitize-filename");
-var queue = require("../active-citizen/workers/queue.cjs");
-const getAllModeratedItemsByGroup = require("../active-citizen/engine/moderation/get_moderation_items.cjs").getAllModeratedItemsByGroup;
-const performSingleModerationAction = require("../active-citizen/engine/moderation/process_moderation_items.cjs").performSingleModerationAction;
+var queue = require("../services/workers/queue.cjs");
+const getAllModeratedItemsByGroup = require("../services/engine/moderation/get_moderation_items.cjs").getAllModeratedItemsByGroup;
+const performSingleModerationAction = require("../services/engine/moderation/process_moderation_items.cjs").performSingleModerationAction;
 const request = require("request");
-const { updateAnswerTranslation, } = require("../active-citizen/utils/translation_helpers.cjs");
-const { updateSurveyTranslation, } = require("../active-citizen/utils/translation_helpers.cjs");
-const { plausibleStatsProxy, getPlausibleStats, } = require("../active-citizen/engine/analytics/plausible/manager.cjs");
-const { countAllModeratedItemsByGroup, } = require("../active-citizen/engine/moderation/get_moderation_items.cjs");
+const { updateAnswerTranslation, } = require("../services/utils/translation_helpers.cjs");
+const { updateSurveyTranslation, } = require("../services/utils/translation_helpers.cjs");
+const { plausibleStatsProxy, getPlausibleStats, } = require("../services/engine/analytics/plausible/manager.cjs");
+const { countAllModeratedItemsByGroup, } = require("../services/engine/moderation/get_moderation_items.cjs");
 const { isValidDbId } = require("../utils/is_valid_db_id.cjs");
 const { Sequelize } = require("sequelize");
-const getFromAnalyticsApi = require("../active-citizen/engine/analytics/manager.cjs").getFromAnalyticsApi;
-const triggerSimilaritiesTraining = require("../active-citizen/engine/analytics/manager.cjs").triggerSimilaritiesTraining;
-const sendBackAnalyticsResultsOrError = require("../active-citizen/engine/analytics/manager.cjs").sendBackAnalyticsResultsOrError;
-const countModelRowsByTimePeriod = require("../active-citizen/engine/analytics/statsCalc.cjs").countModelRowsByTimePeriod;
-const getGroupIncludes = require("../active-citizen/engine/analytics/statsCalc.cjs").getGroupIncludes;
-const getPointGroupIncludes = require("../active-citizen/engine/analytics/statsCalc.cjs").getPointGroupIncludes;
-const getParsedSimilaritiesContent = require("../active-citizen/engine/analytics/manager.cjs").getParsedSimilaritiesContent;
-const getTranslatedTextsForGroup = require("../active-citizen/utils/translation_helpers.cjs").getTranslatedTextsForGroup;
-const updateTranslationForGroup = require("../active-citizen/utils/translation_helpers.cjs").updateTranslationForGroup;
-const convertDocxSurveyToJson = require("../active-citizen/engine/analytics/manager.cjs").convertDocxSurveyToJson;
+const getFromAnalyticsApi = require("../services/engine/analytics/manager.cjs").getFromAnalyticsApi;
+const triggerSimilaritiesTraining = require("../services/engine/analytics/manager.cjs").triggerSimilaritiesTraining;
+const sendBackAnalyticsResultsOrError = require("../services/engine/analytics/manager.cjs").sendBackAnalyticsResultsOrError;
+const countModelRowsByTimePeriod = require("../services/engine/analytics/statsCalc.cjs").countModelRowsByTimePeriod;
+const getGroupIncludes = require("../services/engine/analytics/statsCalc.cjs").getGroupIncludes;
+const getPointGroupIncludes = require("../services/engine/analytics/statsCalc.cjs").getPointGroupIncludes;
+const getParsedSimilaritiesContent = require("../services/engine/analytics/manager.cjs").getParsedSimilaritiesContent;
+const getTranslatedTextsForGroup = require("../services/utils/translation_helpers.cjs").getTranslatedTextsForGroup;
+const updateTranslationForGroup = require("../services/utils/translation_helpers.cjs").updateTranslationForGroup;
+const convertDocxSurveyToJson = require("../services/engine/analytics/manager.cjs").convertDocxSurveyToJson;
 const copyGroup = require("../utils/copy_utils.cjs").copyGroup;
 var s3 = new aws.S3({
     secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,

package/controllers/images.cjs

@@ -9,7 +9,7 @@ var log = require("../utils/logger.cjs");
 var toJson = require("../utils/to_json.cjs");
 const s3Storage = require("multer-sharp-s3");
 const crypto = require("crypto");
-var queue = require("../active-citizen/workers/queue.cjs");
+var queue = require("../services/workers/queue.cjs");
 const aws = require("aws-sdk");
 aws.config.update({
     secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,

package/controllers/points.cjs

@@ -8,7 +8,7 @@ var toJson = require("../utils/to_json.cjs");
 var async = require("async");
 const ogs = require("open-graph-scraper");
 var _ = require("lodash");
-var queue = require("../active-citizen/workers/queue.cjs");
+var queue = require("../services/workers/queue.cjs");
 var changePointCounter = function (pointId, column, upDown, next) {
     models.Point.findOne({
         where: { id: pointId },

package/controllers/posts.cjs

@@ -7,10 +7,10 @@ var log = require("../utils/logger.cjs");
 var toJson = require("../utils/to_json.cjs");
 var async = require("async");
 var _ = require("lodash");
-var queue = require("../active-citizen/workers/queue.cjs");
-const getAnonymousUser = require("../active-citizen/utils/get_anonymous_system_user.cjs");
+var queue = require("../services/workers/queue.cjs");
+const getAnonymousUser = require("../services/utils/get_anonymous_system_user.cjs");
 const moment = require("moment");
-const { plausibleStatsProxy, } = require("../active-citizen/engine/analytics/plausible/manager.cjs");
+const { plausibleStatsProxy, } = require("../services/engine/analytics/plausible/manager.cjs");
 const { isValidDbId } = require("../utils/is_valid_db_id.cjs");
 var changePostCounter = function (req, postId, column, upDown, next) {
     models.Post.findOne({

package/controllers/ratings.cjs

@@ -7,7 +7,7 @@ var log = require('../utils/logger.cjs');
 var toJson = require('../utils/to_json.cjs');
 var async = require('async');
 var _ = require('lodash');
-var queue = require('../active-citizen/workers/queue.cjs');
+var queue = require('../services/workers/queue.cjs');
 const moment = require('moment');
 router.post('/:post_id/:type_index', auth.can('rate post'), function (req, res) {
     var post;

package/controllers/users.cjs

@@ -9,12 +9,12 @@ var auth = require('../authorization.cjs');
 var log = require('../utils/logger.cjs');
 var toJson = require('../utils/to_json.cjs');
 var _ = require('lodash');
-var queue = require('../active-citizen/workers/queue.cjs');
+var queue = require('../services/workers/queue.cjs');
 const url = require('url');
 const randomstring = require('randomstring');
-const { sendPlausibleFavicon } = require("../active-citizen/engine/analytics/plausible/manager.cjs");
-var getAllModeratedItemsByUser = require('../active-citizen/engine/moderation/get_moderation_items.cjs').getAllModeratedItemsByUser;
-const performSingleModerationAction = require('../active-citizen/engine/moderation/process_moderation_items.cjs').performSingleModerationAction;
+const { sendPlausibleFavicon } = require("../services/engine/analytics/plausible/manager.cjs");
+var getAllModeratedItemsByUser = require('../services/engine/moderation/get_moderation_items.cjs').getAllModeratedItemsByUser;
+const performSingleModerationAction = require('../services/engine/moderation/process_moderation_items.cjs').performSingleModerationAction;
 const logoutFromSession = (req, res, statusCode = 200) => {
     if (req.session) {
         req.session.destroy((err) => {

package/controllers/videos.cjs

@@ -7,7 +7,7 @@ var multerMultipartResolver = multer({ dest: "uploads/" }).single("file");
 var auth = require("../authorization.cjs");
 var log = require("../utils/logger.cjs");
 var toJson = require("../utils/to_json.cjs");
-var queue = require("../active-citizen/workers/queue.cjs");
+var queue = require("../services/workers/queue.cjs");
 const _ = require("lodash");
 router.get("/hasVideoUploadSupport", (req, res) => {
     res.send({

package/deleteUnwantedDeclerations.cjs

@@ -5,15 +5,15 @@ const tsOutDir = './ts-out';
 const keepDeclarations = new Set([
     "app.d.ts",
     "server.d.ts",
-    path.join("active-citizen", "llms", "baseChatBot.d.ts"),
-    path.join("active-citizen", "llms", "llmTranslation.d.ts"),
-    path.join("active-citizen", "engine", "allOurIdeas", "aiHelper.d.ts"),
-    path.join("active-citizen", "engine", "allOurIdeas", "iconGenerator.d.ts"),
-    path.join("active-citizen", "engine", "allOurIdeas", "explainAnswerAssistant.d.ts"),
+    path.join("services", "llms", "baseChatBot.d.ts"),
+    path.join("services", "llms", "llmTranslation.d.ts"),
+    path.join("services", "engine", "allOurIdeas", "aiHelper.d.ts"),
+    path.join("services", "engine", "allOurIdeas", "iconGenerator.d.ts"),
+    path.join("services", "engine", "allOurIdeas", "explainAnswerAssistant.d.ts"),
     path.join("utils", "loggerTs.d.ts"),
     path.join("utils", "ypLanguages.d.ts"),
-    path.join("active-citizen", "utils", "updateAllLocalesFromEn.d.ts"),
-    path.join("active-citizen", "utils", "updateLocaleFolders.d.ts"),
+    path.join("services", "utils", "updateAllLocalesFromEn.d.ts"),
+    path.join("services", "utils", "updateLocaleFolders.d.ts"),
 ]);
 // Function to delete files recursively in a directory
 function deleteDtsFiles(dir) {

package/models/audio.cjs

@@ -2,7 +2,7 @@
 const log = require('../utils/logger.cjs');
 const aws = require('aws-sdk');
 const _ = require('lodash');
-const queue = require('../active-citizen/workers/queue.cjs');
+const queue = require('../services/workers/queue.cjs');
 let bullAudioQueue;
 if (process.env.USE_YOUR_PRIORITIES_ENCODER) {
     const Queue = require('bull');

package/models/campaign.cjs

@@ -1,5 +1,5 @@
 "use strict";
-const queue = require("../active-citizen/workers/queue.cjs");
+const queue = require("../services/workers/queue.cjs");
 module.exports = (sequelize, DataTypes) => {
     const Campaign = sequelize.define("Campaign", {
         configuration: DataTypes.JSONB,

package/models/community.cjs

@@ -3,7 +3,7 @@ const async = require("async");
 const log = require('../utils/logger.cjs');
 const toJson = require('../utils/to_json.cjs');
 const parseDomain = require('../utils/parse_domain.cjs');
-const queue = require('../active-citizen/workers/queue.cjs');
+const queue = require('../services/workers/queue.cjs');
 const _ = require("lodash");
 module.exports = (sequelize, DataTypes) => {
     const Community = sequelize.define("Community", {

package/models/domain.cjs

@@ -3,7 +3,7 @@ const async = require("async");
 const log = require("../utils/logger.cjs");
 const toJson = require("../utils/to_json.cjs");
 const parseDomain = require("../utils/parse_domain.cjs");
-var queue = require("../active-citizen/workers/queue.cjs");
+var queue = require("../services/workers/queue.cjs");
 const Community = require("./community.cjs");
 const checkValidKeys = (keys) => {
     return (keys.client_id &&

package/models/group.cjs

@@ -1,6 +1,6 @@
 "use strict";
 const async = require("async");
-const queue = require("../active-citizen/workers/queue.cjs");
+const queue = require("../services/workers/queue.cjs");
 const _ = require("lodash");
 const log = require("../utils/logger.cjs");
 module.exports = (sequelize, DataTypes) => {

package/models/image.cjs

@@ -291,7 +291,7 @@ module.exports = (sequelize, DataTypes) => {
             if (removed) {
                 image.deleted = true;
                 await image.save();
-                import("../active-citizen/llms/imageGeneration/collectionImageGenerator.js").then(async ({ CollectionImageGenerator }) => {
+                import("../services/llms/imageGeneration/collectionImageGenerator.js").then(async ({ CollectionImageGenerator }) => {
                     try {
                         const mediaManager = new CollectionImageGenerator();
                         await mediaManager.deleteMediaFormatsUrls(image.formats ? JSON.parse(image.formats) : []);

package/models/index.cjs

@@ -158,7 +158,7 @@ fs.readdirSync(__dirname)
     db[model.name] = model;
 });
 // Read from active citizen,
-const acDirname = __dirname + "/../active-citizen/models";
+const acDirname = __dirname + "/../services/models";
 fs.readdirSync(acDirname)
     .filter((file) => {
     return file.indexOf(".") !== 0 && file.endsWith(".cjs") && !file.endsWith(".d.cjs") && !file.endsWith(".d.cts");

package/models/index.d.cts

@@ -1,3 +1,2 @@
-export let sequelize: any;
-import { Sequelize } from "sequelize/lib/sequelize";
-export { Sequelize };
+export = db;
+declare const db: typeof import("models/index.cjs");

package/models/point.cjs

@@ -1,6 +1,6 @@
 "use strict";
 const async = require('async');
-const queue = require('../active-citizen/workers/queue.cjs');
+const queue = require('../services/workers/queue.cjs');
 const log = require('../utils/logger.cjs');
 const _ = require("lodash");
 const findCommunityAndDomainForPointFromGroup = (sequelize, options, callback) => {

package/models/post.cjs

@@ -1,6 +1,6 @@
 "use strict";
 const async = require("async");
-const queue = require('../active-citizen/workers/queue.cjs');
+const queue = require('../services/workers/queue.cjs');
 const log = require('../utils/logger.cjs');
 const _ = require('lodash');
 module.exports = (sequelize, DataTypes) => {

package/models/video.cjs

@@ -3,7 +3,7 @@ const async = require("async");
 const log = require("../utils/logger.cjs");
 const aws = require("aws-sdk");
 const _ = require("lodash");
-const queue = require("../active-citizen/workers/queue.cjs");
+const queue = require("../services/workers/queue.cjs");
 let bullVideoQueue;
 if (process.env.USE_YOUR_PRIORITIES_ENCODER) {
     const Queue = require("bull");
@@ -821,7 +821,7 @@ module.exports = (sequelize, DataTypes) => {
                 if (removed) {
                     video.deleted = true;
                     await video.save();
-                    import("../active-citizen/llms/imageGeneration/collectionImageGenerator.js").then(async ({ CollectionImageGenerator }) => {
+                    import("../services/llms/imageGeneration/collectionImageGenerator.js").then(async ({ CollectionImageGenerator }) => {
                         try {
                             const mediaManager = new CollectionImageGenerator();
                             let formats = video.formats;