From daf5bf797039f720bfb3228c2ff72f125ca8db2f Mon Sep 17 00:00:00 2001 From: Ruslan Zagitov Date: Fri, 31 Jan 2025 12:12:20 +0300 Subject: [PATCH] chore: install vercel/ai package; remove gigachat/ai static file; requests from /gigachat endpoint are not require SSL --- package-lock.json | 275 ++++++++++++++++++ package.json | 3 +- .../kfu-m-24-1/eng-it-lean/gigachat/index.js | 144 +++++---- 3 files changed, 361 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 37f4b94..23c7064 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.1", "license": "MIT", "dependencies": { + "ai": "^4.1.13", "axios": "^1.7.7", "bcrypt": "^5.1.0", "body-parser": "^1.19.0", @@ -39,6 +40,90 @@ "supertest": "^7.0.0" } }, + "node_modules/@ai-sdk/provider": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@ai-sdk/provider/-/provider-1.0.6.tgz", + "integrity": "sha512-hwj/gFNxpDgEfTaYzCYoslmw01IY9kWLKl/wf8xuPvHtQIzlfXWmmUwc8PnCwxyt8cKzIuV0dfUghCf68HQ0SA==", + "license": "Apache-2.0", + "dependencies": { + "json-schema": "^0.4.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@ai-sdk/provider-utils": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-2.1.5.tgz", + "integrity": "sha512-PcNR7E4ovZGV/J47gUqaFlvzorgca6uUfN5WzfXJSFWeOeLunN+oxRVwgUOwj0zbmO0yGQTHQD+FHVw8s3Rz8w==", + "license": "Apache-2.0", + "dependencies": { + "@ai-sdk/provider": "1.0.6", + "eventsource-parser": "^3.0.0", + "nanoid": "^3.3.8", + "secure-json-parse": "^2.7.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "zod": "^3.0.0" + }, + "peerDependenciesMeta": { + "zod": { + "optional": true + } + } + }, + "node_modules/@ai-sdk/react": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@ai-sdk/react/-/react-1.1.7.tgz", + "integrity": "sha512-QvTXmv+b05Q4cdruxt6UrM8qCcVOVFEAoJxemC/VV0Hyp6f+Udrm4KGDRwqtijGpl3P3zN1+7JwSUI9wOBz0Qw==", + "license": "Apache-2.0", + "dependencies": { + "@ai-sdk/provider-utils": "2.1.5", + "@ai-sdk/ui-utils": "1.1.7", + "swr": "^2.2.5", + "throttleit": "2.1.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "react": "^18 || ^19 || ^19.0.0-rc", + "zod": "^3.0.0" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + }, + "zod": { + "optional": true + } + } + }, + "node_modules/@ai-sdk/ui-utils": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@ai-sdk/ui-utils/-/ui-utils-1.1.7.tgz", + "integrity": "sha512-S9Q9rCvMPUe/RP5gc1kSn6yLe/4CFrvLP7H47Dcq5c0z6NEYDySL+ycecB6V2eRyxqxsVneL2zOvX6aubDhz1w==", + "license": "Apache-2.0", + "dependencies": { + "@ai-sdk/provider": "1.0.6", + "@ai-sdk/provider-utils": "2.1.5", + "zod-to-json-schema": "^3.24.1" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "zod": "^3.0.0" + }, + "peerDependenciesMeta": { + "zod": { + "optional": true + } + } + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -1470,6 +1555,15 @@ "sparse-bitfield": "^3.0.3" } }, + "node_modules/@opentelemetry/api": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", + "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==", + "license": "Apache-2.0", + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -1568,6 +1662,12 @@ "@types/node": "*" } }, + "node_modules/@types/diff-match-patch": { + "version": "1.0.36", + "resolved": "https://registry.npmjs.org/@types/diff-match-patch/-/diff-match-patch-1.0.36.tgz", + "integrity": "sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==", + "license": "MIT" + }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -1748,6 +1848,35 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/ai": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/ai/-/ai-4.1.13.tgz", + "integrity": "sha512-tEr3gt2X2NkCBDSxyeFRnWQ17AlfYYnH/2eImfakuq0AJBYRwk3VYK2twKd0gGFXVd6xBdlae5/PybpSiAyCbA==", + "license": "Apache-2.0", + "dependencies": { + "@ai-sdk/provider": "1.0.6", + "@ai-sdk/provider-utils": "2.1.5", + "@ai-sdk/react": "1.1.7", + "@ai-sdk/ui-utils": "1.1.7", + "@opentelemetry/api": "1.9.0", + "jsondiffpatch": "0.6.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "react": "^18 || ^19 || ^19.0.0-rc", + "zod": "^3.0.0" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + }, + "zod": { + "optional": true + } + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -2672,6 +2801,15 @@ "node": ">= 0.8" } }, + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -2710,6 +2848,12 @@ "wrappy": "1" } }, + "node_modules/diff-match-patch": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz", + "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==", + "license": "Apache-2.0" + }, "node_modules/diff-sequences": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", @@ -3096,6 +3240,15 @@ "node": ">= 0.6" } }, + "node_modules/eventsource-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.0.tgz", + "integrity": "sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA==", + "license": "MIT", + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -4888,6 +5041,12 @@ "dev": true, "license": "MIT" }, + "node_modules/json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "license": "(AFL-2.1 OR BSD-3-Clause)" + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -4915,6 +5074,35 @@ "node": ">=6" } }, + "node_modules/jsondiffpatch": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.6.0.tgz", + "integrity": "sha512-3QItJOXp2AP1uv7waBkao5nCvhEv+QmJAd38Ybq7wNI74Q+BBmnLn4EDKz6yI9xGAIQoUF87qHt+kc1IVxB4zQ==", + "license": "MIT", + "dependencies": { + "@types/diff-match-patch": "^1.0.36", + "chalk": "^5.3.0", + "diff-match-patch": "^1.0.5" + }, + "bin": { + "jsondiffpatch": "bin/jsondiffpatch.js" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + } + }, + "node_modules/jsondiffpatch/node_modules/chalk": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==", + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/jsonwebtoken": { "version": "8.5.1", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", @@ -5499,6 +5687,24 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/nanoid": { + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -6151,6 +6357,16 @@ "node": ">= 0.8" } }, + "node_modules/react": { + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", + "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", @@ -6348,6 +6564,12 @@ "node": ">=v12.22.7" } }, + "node_modules/secure-json-parse": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz", + "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==", + "license": "BSD-3-Clause" + }, "node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -6814,6 +7036,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/swr": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.0.tgz", + "integrity": "sha512-NyZ76wA4yElZWBHzSgEJc28a0u6QZvhb6w0azeL2k7+Q1gAzVK+IqQYXhVOC/mzi+HZIozrZvBVeSeOZNR2bqA==", + "license": "MIT", + "dependencies": { + "dequal": "^2.0.3", + "use-sync-external-store": "^1.4.0" + }, + "peerDependencies": { + "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -6857,6 +7092,18 @@ "dev": true, "license": "MIT" }, + "node_modules/throttleit": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-2.1.0.tgz", + "integrity": "sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -7072,6 +7319,15 @@ "requires-port": "^1.0.0" } }, + "node_modules/use-sync-external-store": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz", + "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==", + "license": "MIT", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -7339,6 +7595,25 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } + }, + "node_modules/zod": { + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz", + "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==", + "license": "MIT", + "peer": true, + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } + }, + "node_modules/zod-to-json-schema": { + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.1.tgz", + "integrity": "sha512-3h08nf3Vw3Wl3PK+q3ow/lIil81IT2Oa7YpQyUUDsEWbXveMesdfK1xBd2RhCkynwZndAxixji/7SYJJowr62w==", + "license": "ISC", + "peerDependencies": { + "zod": "^3.24.1" + } } } } diff --git a/package.json b/package.json index be43805..c3f6a38 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "license": "MIT", "homepage": "https://bitbucket.org/online-mentor/multi-stub#readme", "dependencies": { + "ai": "^4.1.13", "axios": "^1.7.7", "bcrypt": "^5.1.0", "body-parser": "^1.19.0", @@ -52,4 +53,4 @@ "nodemon": "3.0.1", "supertest": "^7.0.0" } -} \ No newline at end of file +} diff --git a/server/routers/kfu-m-24-1/eng-it-lean/gigachat/index.js b/server/routers/kfu-m-24-1/eng-it-lean/gigachat/index.js index 5a5cafc..50275f0 100644 --- a/server/routers/kfu-m-24-1/eng-it-lean/gigachat/index.js +++ b/server/routers/kfu-m-24-1/eng-it-lean/gigachat/index.js @@ -1,76 +1,94 @@ -const https = require('follow-redirects').https; +const axios = require('axios'); +const https = require('https'); const fs = require('fs'); const qs = require('querystring'); const uuid = require('uuid'); const router = require('express').Router(); -// vercel/ai package - https://github.com/vercel/ai -const ai = require('./ai') +// vercel/ai package +const ai = require('./ai'); // gigachat provider for vercel/ai -const gigachatProvider = require('./gigachat') +const gigachatProvider = require('./gigachat'); module.exports = router; -process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' -process.env.GIGACHAT_AUTH = 'NWVjYTczYjctNWRkYi00NzExLTg0YTEtMjhlOWVmODM2MjI4OjlmMTBkMGVkLWZjZjktNGZhOS1hNDZjLTc5ZWU1YzExOGExMw==' +const path = require('path'); +//process.env.NODE_EXTRA_CA_CERTS= path.resolve(__dirname, 'certs') +//process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' -const gigachat = gigachatProvider.createGigachat( { +process.env.GIGACHAT_AUTH = + 'NWVjYTczYjctNWRkYi00NzExLTg0YTEtMjhlOWVmODM2MjI4OjlmMTBkMGVkLWZjZjktNGZhOS1hNDZjLTc5ZWU1YzExOGExMw=='; + +const agent = new https.Agent({ + rejectUnauthorized: false +}); + +const gigachat = gigachatProvider.createGigachat({ headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json', + Accept: 'text/event-stream' + }, + fetch: (url, options) => { + return axios({ + method: 'post', + maxBodyLength: Infinity, + url: url, + headers: options.headers, + httpsAgent: agent, + data: options.body + }).then((response) => { + return new Response(response.data, { + status: response.status, + statusText: response.statusText, + headers: response.headers, + body: response.data + }); + }).catch((error) => { + return new Response(error.message, { + status: error.response.status, + statusText: error.response.statusText, + headers: error.response.headers, + body: error.response.data + }); + }); } -}) +}); -router.use((req, res, next) => { +router.use(async (req, res, next) => { const hasToken = process.env.GIGACHAT_ACCESS_TOKEN && process.env.GIGACHAT_EXPIRES_AT != null; const hasExpired = new Date(process.env.GIGACHAT_EXPIRES_AT) <= new Date(); if (!hasToken || hasExpired) { let auth = process.env.GIGACHAT_AUTH; let rquid = uuid.v4(); - let options = { - 'method': 'POST', - 'hostname': 'ngw.devices.sberbank.ru', - 'port': 9443, - 'path': '/api/v2/oauth', - 'headers': { + + let config = { + method: 'post', + maxBodyLength: Infinity, + url: 'https://ngw.devices.sberbank.ru:9443/api/v2/oauth', + headers: { 'Content-Type': 'application/x-www-form-urlencoded', - 'Accept': 'application/json', - 'RqUID': rquid, - 'Authorization': 'Basic ' + auth + Accept: 'application/json', + RqUID: rquid, + Authorization: 'Basic ' + auth }, - 'maxRedirects': 20 + httpsAgent: agent, + data: qs.stringify({ + scope: 'GIGACHAT_API_PERS' + }) }; - - const req = https.request(options, (response) => { - let chunks = []; - - response.on("data", (chunk) => { - chunks.push(chunk); - }); - - response.on("end", (chunk) => { - let body = Buffer.concat(chunks); - console.log(body.toString()); - let json = JSON.parse(body.toString()); - process.env.GIGACHAT_ACCESS_TOKEN = json.access_token; - process.env.GIGACHAT_EXPIRES_AT = json.expires_at; - }); - - response.on("error", (error) => { - console.error(error); - res.status(500).send(error); - }); - }); - - let postData = qs.stringify({ - 'scope': 'GIGACHAT_API_PERS' - }); - - req.write(postData); - req.end(); + + try { + const response = await axios(config); + const json = response.data; + process.env.GIGACHAT_ACCESS_TOKEN = json.access_token; + process.env.GIGACHAT_EXPIRES_AT = json.expires_at; + console.log(JSON.stringify(response.data)); + } catch { + console.log(error); + } } - next() + next(); }); router.post('/chat', async (req, res) => { @@ -81,18 +99,16 @@ router.post('/chat', async (req, res) => { system: 'You are a helpful assistant.', messages, stream: true, - update_interval: 0.2, + update_interval: 0.2 }); result.pipeDataStreamToResponse(res); -}) +}); router.post('/new-unit', async (req, res) => { const { prompt } = req.body; - const result = ai.streamText({ - model: gigachat('GigaChat'), - system:` + const systemMessage = ` Я хочу, чтобы вы выступали в роли помощника для создания продвинутых текстовых уроков английского языка. Я буду указывать тему и уровень сложности (начинающий, средний, продвинутый), а вы будете предоставлять структурированный план урока в формате Markdown. Урок должен включать только текстовые элементы (без видео, картинок, аудио) и содержать следующие разделы: -Цель урока — конкретный навык или знание, которое освоят студенты. -Лексика @@ -110,11 +126,19 @@ router.post('/new-unit', async (req, res) => { -Домашнее задание Текстовые задачи: написание текста, грамматические тесты, поиск синонимов/антонимов. Ответ должен быть оформлен в Markdown, лаконичным, без лишних комментариев, если пишешь блок кода, начинай его с новой строки. - `, - prompt, - stream: true, - update_interval: 0.3, - }); + `; - result.pipeDataStreamToResponse(res); + try { + const result = ai.streamText({ + model: gigachat('GigaChat'), + system: systemMessage, + prompt, + stream: true, + update_interval: 0.3 + }); + + result.pipeTextStreamToResponse(res); + } catch (e) { + console.log(e); + } });