data-primals-engine 1.0.4 → 1.0.6

package/README.md

@@ -30,13 +30,16 @@
 
 ## ⚡ Quick Start
 
+```bash
+npm i data-primals-engine
+```
+or
 ```bash
 git clone https://your-repo/data-primals-engine.git
 cd data-primals-engine
 npm install
 ```
-
-Create a `.env` file:
+Possibly create a `.env` file:
 ```env
 MONGO_DB_URL=mongodb://127.0.0.1:27017
 ```
@@ -197,14 +200,15 @@ curl -X DELETE http://localhost:7633/api/data?_user=demo \
 ```
 data-primals-engine/
 ├── src/
-│   ├── engine.js
+│   ├── middlewares/
+│   ├── migrations/
 │   ├── modules/
-│   ├── providers/
-│   ├── constants.js
-│   ├── defaultModels.js
-├── config/
-│   ├── models/
-│   └── packs/
+│   ├── workers/
+│   ├── engine.js // The Express engine that serves the API
+│   ├── constants.js // The inner-application constants definitions
+│   ├── packs.js // The packs that will be loaded and available with installPack() method
+│   ├── defaultModels.js // The default models available to import
+│   ├── ...
 └── server.js
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-primals-engine",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "data-primals-engine is the package responsible from handling large amount of data in a practical and performant way. It can handle large amount of data in a practical and performant way. It can also get workflow models working (for automation), and fully supports internationalisation.",
   "main": "src/engine.js",
   "type": "module",
@@ -34,28 +34,37 @@
     "@langchain/openai": "^0.5.18",
     "archiver": "^7.0.1",
     "aws-sdk": "^2.1692.0",
+    "bcrypt": "^5.1.1",
     "body-parser": "^1.20.3",
     "chalk": "^5.4.1",
     "check-disk-space": "^3.4.0",
     "compression": "^1.8.0",
     "connect-mongo": "^5.1.0",
-    "connect-multiparty": "^2.2.0",
     "cookie-parser": "^1.4.7",
     "cronstrue": "^3.1.0",
     "csv-parse": "^5.6.0",
     "csv-parser": "^3.2.0",
+    "date-fns": "^4.1.0",
     "express": "^4.21.2",
     "express-csrf-double-submit-cookie": "^1.2.1",
+    "express-formidable": "^1.2.0",
+    "express-mongo-sanitize": "^2.2.0",
     "express-rate-limit": "^8.0.1",
     "express-session": "^1.18.1",
-    "express-sitemap-xml": "^3.1.0",
+    "i18next": "^24.2.2",
+    "i18next-browser-languagedetector": "^8.0.4",
     "juice": "^11.0.1",
     "mathjs": "^14.4.0",
     "mongodb": "^6.12.0",
+    "node-cache": "^5.1.2",
     "node-schedule": "^2.1.1",
     "nodemailer": "^6.10.0",
+    "openai": "^5.8.2",
     "randomcolor": "^0.6.2",
     "rate-limiter-flexible": "^5.0.5",
+    "react-helmet": "^6.1.0",
+    "react-i18next": "^15.4.1",
+    "react-markdown": "^10.1.0",
     "request-ip": "^3.3.0",
     "sanitize-html": "^2.17.0",
     "sirv": "^3.0.1",
@@ -64,16 +73,6 @@
     "tar-fs": "^3.0.8",
     "uniqid": "^5.4.0",
     "yaml": "^2.8.0",
-    "bcrypt": "^5.1.1",
-    "date-fns": "^4.1.0",
-    "express-mongo-sanitize": "^2.2.0",
-    "i18next": "^24.2.2",
-    "i18next-browser-languagedetector": "^8.0.4",
-    "node-cache": "^5.1.2",
-    "openai": "^5.8.2",
-    "react-helmet": "^6.1.0",
-    "react-i18next": "^15.4.1",
-    "react-markdown": "^10.1.0",
     "zlib": "^1.0.5"
   },
   "devDependencies": {

package/server.js

@@ -4,34 +4,8 @@
 
 //set ES modules to be loaded by the script
 import process from "node:process";
-import {Config} from "../data-primals-engine/src/config.js";
-import {Engine} from "../data-primals-engine/src/engine.js";
-import {BenchmarkTool, GameObject, Logger} from "../data-primals-engine/src/gameObject.js";
-import {
-    createModel, DATAS_API_TOKEN,
-    getModels, getResource,
-    searchData,
-    validateModelStructure
-} from "../data-primals-engine/src/modules/data.js";
-import {availableLangs, install, langs, maxBytesPerSecondThrottleFile} from "../data-primals-engine/src/constants.js";
-import fs from "node:fs";
-import {
-    event_on, getFileExtension,
-    shuffle,
-    uuidv4
-} from "../data-primals-engine/src/core.js";
-import {datasCollection, filesCollection, modelsCollection, packsCollection} from "../data-primals-engine/src/modules/mongodb.js";
-import {translations} from "../data-primals-engine/src/i18n.js";
-import {getFieldValueHash} from "../data-primals-engine/src/data.js";
-
-import swaggerUi from 'swagger-ui-express';
-
-import YAML from 'yaml';
-import util from "node:util";
-import path from "node:path";
-import { getAllPacks} from "../data-primals-engine/src/packs.js";
-import {middlewareAuthenticator, userInitiator} from "../data-primals-engine/src/modules/user.js";
-import {defaultModels} from "../data-primals-engine/src/defaultModels.js";
+import {Config, Engine, BenchmarkTool, GameObject, Logger} from "./src/index.js";
+
 Config.Set("modules", ["mongodb", "data", "file", "bucket", "workflow","user", "assistant", "swagger"])
 Config.Set("middlewares", []);
 

package/src/data.js

@@ -420,6 +420,7 @@ export const getFieldValueHash = (model, data) => {
  * @returns {string} - La chaîne de caractères représentant la donnée.
  */
 export const getDataAsString = (model, data, t, allModels, extended=false) => {
+
     // Cas de base : si le modèle ou les données sont manquants, on ne peut rien faire.
     if (!model || !data) {
         return '';
@@ -484,8 +485,14 @@ export const getDataAsString = (model, data, t, allModels, extended=false) => {
             return value.value; // Champs traduits
         }
 
-        const translatedValue = t(value, {defaultValue: value});
-        return translatedValue || value.toString();
+        if( typeof(value) === 'string' ) {
+            const translatedValue = t(value, {defaultValue: value});
+            return translatedValue || value.toString();
+        }
+        if( typeof(value) === 'object' ) {
+            return JSON.stringify(value, null, 2);
+        }
+        return value;
 
     }).filter(Boolean).join(', ');
 

package/src/email.js

@@ -1,4 +1,4 @@
-import { translations } from "../../data-primals-engine/src/i18n.js";
+import { translations } from "data-primals-engine/i18n";
 import process from "node:process";
 import nodemailer from "nodemailer";
 import juice from "juice";

package/src/engine.js

@@ -14,6 +14,7 @@ import requestIp from 'request-ip';
 import {createModel, getModels, installAllPacks, validateModelStructure} from "./modules/data.js";
 import {defaultModels} from "./defaultModels.js";
 import {DefaultUserProvider} from "./providers.js";
+import formidableMiddleware from 'express-formidable';
 
 // Constants
 const isProduction = process.env.NODE_ENV === 'production'
@@ -44,13 +45,12 @@ export const Engine = {
         app.set('port', process.env.PORT || 3000);
         app.set('engine', engine);
 
-        app.use(bodyParser.urlencoded({extended: true, limit: 4096 }))
-        app.use(bodyParser.json({ limit: maxDataSize }))
+        app.use(formidableMiddleware({
+            encoding: 'utf-8',
+            uploadDir: process.cwd()+'/uploads/tmp',
+            multiples: true, // req.files to be arrays of files
+        }));
         app.use(cookieParser(isProduction ? cookiesSecret : 'secret'));
-
-        var multipartMiddleware = multipart();
-        app.use(multipartMiddleware);
-
         app.use(requestIp.mw())
 
         engine.use = (...args) => {
@@ -124,7 +124,7 @@ export const Engine = {
 
             process.on('uncaughtException', function (exception) {
                 console.error(exception);
-                fs.appendFile('bugs.txt', JSON.stringify({ code: exception.code, message: exception.message, stack: exception.stack }), function (err) {
+                fs.appendFile('issues.txt', JSON.stringify({ code: exception.code, message: exception.message, stack: exception.stack }), function (err) {
                     if (err){
                         throw err;
                     }