@budibase/worker 3.9.0 → 3.9.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.9.0",
+  "version": "3.9.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -50,7 +50,7 @@
     "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
     "bull": "4.10.1",
-    "dd-trace": "5.43.0",
+    "dd-trace": "5.47.0",
     "dotenv": "8.6.0",
     "email-validator": "^2.0.4",
     "global-agent": "3.0.0",
@@ -120,5 +120,5 @@
       }
     }
   },
-  "gitHead": "95c435b13653118e54fda8777460839d3ca144ef"
+  "gitHead": "f9927b35b3939f1b96eb911d820ba5b06f288cd6"
 }

package/src/api/controllers/global/self.ts

@@ -8,7 +8,7 @@ import {
   auth as authCore,
 } from "@budibase/backend-core"
 import env from "../../../environment"
-import { groups } from "@budibase/pro"
+import { ai, groups } from "@budibase/pro"
 import {
   DevInfo,
   FetchAPIKeyResponse,
@@ -115,11 +115,20 @@ export async function getSelf(ctx: UserCtx<void, GetGlobalSelfResponse>) {
 
   // add the feature flags for this tenant
   const flags = await features.flags.fetch()
+  const llmConfig = await ai.getLLMConfig()
+  const sanitisedLLMConfig = llmConfig
+    ? {
+        provider: llmConfig.provider,
+        model: llmConfig.model,
+        measureUsage: llmConfig.measureUsage,
+      }
+    : undefined
 
   ctx.body = {
     ...enrichedUser,
     ...sessionAttributes,
     flags,
+    llm: sanitisedLLMConfig,
   }
 }
 

package/src/api/routes/global/tests/scim.spec.ts

@@ -648,7 +648,7 @@ describe("scim", () => {
           budibaseUserId: user.id,
           email: user.emails![0].value,
         }
-        mocks.accounts.getAccount.mockResolvedValue(account)
+        mocks.accounts.getAccountByTenantId.mockResolvedValue(account)
 
         await deleteScimUser(user.id, {
           expect: {

package/src/api/routes/global/tests/users.spec.ts

@@ -284,7 +284,7 @@ describe("/api/global/users", () => {
 
     it("should not be able to create user with the same email as an account", async () => {
       const user = structures.users.user()
-      const account = structures.accounts.cloudAccount()
+      const account = structures.accounts.accountDetail()
       accounts.getAccount.mockReturnValueOnce(Promise.resolve(account))
 
       const response = await config.api.users.saveUser(user, 400)
@@ -743,7 +743,9 @@ describe("/api/global/users", () => {
     it("should not be able to destroy account owner", async () => {
       const user = await config.createUser()
       const account = structures.accounts.cloudAccount()
-      accounts.getAccount.mockReturnValueOnce(Promise.resolve(account))
+      accounts.getAccountByTenantId.mockReturnValueOnce(
+        Promise.resolve(account)
+      )
 
       const response = await config.api.users.deleteUser(user._id!, 400)
 
@@ -754,7 +756,9 @@ describe("/api/global/users", () => {
       const user = await config.user!
       const account = structures.accounts.cloudAccount()
       account.email = user.email
-      accounts.getAccount.mockReturnValueOnce(Promise.resolve(account))
+      accounts.getAccountByTenantId.mockReturnValueOnce(
+        Promise.resolve(account)
+      )
 
       const response = await config.api.users.deleteUser(user._id!, 400)