From 9b94a0b3344dd1b06b8af4f8c8d7a6ebe370fb9d Mon Sep 17 00:00:00 2001 From: Apher Date: Fri, 17 Jul 2026 04:23:14 +0000 Subject: [PATCH] Use mtf-module-db as submodule --- .gitmodules | 3 +++ src/{config/index.js => config.js} | 0 src/config/db.config.js | 14 ------------ src/config/redis.config.js | 4 ---- src/models/index.js | 34 ------------------------------ src/models/intent.model.js | 23 -------------------- src/modules/db | 1 + src/server.js | 7 +++--- 8 files changed, 7 insertions(+), 79 deletions(-) rename src/{config/index.js => config.js} (100%) delete mode 100644 src/config/db.config.js delete mode 100644 src/config/redis.config.js delete mode 100644 src/models/index.js delete mode 100644 src/models/intent.model.js create mode 160000 src/modules/db diff --git a/.gitmodules b/.gitmodules index 865507c..ccbc878 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "src/modules/redis"] path = src/modules/redis url = https://gitea.spilum.net/Spilum.Net/mtf-module-redis +[submodule "src/modules/db"] + path = src/modules/db + url = https://gitea.spilum.net/Spilum.Net/mtf-module-db diff --git a/src/config/index.js b/src/config.js similarity index 100% rename from src/config/index.js rename to src/config.js diff --git a/src/config/db.config.js b/src/config/db.config.js deleted file mode 100644 index 32b27fd..0000000 --- a/src/config/db.config.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = { - HOST: process.env.PG_HOST, - USER: process.env.PG_USER, - PASSWORD: process.env.PG_PASS, - DB: process.env.PG_DB, - PORT: process.env.PG_PORT, - dialect: "postgres", - pool: { - max: 5, - min: 0, - acquire: 30000, - idle: 10000 - } -} diff --git a/src/config/redis.config.js b/src/config/redis.config.js deleted file mode 100644 index 627c270..0000000 --- a/src/config/redis.config.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - REDIS_HOST: process.env.REDIS_HOST, - REDIS_PORT: process.env.REDIS_PORT -} diff --git a/src/models/index.js b/src/models/index.js deleted file mode 100644 index a94ec3c..0000000 --- a/src/models/index.js +++ /dev/null @@ -1,34 +0,0 @@ -const config = require("../config"); -const dbConfig = require("../config/db.config"); -const redisConfig = require("../config/redis.config"); - -const Sequelize = require("sequelize"); -const sequelize = new Sequelize( - dbConfig.DB, - dbConfig.USER, - dbConfig.PASSWORD, - { - host: dbConfig.HOST, - dialect: dbConfig.dialect, - port: dbConfig.PORT, - pool: { - max: dbConfig.pool.max, - min: dbConfig.pool.min, - aqcuire: dbConfig.pool.acquire, - idle: dbConfig.pool.idle - } - } -); - -// SQL Connection -const db = {}; - -db.Sequelize = Sequelize; -db.sequelize = sequelize; - -db.intent = require("./intent.model")(sequelize, Sequelize); - -module.exports = { - db -}; - diff --git a/src/models/intent.model.js b/src/models/intent.model.js deleted file mode 100644 index 507779b..0000000 --- a/src/models/intent.model.js +++ /dev/null @@ -1,23 +0,0 @@ -module.exports = (sequelize, DataTypes) => { - const Intent = sequelize.define("intents", { - id: { - type: DataTypes.INTEGER, - primaryKey: true, - autoIncrement: true, - allowNull: false - }, - name: { - type: DataTypes.STRING, - allowNull: false - }, - examples: { - type: DataTypes.ARRAY(DataTypes.STRING), - allowNull: true - } - }, { - tableName: "intents", - timestamps: false - }); - - return Intent; -}; \ No newline at end of file diff --git a/src/modules/db b/src/modules/db new file mode 160000 index 0000000..484c5bd --- /dev/null +++ b/src/modules/db @@ -0,0 +1 @@ +Subproject commit 484c5bd8e5a5c77ef2c6a20817205de99cbc77ce diff --git a/src/server.js b/src/server.js index 138c209..671f357 100644 --- a/src/server.js +++ b/src/server.js @@ -5,13 +5,14 @@ if (process.env.NODE_ENV !== "production") { const {env, pipeline} = require("@xenova/transformers"); -const models = require("./models"); -const db = models.db; +const {db} = require('./modules/db'); const {sequelize, Sequelize} = db; const Intent = db.intent; const {redis} = require('./modules/redis'); +const config = require("./config"); + async function getIntents() { try { const intents = await Intent.findAll(); @@ -24,8 +25,6 @@ async function getIntents() { } } -const config = require("./config"); - let extractor; function normalizeText(text) {