diff --git a/package.json b/package.json index c60347362f3..1bc074741c5 100644 --- a/package.json +++ b/package.json @@ -280,7 +280,7 @@ "@grafana/google-sdk": "0.3.4", "@grafana/i18n": "workspace:*", "@grafana/lezer-logql": "0.2.8", - "@grafana/llm": "0.22.1", + "@grafana/llm": "1.0.1", "@grafana/monaco-logql": "^0.0.8", "@grafana/o11y-ds-frontend": "workspace:*", "@grafana/plugin-ui": "^0.10.10", diff --git a/public/app/plugins/datasource/loki/package.json b/public/app/plugins/datasource/loki/package.json index a60cf54811b..96b6070b8ab 100644 --- a/public/app/plugins/datasource/loki/package.json +++ b/public/app/plugins/datasource/loki/package.json @@ -7,7 +7,7 @@ "@emotion/css": "11.13.5", "@grafana/data": "12.2.3", "@grafana/lezer-logql": "0.2.8", - "@grafana/llm": "0.22.1", + "@grafana/llm": "1.0.1", "@grafana/monaco-logql": "^0.0.8", "@grafana/runtime": "12.2.3", "@grafana/schema": "12.2.3", diff --git a/yarn.lock b/yarn.lock index 5c713af27c1..93a6c69a751 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2633,7 +2633,7 @@ __metadata: "@grafana/data": "npm:12.2.3" "@grafana/e2e-selectors": "npm:12.2.3" "@grafana/lezer-logql": "npm:0.2.8" - "@grafana/llm": "npm:0.22.1" + "@grafana/llm": "npm:1.0.1" "@grafana/monaco-logql": "npm:^0.0.8" "@grafana/plugin-configs": "npm:12.2.3" "@grafana/runtime": "npm:12.2.3" @@ -3232,11 +3232,12 @@ __metadata: languageName: node linkType: hard -"@grafana/llm@npm:0.22.1": - version: 0.22.1 - resolution: "@grafana/llm@npm:0.22.1" +"@grafana/llm@npm:1.0.1": + version: 1.0.1 + resolution: "@grafana/llm@npm:1.0.1" dependencies: - "@modelcontextprotocol/sdk": "npm:^1.11.3" + "@modelcontextprotocol/sdk": "npm:^1.24.3" + publint: "npm:^0.3.12" react-use: "npm:^17.6.0" semver: "npm:^7.6.3" uuid: "npm:^11.0.5" @@ -3244,8 +3245,8 @@ __metadata: "@grafana/data": ^10.4.0 ||^11 || ^12 "@grafana/runtime": ^10.4.0 || ^11 || ^12 react: ^18 - rxjs: ^7.8.1 - checksum: 10/4c0c20becba18fb37c10da7e772713912be012f45099041cb9cd1f687c1e0ad016b0e8eae08879fc5a2ef0eae65c6ed67ed1ec19c0b6ed90f32464a406a3829b + rxjs: ^7.8.2 + checksum: 10/29739ca477d0db9c3c2f5ede2eb032d411b379fcad12976677d24b27c2d38929f5916d1a7915f503d0e1080b06ccfd3f0663c2c90e52a22b170f9ebdbab01d7f languageName: node linkType: hard @@ -5002,22 +5003,33 @@ __metadata: languageName: node linkType: hard -"@modelcontextprotocol/sdk@npm:^1.11.3": - version: 1.12.2 - resolution: "@modelcontextprotocol/sdk@npm:1.12.2" +"@modelcontextprotocol/sdk@npm:^1.24.3": + version: 1.24.3 + resolution: "@modelcontextprotocol/sdk@npm:1.24.3" dependencies: - ajv: "npm:^6.12.6" + ajv: "npm:^8.17.1" + ajv-formats: "npm:^3.0.1" content-type: "npm:^1.0.5" cors: "npm:^2.8.5" cross-spawn: "npm:^7.0.5" eventsource: "npm:^3.0.2" + eventsource-parser: "npm:^3.0.0" express: "npm:^5.0.1" express-rate-limit: "npm:^7.5.0" + jose: "npm:^6.1.1" pkce-challenge: "npm:^5.0.0" raw-body: "npm:^3.0.0" - zod: "npm:^3.23.8" - zod-to-json-schema: "npm:^3.24.1" - checksum: 10/1c2e1c2b3cddda6dd3ebe25732a3216feb1638f4fac94fdc491f5f7294a68bc642786aa08615c104ab57d7fff391b6c8e6ef94a38cfd2968da3a51582b62d16c + zod: "npm:^3.25 || ^4.0" + zod-to-json-schema: "npm:^3.25.0" + peerDependencies: + "@cfworker/json-schema": ^4.1.1 + zod: ^3.25 || ^4.0 + peerDependenciesMeta: + "@cfworker/json-schema": + optional: true + zod: + optional: false + checksum: 10/661aea493ee06674edc0d1409d5ff6e53053da2c3eb27d28ecdd5aa212d9d6bac8c00bec1cd18c1065f2d5774afef34e3cdcd19643056f954c14f611fee8cbc4 languageName: node linkType: hard @@ -11034,6 +11046,20 @@ __metadata: languageName: node linkType: hard +"ajv-formats@npm:^3.0.1": + version: 3.0.1 + resolution: "ajv-formats@npm:3.0.1" + dependencies: + ajv: "npm:^8.0.0" + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: 10/5679b9f9ced9d0213a202a37f3aa91efcffe59a6de1a6e3da5c873344d3c161820a1f11cc29899661fee36271fd2895dd3851b6461c902a752ad661d1c1e8722 + languageName: node + linkType: hard + "ajv-keywords@npm:^3.5.2": version: 3.5.2 resolution: "ajv-keywords@npm:3.5.2" @@ -11054,7 +11080,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.12.6": +"ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -11078,6 +11104,18 @@ __metadata: languageName: node linkType: hard +"ajv@npm:^8.17.1": + version: 8.17.1 + resolution: "ajv@npm:8.17.1" + dependencies: + fast-deep-equal: "npm:^3.1.3" + fast-uri: "npm:^3.0.1" + json-schema-traverse: "npm:^1.0.0" + require-from-string: "npm:^2.0.2" + checksum: 10/ee3c62162c953e91986c838f004132b6a253d700f1e51253b99791e2dbfdb39161bc950ebdc2f156f8568035bb5ed8be7bd78289cd9ecbf3381fe8f5b82e3f33 + languageName: node + linkType: hard + "anser@npm:^2.1.1": version: 2.3.2 resolution: "anser@npm:2.3.2" @@ -16468,6 +16506,13 @@ __metadata: languageName: node linkType: hard +"eventsource-parser@npm:^3.0.0": + version: 3.0.6 + resolution: "eventsource-parser@npm:3.0.6" + checksum: 10/febf7058b9c2168ecbb33e92711a1646e06bd1568f60b6eb6a01a8bf9f8fcd29cc8320d57247059cacf657a296280159f21306d2e3ff33309a9552b2ef889387 + languageName: node + linkType: hard + "eventsource-parser@npm:^3.0.1": version: 3.0.2 resolution: "eventsource-parser@npm:3.0.2" @@ -16789,6 +16834,13 @@ __metadata: languageName: node linkType: hard +"fast-uri@npm:^3.0.1": + version: 3.1.0 + resolution: "fast-uri@npm:3.1.0" + checksum: 10/818b2c96dc913bcf8511d844c3d2420e2c70b325c0653633f51821e4e29013c2015387944435cd0ef5322c36c9beecc31e44f71b257aeb8e0b333c1d62bb17c2 + languageName: node + linkType: hard + "fast_array_intersect@npm:1.1.0": version: 1.1.0 resolution: "fast_array_intersect@npm:1.1.0" @@ -18116,7 +18168,7 @@ __metadata: "@grafana/google-sdk": "npm:0.3.4" "@grafana/i18n": "workspace:*" "@grafana/lezer-logql": "npm:0.2.8" - "@grafana/llm": "npm:0.22.1" + "@grafana/llm": "npm:1.0.1" "@grafana/monaco-logql": "npm:^0.0.8" "@grafana/o11y-ds-frontend": "workspace:*" "@grafana/plugin-e2e": "npm:2.1.7" @@ -21147,6 +21199,13 @@ __metadata: languageName: node linkType: hard +"jose@npm:^6.1.1": + version: 6.1.3 + resolution: "jose@npm:6.1.3" + checksum: 10/9626c51e8c3792b505e954f3094698c182208617b62dfb27269230f31e57560b083985ed8128b8a9753aa92daf18d3a2341cc826d149503f14569abe87d42389 + languageName: node + linkType: hard + "jpeg-js@npm:^0.4.4": version: 0.4.4 resolution: "jpeg-js@npm:0.4.4" @@ -33227,12 +33286,12 @@ __metadata: languageName: node linkType: hard -"zod-to-json-schema@npm:^3.24.1": - version: 3.24.5 - resolution: "zod-to-json-schema@npm:3.24.5" +"zod-to-json-schema@npm:^3.25.0": + version: 3.25.0 + resolution: "zod-to-json-schema@npm:3.25.0" peerDependencies: - zod: ^3.24.1 - checksum: 10/1af291b4c429945c9568c2e924bdb7c66ab8d139cbeb9a99b6e9fc9e1b02863f85d07759b9303714f07ceda3993dcaf0ebcb80d2c18bb2aaf5502b2c1016affd + zod: ^3.25 || ^4 + checksum: 10/cb932e20b5b5e64c75b2c34a7e6dae74b727292eab9e014b93c2607378b8cb1b227f80b429053ceb77c8e0dddc338837f9e534b2a658540ff60c9e4ffdc7cc19 languageName: node linkType: hard @@ -33243,6 +33302,13 @@ __metadata: languageName: node linkType: hard +"zod@npm:^3.25 || ^4.0": + version: 4.1.13 + resolution: "zod@npm:4.1.13" + checksum: 10/0679190318928f69fcb07751063719de232c663b13955fcdb55db59839569d39f3f29b955cb0cba7af0b724233f88c06b3e84c550397ad4e68f8088fa6799d88 + languageName: node + linkType: hard + "zod@npm:^4.0.0": version: 4.0.15 resolution: "zod@npm:4.0.15"