From 0440b29ebf684b99a78aac6215bde87c8d910ef4 Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:29:08 +0100 Subject: [PATCH] Chore: Bump `@grafana/experimental` from 1.7.4 to 1.7.5 (#80074) * For LLM, replace enabled() with health() * For LLM, replace enabled() with health() * Update experimental in azueremonitor and testdata plugins --- package.json | 2 +- .../dashboard/components/GenAI/utils.test.ts | 10 +- .../dashboard/components/GenAI/utils.ts | 2 +- .../datasource/azuremonitor/package.json | 2 +- .../grafana-testdata-datasource/package.json | 2 +- .../components/promQail/state/helpers.test.ts | 16 +-- .../components/promQail/state/helpers.ts | 4 +- yarn.lock | 110 ++++++++++++++++-- 8 files changed, 121 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 5be8c35bc18..4227473f8e4 100644 --- a/package.json +++ b/package.json @@ -249,7 +249,7 @@ "@grafana/aws-sdk": "0.3.1", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/experimental": "1.7.4", + "@grafana/experimental": "1.7.5", "@grafana/faro-core": "^1.3.5", "@grafana/faro-web-sdk": "^1.3.5", "@grafana/flamegraph": "workspace:*", diff --git a/public/app/features/dashboard/components/GenAI/utils.test.ts b/public/app/features/dashboard/components/GenAI/utils.test.ts index 1f35a51d279..48d6dfafc08 100644 --- a/public/app/features/dashboard/components/GenAI/utils.test.ts +++ b/public/app/features/dashboard/components/GenAI/utils.test.ts @@ -11,7 +11,7 @@ jest.mock('@grafana/experimental', () => ({ openai: { streamChatCompletions: jest.fn(), accumulateContent: jest.fn(), - enabled: jest.fn(), + health: jest.fn(), }, }, })); @@ -89,8 +89,8 @@ describe('getDashboardChanges', () => { describe('isLLMPluginEnabled', () => { it('should return true if LLM plugin is enabled', async () => { - // Mock llms.openai.enabled to return true - jest.mocked(llms.openai.enabled).mockResolvedValue({ ok: true, configured: false }); + // Mock llms.openai.health to return true + jest.mocked(llms.openai.health).mockResolvedValue({ ok: true, configured: false }); const enabled = await isLLMPluginEnabled(); @@ -98,8 +98,8 @@ describe('isLLMPluginEnabled', () => { }); it('should return false if LLM plugin is not enabled', async () => { - // Mock llms.openai.enabled to return false - jest.mocked(llms.openai.enabled).mockResolvedValue({ ok: false, configured: false }); + // Mock llms.openai.health to return false + jest.mocked(llms.openai.health).mockResolvedValue({ ok: false, configured: false }); const enabled = await isLLMPluginEnabled(); diff --git a/public/app/features/dashboard/components/GenAI/utils.ts b/public/app/features/dashboard/components/GenAI/utils.ts index 3304a63029e..46922361777 100644 --- a/public/app/features/dashboard/components/GenAI/utils.ts +++ b/public/app/features/dashboard/components/GenAI/utils.ts @@ -62,7 +62,7 @@ export function getDashboardChanges(dashboard: DashboardModel): { export async function isLLMPluginEnabled() { // Check if the LLM plugin is enabled. // If not, we won't be able to make requests, so return early. - return llms.openai.enabled().then((response) => response.ok); + return llms.openai.health().then((response) => response.ok); } /** diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index 76274b41914..3d46842f466 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "10.3.0-pre", - "@grafana/experimental": "1.7.4", + "@grafana/experimental": "1.7.5", "@grafana/runtime": "10.3.0-pre", "@grafana/schema": "10.3.0-pre", "@grafana/ui": "10.3.0-pre", diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json index 08f0bd0668a..2644ec28042 100644 --- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json +++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "10.3.0-pre", - "@grafana/experimental": "1.7.0", + "@grafana/experimental": "1.7.5", "@grafana/runtime": "10.3.0-pre", "@grafana/schema": "10.3.0-pre", "@grafana/ui": "10.3.0-pre", diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.test.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.test.ts index 7df017988b4..323848bebdc 100644 --- a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.test.ts +++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.test.ts @@ -6,18 +6,18 @@ import { guessMetricType, isLLMPluginEnabled } from './helpers'; jest.mock('@grafana/experimental', () => ({ llms: { openai: { - enabled: jest.fn(), + health: jest.fn(), }, vector: { - enabled: jest.fn(), + health: jest.fn(), }, }, })); describe('isLLMPluginEnabled', () => { it('should return true if LLM plugin is enabled', async () => { - jest.mocked(llms.openai.enabled).mockResolvedValue({ ok: true, configured: true }); - jest.mocked(llms.vector.enabled).mockResolvedValue({ ok: true, enabled: true }); + jest.mocked(llms.openai.health).mockResolvedValue({ ok: true, configured: true }); + jest.mocked(llms.vector.health).mockResolvedValue({ ok: true, enabled: true }); const enabled = await isLLMPluginEnabled(); @@ -25,8 +25,8 @@ describe('isLLMPluginEnabled', () => { }); it('should return false if LLM plugin is not enabled', async () => { - jest.mocked(llms.openai.enabled).mockResolvedValue({ ok: false, configured: false }); - jest.mocked(llms.vector.enabled).mockResolvedValue({ ok: false, enabled: false }); + jest.mocked(llms.openai.health).mockResolvedValue({ ok: false, configured: false }); + jest.mocked(llms.vector.health).mockResolvedValue({ ok: false, enabled: false }); const enabled = await isLLMPluginEnabled(); @@ -34,8 +34,8 @@ describe('isLLMPluginEnabled', () => { }); it('should return false if LLM plugin is enabled but health check fails', async () => { - jest.mocked(llms.openai.enabled).mockResolvedValue({ ok: false, configured: true }); - jest.mocked(llms.vector.enabled).mockResolvedValue({ ok: false, enabled: true }); + jest.mocked(llms.openai.health).mockResolvedValue({ ok: false, configured: true }); + jest.mocked(llms.vector.health).mockResolvedValue({ ok: false, enabled: true }); const enabled = await isLLMPluginEnabled(); diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.ts b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.ts index dd430cf85e2..fbda564f243 100644 --- a/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.ts +++ b/public/app/plugins/datasource/prometheus/querybuilder/components/promQail/state/helpers.ts @@ -274,8 +274,8 @@ function guessMetricFamily(metric: string): string { export async function isLLMPluginEnabled(): Promise { // Check if the LLM plugin is enabled. // If not, we won't be able to make requests, so return early. - const openaiEnabled = llms.openai.enabled().then((response) => response.ok); - const vectorEnabled = llms.vector.enabled().then((response) => response.ok); + const openaiEnabled = llms.openai.health().then((response) => response.ok); + const vectorEnabled = llms.vector.health().then((response) => response.ok); // combine 2 promises return Promise.all([openaiEnabled, vectorEnabled]).then((results) => { return results.every((result) => result); diff --git a/yarn.lock b/yarn.lock index 39548f8434c..b2dd9bedef4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2879,7 +2879,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:10.3.0-pre" "@grafana/e2e-selectors": "npm:10.3.0-pre" - "@grafana/experimental": "npm:1.7.4" + "@grafana/experimental": "npm:1.7.5" "@grafana/plugin-configs": "npm:10.3.0-pre" "@grafana/runtime": "npm:10.3.0-pre" "@grafana/schema": "npm:10.3.0-pre" @@ -2919,7 +2919,7 @@ __metadata: "@emotion/css": "npm:11.11.2" "@grafana/data": "npm:10.3.0-pre" "@grafana/e2e-selectors": "npm:10.3.0-pre" - "@grafana/experimental": "npm:1.7.0" + "@grafana/experimental": "npm:1.7.5" "@grafana/plugin-configs": "npm:10.3.0-pre" "@grafana/runtime": "npm:10.3.0-pre" "@grafana/schema": "npm:10.3.0-pre" @@ -3205,11 +3205,12 @@ __metadata: languageName: node linkType: hard -"@grafana/experimental@npm:1.7.4": - version: 1.7.4 - resolution: "@grafana/experimental@npm:1.7.4" +"@grafana/experimental@npm:1.7.5": + version: 1.7.5 + resolution: "@grafana/experimental@npm:1.7.5" dependencies: "@types/uuid": "npm:^8.3.3" + react-use: "npm:^17.4.2" semver: "npm:^7.5.4" uuid: "npm:^8.3.2" peerDependencies: @@ -3221,7 +3222,7 @@ __metadata: react-dom: 17.0.2 react-select: ^5.2.1 rxjs: 7.8.0 - checksum: e62e6382396d282281e31011c936fe9164650ea8caea7a09c4ef8615a66bb0ab0f74c4946354276457a2f5d1276016fc4225a08b8afb043c81e11b010f52b26d + checksum: 33f5e739bbc1646ea00c00b419c35a0b02abbfc35b0fa42d61f05a78a1929567388e4132093a029f88783264e739baeb8bcb53a68bcf1152f055a20be3b87e24 languageName: node linkType: hard @@ -13174,6 +13175,15 @@ __metadata: languageName: node linkType: hard +"css-in-js-utils@npm:^3.1.0": + version: 3.1.0 + resolution: "css-in-js-utils@npm:3.1.0" + dependencies: + hyphenate-style-name: "npm:^1.0.3" + checksum: bd2f569f1870389004cfacfd7b798c0f40933d34af1f040c391a08322d097790b9a9524affb2ba4d26122e9cb8f4256afb59edb6077dbe607506944a9c673c67 + languageName: node + linkType: hard + "css-line-break@npm:^2.1.0": version: 2.1.0 resolution: "css-line-break@npm:2.1.0" @@ -13462,6 +13472,13 @@ __metadata: languageName: node linkType: hard +"csstype@npm:^3.1.2": + version: 3.1.3 + resolution: "csstype@npm:3.1.3" + checksum: f593cce41ff5ade23f44e77521e3a1bcc2c64107041e1bf6c3c32adc5187d0d60983292fda326154d20b01079e24931aa5b08e4467cc488b60bb1e7f6d478ade + languageName: node + linkType: hard + "cypress-file-upload@npm:5.0.8": version: 5.0.8 resolution: "cypress-file-upload@npm:5.0.8" @@ -16174,6 +16191,13 @@ __metadata: languageName: node linkType: hard +"fast-loops@npm:^1.1.3": + version: 1.1.3 + resolution: "fast-loops@npm:1.1.3" + checksum: 1bf9f102d8ed48a8c8304e2b27fd32afa65d370498db9b49d5762696ac4aa8c55593d505c142c2b7e25ca79f45207c4b25f778afd80f35df98cb2caaaf9609b7 + languageName: node + linkType: hard + "fast-memoize@npm:^2.5.2": version: 2.5.2 resolution: "fast-memoize@npm:2.5.2" @@ -17412,7 +17436,7 @@ __metadata: "@grafana/e2e-selectors": "workspace:*" "@grafana/eslint-config": "npm:6.0.1" "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules" - "@grafana/experimental": "npm:1.7.4" + "@grafana/experimental": "npm:1.7.5" "@grafana/faro-core": "npm:^1.3.5" "@grafana/faro-web-sdk": "npm:^1.3.5" "@grafana/flamegraph": "workspace:*" @@ -18418,7 +18442,7 @@ __metadata: languageName: node linkType: hard -"hyphenate-style-name@npm:^1.0.2": +"hyphenate-style-name@npm:^1.0.2, hyphenate-style-name@npm:^1.0.3": version: 1.0.4 resolution: "hyphenate-style-name@npm:1.0.4" checksum: d37883e6b7e1be62e1ddae29cac83fa59fb93c068bc8eb1561585439adbad91dcf7e264ee2a82c4378fc58049f7bd853544a4a81bf00d4aff717f641052323e7 @@ -18705,6 +18729,16 @@ __metadata: languageName: node linkType: hard +"inline-style-prefixer@npm:^7.0.0": + version: 7.0.0 + resolution: "inline-style-prefixer@npm:7.0.0" + dependencies: + css-in-js-utils: "npm:^3.1.0" + fast-loops: "npm:^1.1.3" + checksum: 38486ce52ffa81649d845ffc4dda421ac24ea02709b8608d61f82cf186bc57749a73e562c2b7236c3946705a0c6e9d5e3872c59280972df73b0a1161fbf51eba + languageName: node + linkType: hard + "inquirer@npm:^8.2.0, inquirer@npm:^8.2.4": version: 8.2.5 resolution: "inquirer@npm:8.2.5" @@ -22705,6 +22739,25 @@ __metadata: languageName: node linkType: hard +"nano-css@npm:^5.6.1": + version: 5.6.1 + resolution: "nano-css@npm:5.6.1" + dependencies: + "@jridgewell/sourcemap-codec": "npm:^1.4.15" + css-tree: "npm:^1.1.2" + csstype: "npm:^3.1.2" + fastest-stable-stringify: "npm:^2.0.2" + inline-style-prefixer: "npm:^7.0.0" + rtl-css-js: "npm:^1.16.1" + stacktrace-js: "npm:^2.0.2" + stylis: "npm:^4.3.0" + peerDependencies: + react: "*" + react-dom: "*" + checksum: d4e5e3c9fdfc09f494852c75ae5320373dfa84e24f82b7d6ff45928205763ec7780446e3e10af98398409bd4bf1acebc1f987570592b2bc68b9c0997ad089f73 + languageName: node + linkType: hard + "nanoid@npm:3.3.3": version: 3.3.3 resolution: "nanoid@npm:3.3.3" @@ -26235,6 +26288,31 @@ __metadata: languageName: node linkType: hard +"react-use@npm:^17.4.2": + version: 17.4.2 + resolution: "react-use@npm:17.4.2" + dependencies: + "@types/js-cookie": "npm:^2.2.6" + "@xobotyi/scrollbar-width": "npm:^1.9.5" + copy-to-clipboard: "npm:^3.3.1" + fast-deep-equal: "npm:^3.1.3" + fast-shallow-equal: "npm:^1.0.0" + js-cookie: "npm:^2.2.1" + nano-css: "npm:^5.6.1" + react-universal-interface: "npm:^0.6.2" + resize-observer-polyfill: "npm:^1.5.1" + screenfull: "npm:^5.1.0" + set-harmonic-interval: "npm:^1.0.1" + throttle-debounce: "npm:^3.0.1" + ts-easing: "npm:^0.2.0" + tslib: "npm:^2.1.0" + peerDependencies: + react: "*" + react-dom: "*" + checksum: 56d2da474d949d22eb34ff3ffccf5526986d51ed68a8f4e64f4b79bdcff3f0ea55d322c104e3fc0819b08b8765e8eb3fa47d8b506e9d61ff1fdc7bd1374c17d6 + languageName: node + linkType: hard + "react-virtual@npm:2.10.4, react-virtual@npm:^2.8.2": version: 2.10.4 resolution: "react-virtual@npm:2.10.4" @@ -27161,6 +27239,15 @@ __metadata: languageName: node linkType: hard +"rtl-css-js@npm:^1.16.1": + version: 1.16.1 + resolution: "rtl-css-js@npm:1.16.1" + dependencies: + "@babel/runtime": "npm:^7.1.2" + checksum: fa6a3e1f73e65bf5763b8a051942477a0852ee072d29ebad0999f02556a73715e72374d9a31ddec3fe023b09702b56f8be3a5a0404816e795ab86ea879183e02 + languageName: node + linkType: hard + "rudder-sdk-js@npm:2.43.0": version: 2.43.0 resolution: "rudder-sdk-js@npm:2.43.0" @@ -28708,6 +28795,13 @@ __metadata: languageName: node linkType: hard +"stylis@npm:^4.3.0": + version: 4.3.1 + resolution: "stylis@npm:4.3.1" + checksum: 20b04044397c5c69e4b9f00b037159ba82b602c61d45f26d8def08577fd6ddc4b2853d86818548c1b404d29194a99b6495cca1733880afc845533ced843cb266 + languageName: node + linkType: hard + "supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1": version: 8.1.1 resolution: "supports-color@npm:8.1.1"