diff --git a/package-lock.json b/package-lock.json index a57225b7..2098bf55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3532,16 +3532,30 @@ } }, "node_modules/@octokit/plugin-rest-endpoint-methods": { - "version": "10.4.1", - "license": "MIT", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.2.2.tgz", + "integrity": "sha512-EI7kXWidkt3Xlok5uN43suK99VWqc8OaIMktY9d9+RNKl69juoTyxmLoWPIZgJYzi41qj/9zU7G/ljnNOJ5AFA==", "dependencies": { - "@octokit/types": "^12.6.0" + "@octokit/types": "^13.5.0" }, "engines": { "node": ">= 18" }, "peerDependencies": { - "@octokit/core": "5" + "@octokit/core": "^5" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": { + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", + "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==" + }, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", + "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", + "dependencies": { + "@octokit/openapi-types": "^22.2.0" } }, "node_modules/@octokit/plugin-retry": { @@ -3621,16 +3635,44 @@ } }, "node_modules/@octokit/rest": { - "version": "20.1.0", - "license": "MIT", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.1.1.tgz", + "integrity": "sha512-MB4AYDsM5jhIHro/dq4ix1iWTLGToIGk6cWF5L6vanFaMble5jTX/UBQyiv05HsWnwUtY8JrfHy2LWfKwihqMw==", "dependencies": { "@octokit/core": "^5.0.2", - "@octokit/plugin-paginate-rest": "^9.1.5", + "@octokit/plugin-paginate-rest": "11.3.1", "@octokit/plugin-request-log": "^4.0.0", - "@octokit/plugin-rest-endpoint-methods": "^10.2.0" + "@octokit/plugin-rest-endpoint-methods": "13.2.2" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/@octokit/rest/node_modules/@octokit/openapi-types": { + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", + "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==" + }, + "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest": { + "version": "11.3.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.1.tgz", + "integrity": "sha512-ryqobs26cLtM1kQxqeZui4v8FeznirUsksiA+RYemMPJ7Micju0WSkv50dBksTuZks9O5cg4wp+t8fZ/cLY56g==", + "dependencies": { + "@octokit/types": "^13.5.0" }, "engines": { "node": ">= 18" + }, + "peerDependencies": { + "@octokit/core": "5" + } + }, + "node_modules/@octokit/rest/node_modules/@octokit/types": { + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", + "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", + "dependencies": { + "@octokit/openapi-types": "^22.2.0" } }, "node_modules/@octokit/types": { @@ -3740,7 +3782,8 @@ }, "node_modules/@puppeteer/browsers": { "version": "2.2.3", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.2.3.tgz", + "integrity": "sha512-bJ0UBsk0ESOs6RFcLXOt99a3yTDcOKlzfjad+rhFwdaG1Lu/Wzq58GHYCDTlZ9z6mldf4g+NTb+TXEfe0PpnsQ==", "dependencies": { "debug": "4.3.4", "extract-zip": "2.0.1", @@ -3936,7 +3979,8 @@ }, "node_modules/@tootallnate/quickjs-emscripten": { "version": "0.23.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", + "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" }, "node_modules/@tsconfig/node10": { "version": "1.0.11", @@ -4719,7 +4763,8 @@ }, "node_modules/ast-types": { "version": "0.13.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", + "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", "dependencies": { "tslib": "^2.0.1" }, @@ -5033,7 +5078,8 @@ }, "node_modules/basic-ftp": { "version": "5.0.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", + "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", "engines": { "node": ">=10.0.0" } @@ -5410,7 +5456,8 @@ }, "node_modules/chromium-bidi": { "version": "0.5.19", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.19.tgz", + "integrity": "sha512-UA6zL77b7RYCjJkZBsZ0wlvCTD+jTjllZ8f6wdO4buevXgTZYjV+XLB9CiEa2OuuTGGTLnI7eN9I60YxuALGQg==", "dependencies": { "mitt": "3.0.1", "urlpattern-polyfill": "10.0.0", @@ -5422,7 +5469,8 @@ }, "node_modules/chromium-bidi/node_modules/zod": { "version": "3.22.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz", + "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -6043,7 +6091,8 @@ }, "node_modules/data-uri-to-buffer": { "version": "6.0.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", + "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", "engines": { "node": ">= 14" } @@ -6214,7 +6263,8 @@ }, "node_modules/degenerator": { "version": "5.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", + "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", "dependencies": { "ast-types": "^0.13.4", "escodegen": "^2.1.0", @@ -6282,8 +6332,9 @@ } }, "node_modules/devtools-protocol": { - "version": "0.0.1273771", - "license": "BSD-3-Clause" + "version": "0.0.1286932", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1286932.tgz", + "integrity": "sha512-wu58HMQll9voDjR4NlPyoDEw1syfzaBNHymMMZ/QOXiHRNluOnDgu9hp1yHOKYoMlxCh4lSSiugLITe6Fvu1eA==" }, "node_modules/diff": { "version": "4.0.2", @@ -6604,7 +6655,8 @@ }, "node_modules/escodegen": { "version": "2.1.0", - "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", "dependencies": { "esprima": "^4.0.1", "estraverse": "^5.2.0", @@ -7722,7 +7774,8 @@ }, "node_modules/get-uri": { "version": "6.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", + "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", "dependencies": { "basic-ftp": "^5.0.2", "data-uri-to-buffer": "^6.0.2", @@ -7735,7 +7788,8 @@ }, "node_modules/get-uri/node_modules/fs-extra": { "version": "11.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -7897,7 +7951,8 @@ }, "node_modules/googleapis": { "version": "134.0.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-134.0.0.tgz", + "integrity": "sha512-o8LhD1754W6MHWtpwAPeP1WUHgNxuMxCnLMDFlMKAA5kCMTNqX9/eaTXnkkAIv6YRfoKMQ6D1vyR6/biXuhE9g==", "dependencies": { "google-auth-library": "^9.0.0", "googleapis-common": "^7.0.0" @@ -7933,7 +7988,8 @@ }, "node_modules/gpt-tokenizer": { "version": "2.1.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/gpt-tokenizer/-/gpt-tokenizer-2.1.2.tgz", + "integrity": "sha512-HSuI5d6uey+c7x/VzQlPfCoGrfLyAc28vxWofKbjR9PJHm0AjQGSWkKw/OJnb+8S1g7nzgRsf0WH3dK+NNWYbg==", "dependencies": { "rfc4648": "^1.5.2" } @@ -8269,7 +8325,8 @@ }, "node_modules/ip-address": { "version": "9.0.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", "dependencies": { "jsbn": "1.1.0", "sprintf-js": "^1.1.3" @@ -9361,7 +9418,8 @@ }, "node_modules/jsbn": { "version": "1.1.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" }, "node_modules/jsesc": { "version": "2.5.2", @@ -10030,7 +10088,8 @@ }, "node_modules/mitt": { "version": "3.0.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" }, "node_modules/mkdirp": { "version": "2.1.6", @@ -10213,7 +10272,8 @@ }, "node_modules/netmask": { "version": "2.0.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", + "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", "engines": { "node": ">= 0.4.0" } @@ -13108,22 +13168,50 @@ } }, "node_modules/octokit": { - "version": "3.2.0", - "license": "MIT", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/octokit/-/octokit-3.2.1.tgz", + "integrity": "sha512-u+XuSejhe3NdIvty3Jod00JvTdAE/0/+XbhIDhefHbu+2OcTRHd80aCiH6TX19ZybJmwPQBKFQmHGxp0i9mJrg==", "dependencies": { "@octokit/app": "^14.0.2", "@octokit/core": "^5.0.0", "@octokit/oauth-app": "^6.0.0", "@octokit/plugin-paginate-graphql": "^4.0.0", - "@octokit/plugin-paginate-rest": "^9.0.0", - "@octokit/plugin-rest-endpoint-methods": "^10.0.0", + "@octokit/plugin-paginate-rest": "11.3.1", + "@octokit/plugin-rest-endpoint-methods": "13.2.2", "@octokit/plugin-retry": "^6.0.0", "@octokit/plugin-throttling": "^8.0.0", "@octokit/request-error": "^5.0.0", - "@octokit/types": "^12.0.0" + "@octokit/types": "^13.0.0" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/octokit/node_modules/@octokit/openapi-types": { + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", + "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==" + }, + "node_modules/octokit/node_modules/@octokit/plugin-paginate-rest": { + "version": "11.3.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.1.tgz", + "integrity": "sha512-ryqobs26cLtM1kQxqeZui4v8FeznirUsksiA+RYemMPJ7Micju0WSkv50dBksTuZks9O5cg4wp+t8fZ/cLY56g==", + "dependencies": { + "@octokit/types": "^13.5.0" }, "engines": { "node": ">= 18" + }, + "peerDependencies": { + "@octokit/core": "5" + } + }, + "node_modules/octokit/node_modules/@octokit/types": { + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", + "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", + "dependencies": { + "@octokit/openapi-types": "^22.2.0" } }, "node_modules/on-finished": { @@ -13434,7 +13522,8 @@ }, "node_modules/pac-proxy-agent": { "version": "7.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz", + "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", "agent-base": "^7.0.2", @@ -13451,7 +13540,8 @@ }, "node_modules/pac-resolver": { "version": "7.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", + "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", "dependencies": { "degenerator": "^5.0.0", "netmask": "^2.0.2" @@ -14034,7 +14124,8 @@ }, "node_modules/proxy-agent": { "version": "6.4.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", + "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", "dependencies": { "agent-base": "^7.0.2", "debug": "^4.3.4", @@ -14051,7 +14142,8 @@ }, "node_modules/proxy-agent/node_modules/lru-cache": { "version": "7.18.3", - "license": "ISC", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "engines": { "node": ">=12" } @@ -14083,14 +14175,15 @@ } }, "node_modules/puppeteer": { - "version": "22.8.0", + "version": "22.9.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.9.0.tgz", + "integrity": "sha512-yNux2cm6Sfik4lNLNjJ25Cdn9spJRbMXxl1YZtVZCEhEeej1sFlCvZ/Cr64LhgyJOuvz3iq2uk+RLFpQpGwrjw==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@puppeteer/browsers": "2.2.3", "cosmiconfig": "9.0.0", - "devtools-protocol": "0.0.1273771", - "puppeteer-core": "22.8.0" + "devtools-protocol": "0.0.1286932", + "puppeteer-core": "22.9.0" }, "bin": { "puppeteer": "lib/esm/puppeteer/node/cli.js" @@ -14100,13 +14193,14 @@ } }, "node_modules/puppeteer-core": { - "version": "22.8.0", - "license": "Apache-2.0", + "version": "22.9.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.9.0.tgz", + "integrity": "sha512-Q2SYVZ1SIE7jCd/Pp+1/mNLFtdJfGvAF+CqOTDG8HcCNCiBvoXfopXfOfMHQ/FueXhGfJW/I6DartWv6QzpNGg==", "dependencies": { "@puppeteer/browsers": "2.2.3", "chromium-bidi": "0.5.19", "debug": "4.3.4", - "devtools-protocol": "0.0.1273771", + "devtools-protocol": "0.0.1286932", "ws": "8.17.0" }, "engines": { @@ -14176,7 +14270,8 @@ }, "node_modules/randomatic": { "version": "3.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", + "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", "dependencies": { "is-number": "^4.0.0", "kind-of": "^6.0.0", @@ -14616,7 +14711,8 @@ }, "node_modules/scrypt-kdf": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/scrypt-kdf/-/scrypt-kdf-2.0.1.tgz", + "integrity": "sha512-dMhpgBVJPDWZP5erOCwTjI6oAO9hKhFAjZsdSQ0spaWJYHuA/wFNF2weQQfsyCIk8eNKoLfEDxr3zAtM+gZo0Q==", "engines": { "node": ">=8.5.0" } @@ -14894,7 +14990,8 @@ }, "node_modules/smart-buffer": { "version": "4.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "engines": { "node": ">= 6.0.0", "npm": ">= 3.0.0" @@ -14902,7 +14999,8 @@ }, "node_modules/socks": { "version": "2.8.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", "dependencies": { "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" @@ -14914,7 +15012,8 @@ }, "node_modules/socks-proxy-agent": { "version": "8.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", + "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", "dependencies": { "agent-base": "^7.1.1", "debug": "^4.3.4", @@ -15335,8 +15434,9 @@ "license": "MIT" }, "node_modules/tiktoken": { - "version": "1.0.14", - "license": "MIT" + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.15.tgz", + "integrity": "sha512-sCsrq/vMWUSEW29CJLNmPvWxlVp7yh2tlkAjpJltIKqp5CKf98ZNpdeHRmAlPVFlGEbswDc6SmI8vz64W/qErw==" }, "node_modules/tildify": { "version": "2.0.0", @@ -16027,7 +16127,8 @@ }, "node_modules/urlpattern-polyfill": { "version": "10.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==" }, "node_modules/util": { "version": "0.10.4", @@ -16569,11 +16670,11 @@ "dependencies": { "@octokit/app": "^14.0.2", "@octokit/auth-app": "^6.0.4", - "@octokit/rest": "^20.0.2", + "@octokit/rest": "^20.1.1", "@ocular/ocular": "*", "@ocular/types": "*", "@ocular/utils": "*", - "octokit": "^3.1.2" + "octokit": "^3.2.1" }, "devDependencies": { "cross-env": "^5.2.1", @@ -16657,7 +16758,8 @@ "packages/apps/notion": { "version": "0.0.0", "dependencies": { - "async-sema": "^3.1.1" + "async-sema": "^3.1.1", + "randomatic": "^3.1.1" }, "devDependencies": { "@babel/cli": "^7.24.1", @@ -16682,7 +16784,7 @@ "@ocular/ocular": "*", "@ocular/types": "*", "@ocular/utils": "*", - "puppeteer": "^22.8.0" + "puppeteer": "^22.9.0" }, "devDependencies": { "@babel/cli": "^7.24.1", @@ -16724,6 +16826,7 @@ "pdf-parse": "^1.1.1", "puppeteer": "^19.7.2", "rate-limiter-flexible": "^5.0.3", + "scrypt-kdf": "^2.0.1", "typeorm": "^0.3.20", "uuid": "^9.0.1" }, @@ -18860,7 +18963,7 @@ "@ocular/types": "*", "@ocular/utils": "*", "openai": "^4.29.2", - "tiktoken": "^1.0.13" + "tiktoken": "^1.0.15" }, "devDependencies": { "cross-env": "^5.2.1", diff --git a/packages/apps/github/package.json b/packages/apps/github/package.json index 66b8b86d..58ac4cde 100644 --- a/packages/apps/github/package.json +++ b/packages/apps/github/package.json @@ -20,10 +20,10 @@ "dependencies": { "@octokit/app": "^14.0.2", "@octokit/auth-app": "^6.0.4", - "@octokit/rest": "^20.0.2", + "@octokit/rest": "^20.1.1", "@ocular/ocular": "*", "@ocular/types": "*", "@ocular/utils": "*", - "octokit": "^3.1.2" + "octokit": "^3.2.1" } } diff --git a/packages/apps/notion/package.json b/packages/apps/notion/package.json index b3623ab3..9b24f913 100644 --- a/packages/apps/notion/package.json +++ b/packages/apps/notion/package.json @@ -19,6 +19,7 @@ "@babel/preset-react": "^7.23.3" }, "dependencies": { - "async-sema": "^3.1.1" + "async-sema": "^3.1.1", + "randomatic": "^3.1.1" } } diff --git a/packages/apps/webconnector/package.json b/packages/apps/webconnector/package.json index c4ce2d02..988a1e54 100644 --- a/packages/apps/webconnector/package.json +++ b/packages/apps/webconnector/package.json @@ -22,6 +22,6 @@ "@ocular/ocular": "*", "@ocular/types": "*", "@ocular/utils": "*", - "puppeteer": "^22.8.0" + "puppeteer": "^22.9.0" } } diff --git a/packages/apps/webconnector/src/services/oauth.ts b/packages/apps/webconnector/src/services/oauth.ts index 5154f4ef..cf4548c6 100644 --- a/packages/apps/webconnector/src/services/oauth.ts +++ b/packages/apps/webconnector/src/services/oauth.ts @@ -30,13 +30,13 @@ class webConnectorOauth extends OauthService { name: AppNameDefinitions.WEBCONNECTOR, logo: "/asana.svg", description: - "WebConnector is an innovative app designed to streamline the process of data extraction from websites. Simply enter a URL and quickly gather all relevant data from the webpage. This tool makes it easier to access and analyze online information efficiently", + "WebConnector", oauth_url: "", slug: AppNameDefinitions.WEBCONNECTOR, category: AppCategoryDefinitions.SOTWARE_DEVELOPMENT, developer: "Ocular AI", images: ["/asana.svg"], - overview: "WebConnector: Your Gateway to Efficient Web Data Extraction", + overview: "WebConnector", docs: "https://developer.atlassian.com/", website: "https://www.atlassian.com/software/confluence", }; diff --git a/packages/ocular-ui/components/marketplace/integration-tile-grid.tsx b/packages/ocular-ui/components/marketplace/integration-tile-grid.tsx index bd6a9274..026e321d 100644 --- a/packages/ocular-ui/components/marketplace/integration-tile-grid.tsx +++ b/packages/ocular-ui/components/marketplace/integration-tile-grid.tsx @@ -2,6 +2,7 @@ import Image from 'next/image' import Link from 'next/link' import { Integration } from '@/types/types' import { Badge } from "@/components/ui/badge" +import { formatLabel } from '@/lib/utils'; export default function IntegrationTileGrid({ integrationsByCategory, @@ -34,17 +35,12 @@ export default function IntegrationTileGrid({ height={80} className="" src={p.logo} - alt={p.name} + alt={formatLabel(p.name)} />

- { - p.name - .split('-') - .map(word => word.charAt(0).toUpperCase() + word.slice(1)) - .join(' ') - } + {formatLabel(p.name)}

{p.description} diff --git a/packages/ocular-ui/components/search/app-filter-option.tsx b/packages/ocular-ui/components/search/app-filter-option.tsx index c6fd0b41..3a4acaf1 100644 --- a/packages/ocular-ui/components/search/app-filter-option.tsx +++ b/packages/ocular-ui/components/search/app-filter-option.tsx @@ -36,7 +36,7 @@ export default function AppFilterOption({ src, label, value, results }: AppFilte

- {results ? results : Math.floor(Math.random() * 1000) + 1} + 3

); diff --git a/packages/ocular-ui/components/search/app-filter-options.tsx b/packages/ocular-ui/components/search/app-filter-options.tsx index 69e32125..55f140dd 100644 --- a/packages/ocular-ui/components/search/app-filter-options.tsx +++ b/packages/ocular-ui/components/search/app-filter-options.tsx @@ -31,14 +31,14 @@ export default function AppFilterOptions({results, resultSources}: AppFilterOpti
All

All

-

{results ? results : Math.floor(Math.random() * 1000) + 1}

+

3

{mappedResultSources.map((iconName) => ( diff --git a/packages/ocular-ui/components/search/search-results.tsx b/packages/ocular-ui/components/search/search-results.tsx index 5731ebd3..fbb14eb2 100644 --- a/packages/ocular-ui/components/search/search-results.tsx +++ b/packages/ocular-ui/components/search/search-results.tsx @@ -2,66 +2,59 @@ import React, { useState } from 'react'; import Image from 'next/image'; import AppFilterOptions from "./app-filter-options"; import ReactMarkdown from 'react-markdown'; +import { formatLabel } from '@/lib/utils'; import { ChevronDownIcon, } from "@heroicons/react/outline"; import { SearchCopilotSkeleton, SearchResultsSkeleton, SearchByAppFilterSkeleton } from '@/components/ui/skeletons'; -import { Skeleton } from "@/components/ui/skeleton" -// AI Results Component -export const AIResults = ({ content, search_results, isLoadingCopilot }) => { +export const AIResults = ({ content, ai_citations }) => { const [showResults, setShowResults] = useState(false); return ( - <> - {isLoadingCopilot ? ( - - ) : ( -
-
-
- Ocular Copilot -

Copilot

+
+
+
+ Ocular Copilot +

Copilot

+
+
+ {content} +
+ {ai_citations && ai_citations.length > 0 && ( +
- {content} -
- {search_results && search_results.length > 0 && ( - - )} -
- { search_results && search_results.slice(0, 13).map((result: any, index: any) => ( - - ))} + + )} +
+ {ai_citations && ai_citations.slice(0, 13).map((citation, index) => ( + -
+ ))}
- )} - +
+
); }; // Results Component -const Results = ({ results, isLoadingResults }) => ( +const Results = ({ results }) => ( <>
{ @@ -108,7 +101,7 @@ const Results = ({ results, isLoadingResults }) => ( ); // Results Filter Component -const ResultsFilter = ({ results, isLoadingResults, resultSources }) => ( +const ResultsFilter = ({ results, resultSources }) => (
{ @@ -121,22 +114,26 @@ const ResultsFilter = ({ results, isLoadingResults, resultSources }) => ( ); // Main Component -export default function SearchResults({ search_results, ai_content, isLoadingResults, isLoadingCopilot, resultSources }) { +export default function SearchResults({ search_results, ai_content, isLoadingResults, isLoadingCopilot, resultSources, ai_citations }) { return ( -
- {/*
- -
*/} -
-
+
+
+
+ {isLoadingCopilot ? ( + + ): ( + + )} +
{isLoadingResults ? ( ) : ( - + )} - +
+
); -} \ No newline at end of file +} diff --git a/packages/ocular-ui/components/ui/skeletons.tsx b/packages/ocular-ui/components/ui/skeletons.tsx index 4230410b..825ce4cc 100644 --- a/packages/ocular-ui/components/ui/skeletons.tsx +++ b/packages/ocular-ui/components/ui/skeletons.tsx @@ -9,9 +9,9 @@ export function SearchResultSkeleton() {
- - - + + +
@@ -27,7 +27,6 @@ export function SearchResultsSkeleton() { -
) } @@ -35,24 +34,31 @@ export function SearchResultsSkeleton() { export function SearchCopilotSkeleton() { return (
-
+
- - - + + + +
+ +
+
+ + +
+
) } - export function SearchByAppFilterSkeleton() { return (
@@ -65,4 +71,4 @@ export function SearchByAppFilterSkeleton() {
) -} \ No newline at end of file +} diff --git a/packages/ocular-ui/lib/global-state.tsx b/packages/ocular-ui/lib/global-state.tsx index 98719da8..2cc05900 100644 --- a/packages/ocular-ui/lib/global-state.tsx +++ b/packages/ocular-ui/lib/global-state.tsx @@ -131,8 +131,8 @@ export const GlobalState: FC = ({ children }) => { // }); const [resultFilterDate, setResultFilterDate] = useState({ - from: new Date(2024, 3, 20), - to: addDays(new Date(2024, 3, 20), 20), + from: undefined, + to: undefined, }) useEffect(() => { diff --git a/packages/ocular-ui/pages/dashboard/search/index.tsx b/packages/ocular-ui/pages/dashboard/search/index.tsx index 347b13da..3eef53ca 100644 --- a/packages/ocular-ui/pages/dashboard/search/index.tsx +++ b/packages/ocular-ui/pages/dashboard/search/index.tsx @@ -49,7 +49,7 @@ export function Search() { alt="" /> -
+
{ setIsLoadingResults(true); setIsLoadingCopilot(true); api.search.search(router.query.q, selectedResultSources, selectedDate) - .then(data => { - // setAiResults(data.data.message.content); - // setIsLoadingCopilot(false); + .then(data => { + setAiResults(data.data.chat_completion.content); + setai_citations(data.data.chat_completion.citations); + setIsLoadingCopilot(false); setSearchResults(data.data.hits); setResultSources(data.data.sources); setIsLoadingResults(false); @@ -54,7 +56,7 @@ const selectedDate = useMemo(() => {
- +
); } \ No newline at end of file diff --git a/packages/ocular-ui/tailwind.config.js b/packages/ocular-ui/tailwind.config.js index 4fa50ae1..cb3a9fd6 100644 --- a/packages/ocular-ui/tailwind.config.js +++ b/packages/ocular-ui/tailwind.config.js @@ -77,6 +77,9 @@ module.exports = { "accordion-down": "accordion-down 0.2s ease-out", "accordion-up": "accordion-up 0.2s ease-out", }, + flexGrow: { + '3': '3', + }, }, }, plugins: [require("tailwindcss-animate")], diff --git a/packages/ocular/core-config.js b/packages/ocular/core-config.js index ad85a696..7f3451a1 100644 --- a/packages/ocular/core-config.js +++ b/packages/ocular/core-config.js @@ -151,14 +151,14 @@ module.exports = { }, }, }, - // { - // resolve: `webConnector`, - // options: { - // client_id: "FAKE_ID", - // client_secret: "FAKE_SECRET", - // redirect_uri: `${UI_CORS}/dashboard/marketplace/webConnector`, - // }, - // }, + { + resolve: `webConnector`, + options: { + client_id: "FAKE_ID", + client_secret: "FAKE_SECRET", + redirect_uri: `${UI_CORS}/dashboard/marketplace/webConnector`, + }, + }, // { // resolve: `github`, // options: { diff --git a/packages/ocular/package.json b/packages/ocular/package.json index 5db90560..03cf61a5 100644 --- a/packages/ocular/package.json +++ b/packages/ocular/package.json @@ -58,6 +58,7 @@ "pdf-parse": "^1.1.1", "puppeteer": "^19.7.2", "rate-limiter-flexible": "^5.0.3", + "scrypt-kdf": "^2.0.1", "typeorm": "^0.3.20", "uuid": "^9.0.1" } diff --git a/packages/plugins/open-ai/package.json b/packages/plugins/open-ai/package.json index e2c88760..0a58f0c4 100644 --- a/packages/plugins/open-ai/package.json +++ b/packages/plugins/open-ai/package.json @@ -21,6 +21,6 @@ "@ocular/types": "*", "@ocular/utils": "*", "openai": "^4.29.2", - "tiktoken": "^1.0.13" + "tiktoken": "^1.0.15" } }