Merge pull request #7132 from FlowFuse/move-expert-to-ee

Move expert to ee

Author: Steve-Mcl

forge/expert/index.js forge/ee/lib/expert/index.jsforge/expert/index.js renamed to forge/ee/lib/expert/index.js

@@ -34,6 +34,22 @@ module.exports = fp(async function (app, opts) {
         app.config.features.register('ffNodes', true, true)
         app.config.features.register('rbacApplication', true, true)
         require('./autoUpdateStacks').init(app)
+
+        // Expert
+        await app.register(require('./expert'))
+
+        // Set the Generate Snapshot Description Feature Flag
+        app.config.features.register('generatedSnapshotDescription', true, true)
+
+        // Set the assistant inline completions Feature Flag
+        app.config.features.register('assistantInlineCompletions', true, true)
+
+        // Set the expert assistant Feature Flag
+        app.config.features.register('expertAssistant', app.config?.expert?.enabled ?? false, true)
+
+        // temporary until FF Expert Insights can be enabled on Self Hosted EE instance
+        const isInsightsEnabled = app.config?.expert?.enabled && app.config?.expert?.insights?.enabled
+        app.config.features.register('expertInsights', isInsightsEnabled ?? false, false)
     }
 
     // Set the Team Library Feature Flag
@@ -53,17 +69,4 @@ module.exports = fp(async function (app, opts) {
 
     // Set the Editor Limits Feature Flag
     app.config.features.register('editorLimits', true, true)
-
-    // Set the Editor Limits Feature Flag
-    app.config.features.register('generatedSnapshotDescription', true, true)
-
-    // Set the assistant inline completions Feature Flag
-    app.config.features.register('assistantInlineCompletions', true, true)
-
-    // Set the expert assistant Feature Flag
-    app.config.features.register('expertAssistant', app.config?.expert?.enabled ?? false, true)
-
-    // temporary until FF Expert Insights can be enabled on Self Hosted EE instance
-    const isInsightsEnabled = app.config?.expert?.enabled && app.config?.expert?.insights?.enabled
-    app.config.features.register('expertInsights', isInsightsEnabled ?? false, false)
 }, { name: 'app.ee.lib' })

forge/ee/lib/index.js

@@ -9,7 +9,7 @@
 const { default: axios } = require('axios')
 const { v4: uuidv4 } = require('uuid')
 
-const { filterAccessibleMCPServerFeatures } = require('../../services/expert.js')
+const { filterAccessibleMCPServerFeatures } = require('../../../services/expert.js')
 
 /**
  * @param {import('../../forge.js').ForgeApplication} app

forge/routes/api/expert.js forge/ee/routes/expert/index.jsforge/routes/api/expert.js renamed to forge/ee/routes/expert/index.js

@@ -41,6 +41,7 @@ module.exports = async function (app) {
         }
         await app.register(require('./mcp'), { prefix: '/api/v1/teams/:teamId/mcp', logLevel: app.config.logging.http })
         await app.register(require('./autoUpdateStacks'), { prefix: '/api/v1/projects/:projectId/autoUpdateStack', logLevel: app.config.logging.http })
+        await app.register(require('./expert'), { prefix: '/api/v1/expert', logLevel: app.config.logging.http })
 
         // Important: keep SSO last to avoid its error handling polluting other routes.
         await app.register(require('./sso'), { logLevel: app.config.logging.http })

forge/ee/routes/index.js

@@ -11,7 +11,6 @@ const config = require('./config') // eslint-disable-line n/no-unpublished-requi
 const containers = require('./containers')
 const db = require('./db')
 const ee = require('./ee')
-const expert = require('./expert')
 const housekeeper = require('./housekeeper')
 const { generatePassword } = require('./lib/userTeam')
 const license = require('./licensing')
@@ -254,8 +253,6 @@ module.exports = async (options = {}) => {
         await server.register(auditLog)
         // Housekeeper
         await server.register(housekeeper)
-        // Expert
-        await server.register(expert)
 
         // HTTP Server configuration
         if (!server.settings.get('cookieSecret')) {

forge/forge.js

@@ -9,7 +9,6 @@ const Admin = require('./admin.js')
 const Application = require('./application.js')
 const Assistant = require('./assistant.js')
 const Device = require('./device.js')
-const Expert = require('./expert.js')
 const Project = require('./project.js')
 const ProjectType = require('./projectType.js')
 const Search = require('./search.js')
@@ -38,7 +37,6 @@ module.exports = async function (app) {
     app.register(ProjectType, { prefix: '/project-types' })
     app.register(Snapshot, { prefix: '/snapshots' })
     app.register(Assistant, { prefix: '/assistant' })
-    app.register(Expert, { prefix: '/expert' })
     app.register(Search, { prefix: '/search' })
     app.get('*', function (request, reply) {
         reply.code(404).send({ code: 'not_found', error: 'Not Found' })

forge/routes/api/index.js

@@ -3,11 +3,11 @@ const { default: axios } = require('axios')
 const should = require('should') // eslint-disable-line
 const sinon = require('sinon')
 
-const { sha256 } = require('../../../../../forge/db/utils.js')
-const { Roles } = require('../../../../../forge/lib/roles.js')
+const { sha256 } = require('../../../../../../forge/db/utils.js')
+const { Roles } = require('../../../../../../forge/lib/roles.js')
 // eslint-disable-next-line no-unused-vars
-const TestModelFactory = require('../../../../lib/TestModelFactory')
-const setup = require('../setup')
+const TestModelFactory = require('../../../../../lib/TestModelFactory.js')
+const setup = require('../../../routes/setup.js')
 
 describe('Expert API', function () {
     async function setupApp (config = {}) {