@peopl-health/nexus 3.2.12 → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/config/mongoConfig.js +61 -0
- package/lib/core/NexusMessaging.js +2 -7
- package/lib/index.js +6 -1
- package/lib/models/interactionModel.js +9 -2
- package/lib/models/predictionMetricsModel.js +9 -2
- package/lib/models/qualityMessageModel.js +9 -2
- package/lib/storage/MongoStorage.js +4 -14
- package/package.json +1 -1
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
const mongoose = require('mongoose');
|
|
2
|
+
const { logger } = require('../utils/logger');
|
|
3
|
+
|
|
4
|
+
let connection = null;
|
|
5
|
+
const databases = new Map();
|
|
6
|
+
const modelDatabases = {};
|
|
7
|
+
|
|
8
|
+
function setModelDatabase(modelName, dbName) {
|
|
9
|
+
modelDatabases[modelName] = dbName;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
function setModelDatabases(mapping) {
|
|
13
|
+
Object.assign(modelDatabases, mapping);
|
|
14
|
+
logger.info('[mongoConfig] Model databases configured', { mapping });
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function getModelDatabase(modelName) {
|
|
18
|
+
return modelDatabases[modelName] || null;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
async function connect(uri = process.env.MONGODB_URI) {
|
|
22
|
+
if (connection || mongoose.connection.readyState === 1) {
|
|
23
|
+
connection = mongoose.connection;
|
|
24
|
+
return connection;
|
|
25
|
+
}
|
|
26
|
+
if (!uri) throw new Error('MongoDB URI required. Set MONGODB_URI or pass uri parameter.');
|
|
27
|
+
await mongoose.connect(uri);
|
|
28
|
+
connection = mongoose.connection;
|
|
29
|
+
logger.info('MongoDB connected');
|
|
30
|
+
return connection;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function getDb(dbName) {
|
|
34
|
+
if (!connection && mongoose.connection.readyState !== 1) throw new Error('MongoDB not connected');
|
|
35
|
+
connection = connection || mongoose.connection;
|
|
36
|
+
if (!dbName) return connection;
|
|
37
|
+
if (!databases.has(dbName)) {
|
|
38
|
+
databases.set(dbName, connection.useDb(dbName, { useCache: true }));
|
|
39
|
+
}
|
|
40
|
+
return databases.get(dbName);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
function getConnection() {
|
|
44
|
+
return connection || mongoose.connection;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
async function disconnect() {
|
|
48
|
+
if (mongoose.connection.readyState !== 0) await mongoose.disconnect();
|
|
49
|
+
databases.clear();
|
|
50
|
+
connection = null;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
module.exports = {
|
|
54
|
+
connect,
|
|
55
|
+
disconnect,
|
|
56
|
+
getDb,
|
|
57
|
+
getConnection,
|
|
58
|
+
setModelDatabase,
|
|
59
|
+
setModelDatabases,
|
|
60
|
+
getModelDatabase
|
|
61
|
+
};
|
|
@@ -8,7 +8,7 @@ const { hasPreprocessingHandler, invokePreprocessingHandler } = require('../serv
|
|
|
8
8
|
const { ensureThreadExists } = require('../helpers/threadHelper');
|
|
9
9
|
const { logger } = require('../utils/logger');
|
|
10
10
|
|
|
11
|
-
const
|
|
11
|
+
const { connect } = require('../config/mongoConfig');
|
|
12
12
|
const OpenAI = require('openai');
|
|
13
13
|
const EventEmitter = require('events');
|
|
14
14
|
|
|
@@ -60,13 +60,8 @@ class NexusMessaging {
|
|
|
60
60
|
* @param {string} mongoUri - MongoDB connection string
|
|
61
61
|
*/
|
|
62
62
|
async initializeMongoDB(mongoUri = process.env.MONGODB_URI) {
|
|
63
|
-
if (!mongoUri) {
|
|
64
|
-
throw new Error('MongoDB URI not provided. Please set MONGODB_URI environment variable or pass mongoUri parameter.');
|
|
65
|
-
}
|
|
66
|
-
|
|
67
63
|
try {
|
|
68
|
-
await
|
|
69
|
-
this.mongodb = mongoose.connection;
|
|
64
|
+
this.mongodb = await connect(mongoUri);
|
|
70
65
|
logger.info('MongoDB connected successfully');
|
|
71
66
|
} catch (error) {
|
|
72
67
|
logger.error('MongoDB connection failed', { error: error.message });
|
package/lib/index.js
CHANGED
|
@@ -28,6 +28,7 @@ const {
|
|
|
28
28
|
getRequestId
|
|
29
29
|
} = require('./middleware/requestId');
|
|
30
30
|
const { logger } = require('./utils/logger');
|
|
31
|
+
const { setModelDatabases, setModelDatabase, getModelDatabase } = require('./config/mongoConfig');
|
|
31
32
|
|
|
32
33
|
/**
|
|
33
34
|
* Main Nexus class that orchestrates all components
|
|
@@ -347,5 +348,9 @@ module.exports = {
|
|
|
347
348
|
// Request tracing
|
|
348
349
|
requestIdMiddleware,
|
|
349
350
|
getRequestId,
|
|
350
|
-
logger
|
|
351
|
+
logger,
|
|
352
|
+
// MongoDB config
|
|
353
|
+
setModelDatabases,
|
|
354
|
+
setModelDatabase,
|
|
355
|
+
getModelDatabase
|
|
351
356
|
};
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
const mongoose = require('mongoose');
|
|
2
2
|
const { INTERACTION_QUALITY_VALUES } = require('../config/interactionConfig');
|
|
3
|
+
const { getDb, getModelDatabase } = require('../config/mongoConfig');
|
|
4
|
+
const { logger } = require('../utils/logger');
|
|
3
5
|
|
|
4
6
|
const interactionSchema = new mongoose.Schema({
|
|
5
7
|
messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message', required: true }],
|
|
@@ -13,6 +15,11 @@ const interactionSchema = new mongoose.Schema({
|
|
|
13
15
|
description: { type: String, default: null }
|
|
14
16
|
}, { timestamps: true });
|
|
15
17
|
|
|
16
|
-
const
|
|
18
|
+
const getInteraction = () => {
|
|
19
|
+
const dbName = getModelDatabase('Interaction');
|
|
20
|
+
const db = dbName ? getDb(dbName) : mongoose;
|
|
21
|
+
logger.debug('[Interaction] Using database', { dbName: dbName || 'default' });
|
|
22
|
+
return db.models.Interaction || db.model('Interaction', interactionSchema);
|
|
23
|
+
};
|
|
17
24
|
|
|
18
|
-
module.exports = {
|
|
25
|
+
module.exports = { getInteraction, interactionSchema, get Interaction() { return getInteraction(); } };
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
const mongoose = require('mongoose');
|
|
2
|
+
const { getDb, getModelDatabase } = require('../config/mongoConfig');
|
|
3
|
+
const { logger } = require('../utils/logger');
|
|
2
4
|
|
|
3
5
|
const predictionMetricsSchema = new mongoose.Schema({
|
|
4
6
|
message_id: { type: String, required: true, index: true },
|
|
@@ -16,6 +18,11 @@ predictionMetricsSchema.index({ createdAt: -1 });
|
|
|
16
18
|
predictionMetricsSchema.index({ assistant_id: 1, createdAt: -1 });
|
|
17
19
|
predictionMetricsSchema.index({ numero: 1, createdAt: -1 });
|
|
18
20
|
|
|
19
|
-
const
|
|
21
|
+
const getPredictionMetrics = () => {
|
|
22
|
+
const dbName = getModelDatabase('PredictionMetrics');
|
|
23
|
+
const db = dbName ? getDb(dbName) : mongoose;
|
|
24
|
+
logger.debug('[PredictionMetrics] Using database', { dbName: dbName || 'default' });
|
|
25
|
+
return db.models.PredictionMetrics || db.model('PredictionMetrics', predictionMetricsSchema);
|
|
26
|
+
};
|
|
20
27
|
|
|
21
|
-
module.exports = {
|
|
28
|
+
module.exports = { getPredictionMetrics, predictionMetricsSchema, get PredictionMetrics() { return getPredictionMetrics(); } };
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
const mongoose = require('mongoose');
|
|
2
|
+
const { getDb, getModelDatabase } = require('../config/mongoConfig');
|
|
3
|
+
const { logger } = require('../utils/logger');
|
|
2
4
|
|
|
3
5
|
const qualityMessageSchema = new mongoose.Schema({
|
|
4
6
|
message_id: { type: mongoose.Schema.Types.ObjectId, ref: 'Message', required: true, index: true },
|
|
@@ -14,6 +16,11 @@ const qualityMessageSchema = new mongoose.Schema({
|
|
|
14
16
|
|
|
15
17
|
qualityMessageSchema.index({ message_id: 1, voter_username: 1 }, { unique: true });
|
|
16
18
|
|
|
17
|
-
const
|
|
19
|
+
const getQualityMessage = () => {
|
|
20
|
+
const dbName = getModelDatabase('QualityMessage');
|
|
21
|
+
const db = dbName ? getDb(dbName) : mongoose;
|
|
22
|
+
logger.debug('[QualityMessage] Using database', { dbName: dbName || 'default' });
|
|
23
|
+
return db.models.QualityMessage || db.model('QualityMessage', qualityMessageSchema);
|
|
24
|
+
};
|
|
18
25
|
|
|
19
|
-
module.exports = {
|
|
26
|
+
module.exports = { getQualityMessage, qualityMessageSchema, get QualityMessage() { return getQualityMessage(); } };
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const
|
|
1
|
+
const { connect: mongoConnect, disconnect: mongoDisconnect, getDb } = require('../config/mongoConfig');
|
|
2
2
|
const runtimeConfig = require('../config/runtimeConfig');
|
|
3
3
|
|
|
4
4
|
const { Message, insertMessage } = require('../models/messageModel');
|
|
@@ -33,15 +33,8 @@ class MongoStorage {
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
async connect() {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
useNewUrlParser: true,
|
|
39
|
-
useUnifiedTopology: true
|
|
40
|
-
});
|
|
41
|
-
logger.info('MongoDB connected successfully');
|
|
42
|
-
} catch (error) {
|
|
43
|
-
throw new Error(`MongoDB connection failed: ${error.message}`);
|
|
44
|
-
}
|
|
36
|
+
await mongoConnect(this.mongoUri);
|
|
37
|
+
if (this.dbName) this.db = getDb(this.dbName);
|
|
45
38
|
}
|
|
46
39
|
|
|
47
40
|
async saveMessage(messageData) {
|
|
@@ -222,10 +215,7 @@ class MongoStorage {
|
|
|
222
215
|
}
|
|
223
216
|
|
|
224
217
|
async disconnect() {
|
|
225
|
-
await
|
|
226
|
-
if (this.client) {
|
|
227
|
-
await this.client.close();
|
|
228
|
-
}
|
|
218
|
+
await mongoDisconnect();
|
|
229
219
|
}
|
|
230
220
|
}
|
|
231
221
|
|