From 13b95a9513a5984d2924073cfd7230974f697bda Mon Sep 17 00:00:00 2001 From: Mylan Date: Thu, 27 Nov 2025 21:24:09 -0800 Subject: [PATCH 01/12] set up ai backend --- package-lock.json | 503 ++++++++++++++-------------------- package.json | 3 + server/index.js | 11 + server/routes/gradeCompare.js | 48 ++++ 4 files changed, 262 insertions(+), 303 deletions(-) create mode 100644 server/index.js create mode 100644 server/routes/gradeCompare.js diff --git a/package-lock.json b/package-lock.json index b23d859..a04e4e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,9 @@ "@radix-ui/react-slider": "^1.3.6", "@tailwindcss/vite": "^4.1.10", "d3": "^7.9.0", + "dotenv": "^17.2.3", + "express": "^5.1.0", + "openai": "^6.9.1", "react": "^19.1.0", "react-dom": "^19.1.0", "svgo": "^4.0.0", @@ -739,9 +742,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dev": true, "license": "MIT", "dependencies": { @@ -781,13 +784,13 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", - "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", + "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.6", + "@eslint/object-schema": "^2.1.7", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -796,19 +799,22 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz", - "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", + "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", "dev": true, "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.17.0" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/core": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", - "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", + "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -856,19 +862,22 @@ } }, "node_modules/@eslint/js": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz", - "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==", + "version": "9.39.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.1.tgz", + "integrity": "sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==", "dev": true, "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" } }, "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -876,13 +885,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", - "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", + "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.13.0", + "@eslint/core": "^0.17.0", "levn": "^0.4.1" }, "engines": { @@ -1015,28 +1024,6 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@modelcontextprotocol/sdk": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.1.tgz", - "integrity": "sha512-9LfmxKTb1v+vUS1/emSk1f5ePmTLkb9Le9AxOB5T0XM59EUumwcS45z05h7aiZx3GI0Bl7mjb3FMEglYj+acuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "content-type": "^1.0.5", - "cors": "^2.8.5", - "cross-spawn": "^7.0.3", - "eventsource": "^3.0.2", - "express": "^5.0.1", - "express-rate-limit": "^7.5.0", - "pkce-challenge": "^5.0.0", - "raw-body": "^3.0.0", - "zod": "^3.23.8", - "zod-to-json-schema": "^3.24.1" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2618,9 +2605,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2722,7 +2709,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", - "dev": true, "license": "MIT", "dependencies": { "mime-types": "^3.0.0", @@ -2733,9 +2719,9 @@ } }, "node_modules/acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", "bin": { @@ -2803,24 +2789,43 @@ "license": "MIT" }, "node_modules/body-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", - "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", - "dev": true, + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz", + "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==", "license": "MIT", "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", - "debug": "^4.4.0", + "debug": "^4.4.3", "http-errors": "^2.0.0", - "iconv-lite": "^0.6.3", + "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.0", - "raw-body": "^3.0.0", - "type-is": "^2.0.0" + "raw-body": "^3.0.1", + "type-is": "^2.0.1" }, "engines": { "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/body-parser/node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/boolbase": { @@ -2830,9 +2835,9 @@ "license": "ISC" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -2890,7 +2895,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -2900,7 +2904,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -2914,7 +2917,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -3034,23 +3036,22 @@ "license": "MIT" }, "node_modules/content-disposition": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", - "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", - "dev": true, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", + "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", "license": "MIT", - "dependencies": { - "safe-buffer": "5.2.1" - }, "engines": { - "node": ">= 0.6" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/content-type": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -3067,7 +3068,6 @@ "version": "0.7.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -3077,26 +3077,11 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.6.0" } }, - "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "dev": true, - "license": "MIT", - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/cosmiconfig": { "version": "8.3.6", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", @@ -3622,10 +3607,9 @@ } }, "node_modules/debug": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", - "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "dev": true, + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -3659,7 +3643,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -3740,11 +3723,22 @@ "tslib": "^2.0.3" } }, + "node_modules/dotenv": { + "version": "17.2.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", + "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -3759,7 +3753,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true, "license": "MIT" }, "node_modules/electron-to-chromium": { @@ -3773,7 +3766,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -3818,7 +3810,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3828,7 +3819,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3838,7 +3828,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -3901,7 +3890,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true, "license": "MIT" }, "node_modules/escape-string-regexp": { @@ -3918,34 +3906,32 @@ } }, "node_modules/eslint": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz", - "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==", + "version": "9.39.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz", + "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.20.0", - "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.13.0", + "@eslint/config-array": "^0.21.1", + "@eslint/config-helpers": "^0.4.2", + "@eslint/core": "^0.17.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.26.0", - "@eslint/plugin-kit": "^0.2.8", + "@eslint/js": "9.39.1", + "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", - "@modelcontextprotocol/sdk": "^1.8.0", "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.3.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -3959,8 +3945,7 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "zod": "^3.24.2" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" @@ -4004,9 +3989,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", - "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -4021,9 +4006,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -4034,15 +4019,15 @@ } }, "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" + "eslint-visitor-keys": "^4.2.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4108,40 +4093,15 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" } }, - "node_modules/eventsource": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz", - "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eventsource-parser": "^3.0.1" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/eventsource-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.1.tgz", - "integrity": "sha512-VARTJ9CYeuQYb0pZEPbzi740OWFgpHe7AYJ2WFZVnUDUQp5Dk2yJUgF36YsZ81cOyxT0QxmXD2EQpapAouzWVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18.0.0" - } - }, "node_modules/express": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", - "dev": true, "license": "MIT", "dependencies": { "accepts": "^2.0.0", @@ -4180,22 +4140,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/express-rate-limit": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", - "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://github.com/sponsors/express-rate-limit" - }, - "peerDependencies": { - "express": "^4.11 || 5 || ^5.0.0-beta.1" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -4287,7 +4231,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", - "dev": true, "license": "MIT", "dependencies": { "debug": "^4.4.0", @@ -4343,7 +4286,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -4353,7 +4295,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -4377,7 +4318,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4397,7 +4337,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -4422,7 +4361,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -4462,7 +4400,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4498,7 +4435,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4511,7 +4447,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -4521,20 +4456,23 @@ } }, "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", "license": "MIT", "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" }, "engines": { "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/iconv-lite": { @@ -4590,7 +4528,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, "license": "ISC" }, "node_modules/internmap": { @@ -4606,7 +4543,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.10" @@ -4656,7 +4592,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", - "dev": true, "license": "MIT" }, "node_modules/isexe": { @@ -4683,9 +4618,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, "license": "MIT", "dependencies": { @@ -5064,7 +4999,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -5080,7 +5014,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -5090,7 +5023,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", - "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -5127,23 +5059,25 @@ "version": "1.54.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", - "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", - "dev": true, + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", "license": "MIT", "dependencies": { "mime-db": "^1.54.0" }, "engines": { - "node": ">= 0.6" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/minimatch": { @@ -5199,7 +5133,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, "license": "MIT" }, "node_modules/nanoid": { @@ -5231,7 +5164,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -5267,21 +5199,10 @@ "url": "https://github.com/fb55/nth-check?sponsor=1" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -5294,7 +5215,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, "license": "MIT", "dependencies": { "ee-first": "1.1.1" @@ -5307,12 +5227,32 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "license": "ISC", "dependencies": { "wrappy": "1" } }, + "node_modules/openai": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/openai/-/openai-6.9.1.tgz", + "integrity": "sha512-vQ5Rlt0ZgB3/BNmTa7bIijYFhz3YBceAA3Z4JuoMSBftBF9YqFHIEhZakSs+O/Ad7EaoEimZvHxD5ylRjN11Lg==", + "license": "Apache-2.0", + "bin": { + "openai": "bin/cli" + }, + "peerDependencies": { + "ws": "^8.18.0", + "zod": "^3.25 || ^4.0" + }, + "peerDependenciesMeta": { + "ws": { + "optional": true + }, + "zod": { + "optional": true + } + } + }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -5399,7 +5339,6 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -5426,13 +5365,13 @@ } }, "node_modules/path-to-regexp": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", - "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", - "dev": true, + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", + "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", "license": "MIT", - "engines": { - "node": ">=16" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/path-type": { @@ -5464,16 +5403,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pkce-challenge": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz", - "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16.20.0" - } - }, "node_modules/postcss": { "version": "8.5.3", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", @@ -5516,7 +5445,6 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, "license": "MIT", "dependencies": { "forwarded": "0.2.0", @@ -5540,7 +5468,6 @@ "version": "6.14.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", - "dev": true, "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" @@ -5577,26 +5504,40 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/raw-body": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", - "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", - "dev": true, + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", + "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.6.3", - "unpipe": "1.0.0" + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.7.0", + "unpipe": "~1.0.0" }, "engines": { - "node": ">= 0.8" + "node": ">= 0.10" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/react": { @@ -5700,7 +5641,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", - "dev": true, "license": "MIT", "dependencies": { "debug": "^4.4.0", @@ -5743,27 +5683,6 @@ "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", "license": "BSD-3-Clause" }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -5796,7 +5715,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", - "dev": true, "license": "MIT", "dependencies": { "debug": "^4.3.5", @@ -5819,7 +5737,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", - "dev": true, "license": "MIT", "dependencies": { "encodeurl": "^2.0.0", @@ -5835,7 +5752,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true, "license": "ISC" }, "node_modules/shebang-command": { @@ -5865,7 +5781,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -5885,7 +5800,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -5902,7 +5816,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -5921,7 +5834,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -5958,10 +5870,9 @@ } }, "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true, + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -6134,7 +6045,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.6" @@ -6177,7 +6087,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", - "dev": true, "license": "MIT", "dependencies": { "content-type": "^1.0.5", @@ -6229,7 +6138,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -6280,16 +6188,15 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/vite": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", - "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", + "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", "license": "MIT", "dependencies": { "esbuild": "^0.25.0", @@ -6431,7 +6338,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, "license": "ISC" }, "node_modules/yallist": { @@ -6455,24 +6361,15 @@ } }, "node_modules/zod": { - "version": "3.24.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz", - "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==", - "dev": true, + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.13.tgz", + "integrity": "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==", "license": "MIT", + "optional": true, + "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } - }, - "node_modules/zod-to-json-schema": { - "version": "3.24.5", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz", - "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==", - "dev": true, - "license": "ISC", - "peerDependencies": { - "zod": "^3.24.1" - } } } } diff --git a/package.json b/package.json index d7aee19..bad9db9 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,9 @@ "@radix-ui/react-slider": "^1.3.6", "@tailwindcss/vite": "^4.1.10", "d3": "^7.9.0", + "dotenv": "^17.2.3", + "express": "^5.1.0", + "openai": "^6.9.1", "react": "^19.1.0", "react-dom": "^19.1.0", "svgo": "^4.0.0", diff --git a/server/index.js b/server/index.js new file mode 100644 index 0000000..1889aca --- /dev/null +++ b/server/index.js @@ -0,0 +1,11 @@ +import express from "express"; +import "dovenv/config"; +import gradeCompareRouter from "./routes/gradeCompare"; + +const app = express(); +app.use(express.json()); +app.use("api/grade-compare", gradeCompareRouter); + +app.listen(3001, () => { + console.log("Backend running on http://localhost:3001"); +}); \ No newline at end of file diff --git a/server/routes/gradeCompare.js b/server/routes/gradeCompare.js new file mode 100644 index 0000000..8a53722 --- /dev/null +++ b/server/routes/gradeCompare.js @@ -0,0 +1,48 @@ +import express from "express"; +import OpenAI from "openai"; + +const router = express.Router(); + +const client = new OpenAI({ + apiKey: process.env.OPENAI_API_KEY, +}); + +router.post("/", async (req, res) => { + try { + const { countryA, countryB, studentAnswer } = req.body; + const prompt = ` + Grade an AP World History compare-and-contrast response: + Country A: ${countryA} + Country B: ${countryB} + Student answer: ${studentAnswer} + Rubric: + - 1 valid similarity with evidence + - 1 valid difference with evidence + - Accuracy + - Historical Reasoning + - Clarity + + Return strictly JSON: + { + "score": number, + "similarity": string, + "difference": string, + "strengths": string, + "areasToImprove": string + } + `; + + const result = await client.chat.completions.create({ + model: "gpt-4o-mini", + messages: [{ role: "user", content: prompt }], + response_format: { type: "json_object" }, + }); + + const json = JSON.parse(result.choices[0].message.content); + + res.json(json); + } catch (err) { + console.error(err); + res.status(500).json({ error: "AI grading failed" }); + } +}); \ No newline at end of file From 620c5ac1e653c952335e55daceb239f738239095 Mon Sep 17 00:00:00 2001 From: Mylan Date: Fri, 28 Nov 2025 13:00:09 -0800 Subject: [PATCH 02/12] integrate AI into popup --- .gitignore | 4 +- package-lock.json | 23 +++++++++++ package.json | 1 + server/index.js | 8 ++-- server/routes/gradeCompare.js | 57 ++++++++++++++++----------- src/geographic-selection.tsx | 74 +++++++++++++++++++++++++++++------ 6 files changed, 128 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index f47f385..53a1ee2 100644 --- a/.gitignore +++ b/.gitignore @@ -136,4 +136,6 @@ dist .pnp.* .DS_Store -src/.DS_Store \ No newline at end of file +src/.DS_Store + +.env \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a04e4e8..0eb118f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@babel/runtime": "^7.28.4", "@radix-ui/react-slider": "^1.3.6", "@tailwindcss/vite": "^4.1.10", + "cors": "^2.8.5", "d3": "^7.9.0", "dotenv": "^17.2.3", "express": "^5.1.0", @@ -3082,6 +3083,19 @@ "node": ">=6.6.0" } }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/cosmiconfig": { "version": "8.3.6", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", @@ -5199,6 +5213,15 @@ "url": "https://github.com/fb55/nth-check?sponsor=1" } }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", diff --git a/package.json b/package.json index bad9db9..bdafef2 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@babel/runtime": "^7.28.4", "@radix-ui/react-slider": "^1.3.6", "@tailwindcss/vite": "^4.1.10", + "cors": "^2.8.5", "d3": "^7.9.0", "dotenv": "^17.2.3", "express": "^5.1.0", diff --git a/server/index.js b/server/index.js index 1889aca..29b0bbd 100644 --- a/server/index.js +++ b/server/index.js @@ -1,10 +1,12 @@ import express from "express"; -import "dovenv/config"; -import gradeCompareRouter from "./routes/gradeCompare"; +import "dotenv/config"; +import gradeCompareRouter from "./routes/gradeCompare.js"; +import cors from "cors"; const app = express(); +app.use(cors()); app.use(express.json()); -app.use("api/grade-compare", gradeCompareRouter); +app.use("/api/grade-compare", gradeCompareRouter); app.listen(3001, () => { console.log("Backend running on http://localhost:3001"); diff --git a/server/routes/gradeCompare.js b/server/routes/gradeCompare.js index 8a53722..6527cb0 100644 --- a/server/routes/gradeCompare.js +++ b/server/routes/gradeCompare.js @@ -1,3 +1,4 @@ +import { difference } from "d3"; import express from "express"; import OpenAI from "openai"; @@ -11,38 +12,50 @@ router.post("/", async (req, res) => { try { const { countryA, countryB, studentAnswer } = req.body; const prompt = ` - Grade an AP World History compare-and-contrast response: - Country A: ${countryA} - Country B: ${countryB} - Student answer: ${studentAnswer} - Rubric: - - 1 valid similarity with evidence - - 1 valid difference with evidence - - Accuracy - - Historical Reasoning - - Clarity - - Return strictly JSON: - { - "score": number, - "similarity": string, - "difference": string, - "strengths": string, - "areasToImprove": string - } + Grade an AP World History compare-and-contrast response out of 5: + Country A: ${countryA} + Country B: ${countryB} + Student answer: ${studentAnswer} + Rubric: + - 1 valid similarity with evidence + - 1 valid difference with evidence + - Accuracy + - Historical Reasoning + - Clarity + + Return ONLY valid JSON with this exact structure: + { + "score": number, + "similarity": string, + "difference": string, + "strengths": string, + "areasToImprove": string + } `; const result = await client.chat.completions.create({ model: "gpt-4o-mini", messages: [{ role: "user", content: prompt }], - response_format: { type: "json_object" }, }); - const json = JSON.parse(result.choices[0].message.content); + let json; + try { + json = JSON.parse(result.choices[0].message.content); + } catch { + json = { + score: -1, + similarity: "", + difference: "", + strengths: "", + areasToImprove: result.choices[0].message.content + } + } res.json(json); } catch (err) { console.error(err); res.status(500).json({ error: "AI grading failed" }); } -}); \ No newline at end of file +}); + +export default router; \ No newline at end of file diff --git a/src/geographic-selection.tsx b/src/geographic-selection.tsx index 449d73c..9a773f3 100644 --- a/src/geographic-selection.tsx +++ b/src/geographic-selection.tsx @@ -447,6 +447,36 @@ const Quiz: React.FC = () => { }) ); setChosenCountries([country1, country2]); + setFeedback(undefined); + }; + + const [studentAnswer, setStudentAnswer] = useState(""); + const [isSumbitting, setIsSubmitting] = useState(false); + const [feedback, setFeedback] = useState<{ score?: number; strengths?: String; areasToImprove: string }>(); + + const handleSubmit = async () => { + if (!studentAnswer) return; + console.log("submit"); + setIsSubmitting(true); + try { + const res = await fetch("http://localhost:3001/api/grade-compare", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + countryA: chosenCountries[0], + countryB: chosenCountries[1], + studentAnswer: studentAnswer, + }), + }); + + const graded = await res.json(); + setFeedback(graded); + } catch (err) { + console.error(err); + alert("Error grading answer"); + } finally { + setIsSubmitting(false); + } }; useEffect(() => { @@ -465,24 +495,42 @@ const Quiz: React.FC = () => { )} {quizOpen && ( setQuizOpen(false)} opaqueness={0.75}> -
+

Find similarities & differences

- +
-
-
- +
+
+

{chosenCountries[0]}

-
- +
+

{chosenCountries[1]}

+
+ +
+ + {feedback && ( +
+

Score:

+

{feedback.score ?? "N/A"}/5

+

Strengths:

+

{feedback.strengths}

+

Areas to improve:

+

{feedback.areasToImprove}

+
+ )} )} From 33ab2de586c135cdcf82dd206cbc8cd4864f498c Mon Sep 17 00:00:00 2001 From: Mylan Date: Sun, 30 Nov 2025 16:22:42 -0800 Subject: [PATCH 03/12] change to render --- server/index.js | 7 +++++-- src/geographic-selection.tsx | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/index.js b/server/index.js index 29b0bbd..c01c4b1 100644 --- a/server/index.js +++ b/server/index.js @@ -4,10 +4,13 @@ import gradeCompareRouter from "./routes/gradeCompare.js"; import cors from "cors"; const app = express(); + app.use(cors()); app.use(express.json()); app.use("/api/grade-compare", gradeCompareRouter); -app.listen(3001, () => { - console.log("Backend running on http://localhost:3001"); +const PORT = process.env.PORT || 3001; + +app.listen(PORT, () => { + console.log(`Backend running on port ${PORT}`); }); \ No newline at end of file diff --git a/src/geographic-selection.tsx b/src/geographic-selection.tsx index 9a773f3..15151ed 100644 --- a/src/geographic-selection.tsx +++ b/src/geographic-selection.tsx @@ -459,7 +459,7 @@ const Quiz: React.FC = () => { console.log("submit"); setIsSubmitting(true); try { - const res = await fetch("http://localhost:3001/api/grade-compare", { + const res = await fetch("https://apworldwebsite.onrender.com/api/grade-compare", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ From 3c4104798fa47b057bc8fff75ae33ce1996b17b2 Mon Sep 17 00:00:00 2001 From: Mylan Date: Mon, 1 Dec 2025 22:07:30 -0800 Subject: [PATCH 04/12] check wakeup time --- server/index.js | 4 ++++ src/geographic-selection.tsx | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/server/index.js b/server/index.js index c01c4b1..81fdbe9 100644 --- a/server/index.js +++ b/server/index.js @@ -11,6 +11,10 @@ app.use("/api/grade-compare", gradeCompareRouter); const PORT = process.env.PORT || 3001; +app.get("/api/health", (req, res) => { + res.json({ message: "hello world" }); +}); + app.listen(PORT, () => { console.log(`Backend running on port ${PORT}`); }); \ No newline at end of file diff --git a/src/geographic-selection.tsx b/src/geographic-selection.tsx index 15151ed..40e25dd 100644 --- a/src/geographic-selection.tsx +++ b/src/geographic-selection.tsx @@ -459,6 +459,11 @@ const Quiz: React.FC = () => { console.log("submit"); setIsSubmitting(true); try { + const start = performance.now(); + await fetch("https://apworldwebsite.onrender.com/api/health"); + const end = performance.now(); + alert(`Backend awake in ${Math.round(end - start)}ms`); + const res = await fetch("https://apworldwebsite.onrender.com/api/grade-compare", { method: "POST", headers: { "Content-Type": "application/json" }, From c85d8a7213330ca6f4e639b2888b2bcc64b725cb Mon Sep 17 00:00:00 2001 From: Mylan Date: Mon, 1 Dec 2025 23:59:05 -0800 Subject: [PATCH 05/12] fix and delink openai --- src/geographic-selection.tsx | 38 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/geographic-selection.tsx b/src/geographic-selection.tsx index 40e25dd..b990d32 100644 --- a/src/geographic-selection.tsx +++ b/src/geographic-selection.tsx @@ -460,25 +460,31 @@ const Quiz: React.FC = () => { setIsSubmitting(true); try { const start = performance.now(); - await fetch("https://apworldwebsite.onrender.com/api/health"); - const end = performance.now(); - alert(`Backend awake in ${Math.round(end - start)}ms`); - - const res = await fetch("https://apworldwebsite.onrender.com/api/grade-compare", { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ - countryA: chosenCountries[0], - countryB: chosenCountries[1], - studentAnswer: studentAnswer, - }), - }); + try { + const healthRes = await fetch("https://apworldwebsite.onrender.com/api/health"); + const data = await healthRes.json(); + const end = performance.now(); + alert(`Backend awake in ${Math.round(end - start)}ms: ${data.message}`); + } catch (err) { + console.error("Health check failed:", err); + alert("Health check failed"); + } - const graded = await res.json(); - setFeedback(graded); + // const res = await fetch("https://apworldwebsite.onrender.com/api/grade-compare", { + // method: "POST", + // headers: { "Content-Type": "application/json" }, + // body: JSON.stringify({ + // countryA: chosenCountries[0], + // countryB: chosenCountries[1], + // studentAnswer: studentAnswer, + // }), + // }); + + // const graded = await res.json(); + // setFeedback(graded); } catch (err) { console.error(err); - alert("Error grading answer"); + // alert("Error grading answer"); } finally { setIsSubmitting(false); } From a76fa8d2790c38c2f4c43fc6771f7482b9632801 Mon Sep 17 00:00:00 2001 From: Mylan Date: Tue, 2 Dec 2025 17:46:27 -0800 Subject: [PATCH 06/12] reimplement openai --- src/geographic-selection.tsx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/geographic-selection.tsx b/src/geographic-selection.tsx index b990d32..8fb8c69 100644 --- a/src/geographic-selection.tsx +++ b/src/geographic-selection.tsx @@ -470,21 +470,21 @@ const Quiz: React.FC = () => { alert("Health check failed"); } - // const res = await fetch("https://apworldwebsite.onrender.com/api/grade-compare", { - // method: "POST", - // headers: { "Content-Type": "application/json" }, - // body: JSON.stringify({ - // countryA: chosenCountries[0], - // countryB: chosenCountries[1], - // studentAnswer: studentAnswer, - // }), - // }); - - // const graded = await res.json(); - // setFeedback(graded); + const res = await fetch("https://apworldwebsite.onrender.com/api/grade-compare", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + countryA: chosenCountries[0], + countryB: chosenCountries[1], + studentAnswer: studentAnswer, + }), + }); + + const graded = await res.json(); + setFeedback(graded); } catch (err) { console.error(err); - // alert("Error grading answer"); + alert("Error grading answer"); } finally { setIsSubmitting(false); } From d65bb77de0ccaa2a1ce48d39d8e6c562afb081a0 Mon Sep 17 00:00:00 2001 From: Mylan Date: Fri, 12 Dec 2025 21:12:50 -0800 Subject: [PATCH 07/12] put country info back in quiz --- src/pages/GeographicSelection.tsx | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/pages/GeographicSelection.tsx b/src/pages/GeographicSelection.tsx index c925914..3007ab4 100644 --- a/src/pages/GeographicSelection.tsx +++ b/src/pages/GeographicSelection.tsx @@ -490,6 +490,8 @@ const Quiz: React.FC = () => { } }; + const [notesOpen, setNotesOpen] = useState(false); + useEffect(() => { pickCountries(); }, [quizOpen]); @@ -532,6 +534,12 @@ const Quiz: React.FC = () => { > {isSumbitting ? "Grading..." : "Submit for Grading"} + {feedback && (

Score:

@@ -544,6 +552,30 @@ const Quiz: React.FC = () => { )} )} + {notesOpen && ( + setNotesOpen(false)}> +
+
+ +
+
+ +
+
+ + + )} ); }; From 9673a106168f6176d30b9f76ee71f4d1d7580177 Mon Sep 17 00:00:00 2001 From: Mylan Date: Fri, 12 Dec 2025 23:15:05 -0800 Subject: [PATCH 08/12] move backend wakeup --- src/pages/GeographicSelection.tsx | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/pages/GeographicSelection.tsx b/src/pages/GeographicSelection.tsx index 3007ab4..94a206a 100644 --- a/src/pages/GeographicSelection.tsx +++ b/src/pages/GeographicSelection.tsx @@ -412,6 +412,22 @@ const Quiz: React.FC = () => { const { presentNations } = useGeographicPageContext(); const maxTries = 20; + useEffect(() => { + if (quizOpen) { + (async () => { + try { + const start = performance.now(); + const healthRes = await fetch("http://localhost:3001/api/health"); + const data = await healthRes.json(); + const end = performance.now(); + console.log(`Backend wakeup (~health) in ${Math.round(end - start)}ms: ${data.message}`); + } catch (err) { + console.error("Backend wakeup/health failed", err); + } + })(); + } + }, [quizOpen]); + const pickCountries = () => { if (!quizOpen) return; let numTries = 0; @@ -459,18 +475,8 @@ const Quiz: React.FC = () => { console.log("submit"); setIsSubmitting(true); try { - const start = performance.now(); - try { - const healthRes = await fetch("https://apworldwebsite.onrender.com/api/health"); - const data = await healthRes.json(); - const end = performance.now(); - alert(`Backend awake in ${Math.round(end - start)}ms: ${data.message}`); - } catch (err) { - console.error("Health check failed:", err); - alert("Health check failed"); - } - - const res = await fetch("https://apworldwebsite.onrender.com/api/grade-compare", { + // https://apworldwebsite.onrender.com/api/grade-compare + const res = await fetch("http://localhost:3001/api/grade-compare", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ From fd775166f9ee35c978b3cf47acb2ce8da65abc5b Mon Sep 17 00:00:00 2001 From: Mylan Date: Fri, 12 Dec 2025 23:25:24 -0800 Subject: [PATCH 09/12] change back to render --- src/pages/GeographicSelection.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/GeographicSelection.tsx b/src/pages/GeographicSelection.tsx index 94a206a..a9dc655 100644 --- a/src/pages/GeographicSelection.tsx +++ b/src/pages/GeographicSelection.tsx @@ -417,7 +417,7 @@ const Quiz: React.FC = () => { (async () => { try { const start = performance.now(); - const healthRes = await fetch("http://localhost:3001/api/health"); + const healthRes = await fetch("https://apworldwebsite.onrender.com/api/health"); const data = await healthRes.json(); const end = performance.now(); console.log(`Backend wakeup (~health) in ${Math.round(end - start)}ms: ${data.message}`); @@ -475,8 +475,7 @@ const Quiz: React.FC = () => { console.log("submit"); setIsSubmitting(true); try { - // https://apworldwebsite.onrender.com/api/grade-compare - const res = await fetch("http://localhost:3001/api/grade-compare", { + const res = await fetch("https://apworldwebsite.onrender.com/api/grade-compare", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ From ad6461a6f65b34c6bdfd6b0f46e041ce7bc9836d Mon Sep 17 00:00:00 2001 From: yasen5 <167659798+yasen5@users.noreply.github.com> Date: Sun, 14 Dec 2025 14:02:31 -0800 Subject: [PATCH 10/12] Initial implementation of new quiz --- src/components/TimeSlider.tsx | 17 +- src/notes/quiz-notes.ts | 80 +++++++ src/pages/GeographicSelection.tsx | 207 ++++++++---------- src/providers/GeographicSelectionProvider.tsx | 5 - 4 files changed, 185 insertions(+), 124 deletions(-) create mode 100644 src/notes/quiz-notes.ts diff --git a/src/components/TimeSlider.tsx b/src/components/TimeSlider.tsx index 777586f..ad96c4f 100644 --- a/src/components/TimeSlider.tsx +++ b/src/components/TimeSlider.tsx @@ -1,11 +1,14 @@ -import { useState, createContext, useContext } from "react"; +import { useState, createContext, useContext, useEffect } from "react"; import * as Slider from "@radix-ui/react-slider"; +import { comparisons, type ValidComparison } from "../notes/quiz-notes"; const timePeriods: number[] = [1200, 1450, 1750, 1900, 2025]; interface TimeSliderProps { selectedTime: number; setSelectedTime: React.Dispatch>; + validComparisons: ValidComparison[] | undefined; + setValidComparisons: React.Dispatch>; } const TimeSliderContext = createContext(undefined); @@ -24,16 +27,24 @@ interface TimeSliderProviderProps { export const TimeSliderProvider: React.FC = ({ children }) => { const [selectedTime, setSelectedTime] = useState(1200); + const [validComparisons, setValidComparisons] = useState(); return ( - + {children} ); }; export const TimeSlider = () => { - const { selectedTime, setSelectedTime } = useTimeSliderContext(); + const { selectedTime, setSelectedTime, setValidComparisons } = useTimeSliderContext(); + + useEffect(() => { + const validComparisons: ValidComparison[] = comparisons.filter((comparison: ValidComparison) => { + return comparison.timePeriod[0] <= selectedTime && comparison.timePeriod[1] > selectedTime; + }); + setValidComparisons(validComparisons.length === 0 ? undefined : validComparisons); + }, [selectedTime, setValidComparisons]) return (
diff --git a/src/notes/quiz-notes.ts b/src/notes/quiz-notes.ts new file mode 100644 index 0000000..4e571d8 --- /dev/null +++ b/src/notes/quiz-notes.ts @@ -0,0 +1,80 @@ +export interface ValidComparison { + timePeriod: [number, number], + country1: string, + country2: string, + similarities?: string[], + differences?: string[] +} + +export const comparisons : ValidComparison[] = [ + { + timePeriod: [1450, 1750], + country1: "Ottoman Empire", + country2: "Mughal Empire", + similarities: [ + "Gunpowder empires using firearms to expand and maintain control", + "Religious tolerance toward diverse subject populations", + "Strong centralized rule under powerful monarchs" + ], + differences: [ + "Ottomans were primarily Sunni Muslim rulers of a Mediterranean empire, while Mughals ruled a largely Hindu population in South Asia", + "The Ottomans developed a large naval presence, while the Mughals focused more on land-based control" + ] + }, + { + timePeriod: [1450, 1750], + country1: "Spain", + country2: "Portugal", + similarities: [ + "Early leaders in maritime exploration", + "Established overseas colonial empires", + "Used colonies to extract wealth through mercantilist policies" + ], + differences: [ + "Spain focused on large territorial empires in the Americas, while Portugal emphasized trade posts in Africa and Asia", + "Spain relied heavily on silver mining, whereas Portugal focused more on spice and slave trades" + ] + }, + { + timePeriod: [1750, 1900], + country1: "Great Britain", + country2: "Japan", + similarities: [ + "Underwent rapid industrialization", + "Expanded state power through modernization", + "Used new technologies to strengthen military capabilities" + ], + differences: [ + "Britain industrialized gradually through private enterprise, while Japan industrialized rapidly through state-led reforms", + "Britain already possessed a global empire, while Japan pursued imperial expansion later in the period" + ] + }, + { + timePeriod: [1750, 1900], + country1: "China (Qing Dynasty)", + country2: "Ottoman Empire", + similarities: [ + "Faced internal rebellions and external pressure from European powers", + "Struggled to modernize traditional political and economic systems", + "Lost territorial and economic sovereignty during the 19th century" + ], + differences: [ + "China experienced significant population growth that strained resources, while the Ottoman Empire faced ethnic nationalism", + "Ottoman reforms were more centralized, whereas Qing reforms were uneven and resisted by elites" + ] + }, + { + timePeriod: [1900, 2000], + country1: "United States", + country2: "Soviet Union", + similarities: [ + "Emergence as global superpowers after World War II", + "Engaged in ideological competition during the Cold War", + "Invested heavily in military and technological development" + ], + differences: [ + "The United States promoted capitalism and democratic governance, while the Soviet Union promoted communism and one-party rule", + "The U.S. economy was market-based, while the Soviet economy was centrally planned" + ] + } +] \ No newline at end of file diff --git a/src/pages/GeographicSelection.tsx b/src/pages/GeographicSelection.tsx index a9dc655..25f81ee 100644 --- a/src/pages/GeographicSelection.tsx +++ b/src/pages/GeographicSelection.tsx @@ -29,7 +29,8 @@ import { GeographicPageProvider, useGeographicPageContext, } from "../providers/GeographicSelectionProvider"; -import { trackEvent } from "../util/analytics" +import { trackEvent } from "../util/analytics"; +import { comparisons, type ValidComparison } from "../notes/quiz-notes"; const timeMaps: Record< number, @@ -115,40 +116,42 @@ export const InnerGeographicSelection: React.FC<{ MapComponent: React.ComponentType>; }> = ({ MapComponent }) => { const { selectedCountry, setSelectedCountry } = useGeographicPageContext(); + const { validComparisons } = useTimeSliderContext(); return (
-
- +
+ -
-
+
+
+ {validComparisons && (
-
- -
+ )} +
+
- - {selectedCountry && - (() => { - const { timePeriod, ...notes } = - countryNotes[selectedCountry] || - generalNotes[selectedCountry]; - return ( - setSelectedCountry(null)}> - - - ); - })()}
+ + {selectedCountry && + (() => { + const { timePeriod, ...notes } = + countryNotes[selectedCountry] || generalNotes[selectedCountry]; + return ( + setSelectedCountry(null)}> + + + ); + })()} +
); @@ -211,10 +214,11 @@ const CrossCountryPopup: React.FC = () => { return ( )} - {quizOpen && ( + {quizOpen && comparison && ( setQuizOpen(false)} opaqueness={0.75}>

Find similarities & differences

- +
-
-
-

{chosenCountries[0]}

-
-
-

{chosenCountries[1]}

-
+
+

+ {comparison.country1} +

+

+ {comparison.country2} +

- +
{feedback && (
@@ -551,25 +526,25 @@ const Quiz: React.FC = () => {

{feedback.score ?? "N/A"}/5

Strengths:

{feedback.strengths}

-

Areas to improve:

+

Areas to improve:

{feedback.areasToImprove}

)} )} - {notesOpen && ( + {notesOpen && comparison && ( setNotesOpen(false)}>
diff --git a/src/providers/GeographicSelectionProvider.tsx b/src/providers/GeographicSelectionProvider.tsx index 9bd4f37..beb9a7e 100644 --- a/src/providers/GeographicSelectionProvider.tsx +++ b/src/providers/GeographicSelectionProvider.tsx @@ -5,8 +5,6 @@ interface GeographicPageProps { setSelectedCountry: React.Dispatch>; hoveredConcept: string | null; setHoveredConcept: React.Dispatch>; - presentNations: string[]; - setPresentNations: React.Dispatch>; } const GeographicPageContext = createContext< @@ -18,7 +16,6 @@ export const GeographicPageProvider: React.FC<{ }> = ({ children }) => { const [selectedCountry, setSelectedCountry] = useState(null); const [hoveredConcept, setHoveredConcept] = useState(null); - const [presentNations, setPresentNations] = useState([]); return ( {children} From 09d37005893d9007d5799d1c0dcb4fbd442b7b1b Mon Sep 17 00:00:00 2001 From: yasen5 <167659798+yasen5@users.noreply.github.com> Date: Sun, 14 Dec 2025 15:31:28 -0800 Subject: [PATCH 11/12] Fix up to not repeat comparisons --- src/components/TimeSlider.tsx | 39 ++++++++------ src/pages/GeographicSelection.tsx | 53 +++++++++++++++---- src/providers/GeographicSelectionProvider.tsx | 34 ++++++++++-- 3 files changed, 95 insertions(+), 31 deletions(-) diff --git a/src/components/TimeSlider.tsx b/src/components/TimeSlider.tsx index ad96c4f..af4d8ea 100644 --- a/src/components/TimeSlider.tsx +++ b/src/components/TimeSlider.tsx @@ -7,8 +7,6 @@ const timePeriods: number[] = [1200, 1450, 1750, 1900, 2025]; interface TimeSliderProps { selectedTime: number; setSelectedTime: React.Dispatch>; - validComparisons: ValidComparison[] | undefined; - setValidComparisons: React.Dispatch>; } const TimeSliderContext = createContext(undefined); @@ -16,7 +14,9 @@ const TimeSliderContext = createContext(undefined); export const useTimeSliderContext = () => { const context = useContext(TimeSliderContext); if (!context) { - throw new Error("useTimeSliderContext must be used within a TimeSliderProvider"); + throw new Error( + "useTimeSliderContext must be used within a TimeSliderProvider" + ); } return context; }; @@ -25,26 +25,21 @@ interface TimeSliderProviderProps { children: React.ReactNode; } -export const TimeSliderProvider: React.FC = ({ children }) => { +export const TimeSliderProvider: React.FC = ({ + children, +}) => { const [selectedTime, setSelectedTime] = useState(1200); const [validComparisons, setValidComparisons] = useState(); return ( - + {children} ); }; export const TimeSlider = () => { - const { selectedTime, setSelectedTime, setValidComparisons } = useTimeSliderContext(); - - useEffect(() => { - const validComparisons: ValidComparison[] = comparisons.filter((comparison: ValidComparison) => { - return comparison.timePeriod[0] <= selectedTime && comparison.timePeriod[1] > selectedTime; - }); - setValidComparisons(validComparisons.length === 0 ? undefined : validComparisons); - }, [selectedTime, setValidComparisons]) + const { selectedTime, setSelectedTime } = useTimeSliderContext(); return (
@@ -63,12 +58,22 @@ export const TimeSlider = () => { {/* Marks */} {timePeriods.map((mark) => { - const left = ((mark - timePeriods[0]) / - (timePeriods[timePeriods.length - 1] - timePeriods[0])) * 100; + const left = + ((mark - timePeriods[0]) / + (timePeriods[timePeriods.length - 1] - timePeriods[0])) * + 100; return ( -
+
- diff --git a/src/pages/GeographicSelection.tsx b/src/pages/GeographicSelection.tsx index 25f81ee..3d6b106 100644 --- a/src/pages/GeographicSelection.tsx +++ b/src/pages/GeographicSelection.tsx @@ -28,9 +28,10 @@ import { AutoscalingPopup, CountryInfoLayout } from "../components/Popup"; import { GeographicPageProvider, useGeographicPageContext, + type TrackedComparison, } from "../providers/GeographicSelectionProvider"; import { trackEvent } from "../util/analytics"; -import { comparisons, type ValidComparison } from "../notes/quiz-notes"; +import type { ValidComparison } from "../notes/quiz-notes"; const timeMaps: Record< number, @@ -115,8 +116,8 @@ export const GeographicSelectionPage = () => { export const InnerGeographicSelection: React.FC<{ MapComponent: React.ComponentType>; }> = ({ MapComponent }) => { - const { selectedCountry, setSelectedCountry } = useGeographicPageContext(); - const { validComparisons } = useTimeSliderContext(); + const { selectedCountry, setSelectedCountry, validComparisons } = + useGeographicPageContext(); return (
@@ -126,11 +127,9 @@ export const InnerGeographicSelection: React.FC<{
- {validComparisons && ( -
- -
- )} +
+ +
@@ -397,7 +396,28 @@ const MapHandler: React.FC<{ const Quiz: React.FC = () => { const [quizOpen, setQuizOpen] = useState(false); const [comparison, setComparison] = useState(); - const { validComparisons } = useTimeSliderContext(); + const { + validComparisons, + setValidComparisons, + trackedComparisons, + setTrackedComparisons, + } = useGeographicPageContext(); + const { selectedTime } = useTimeSliderContext(); + + useEffect(() => { + const validComparisons: TrackedComparison[] = trackedComparisons.filter( + (comparison: TrackedComparison) => { + return ( + !comparison.used && + comparison.comparison.timePeriod[0] <= selectedTime && + comparison.comparison.timePeriod[1] > selectedTime + ); + } + ); + setValidComparisons( + validComparisons.length === 0 ? undefined : validComparisons + ); + }, [selectedTime, trackedComparisons, setValidComparisons, trackedComparisons]); useEffect(() => { if (quizOpen) { @@ -425,8 +445,10 @@ const Quiz: React.FC = () => { if (!quizOpen || !validComparisons) return; setComparison( validComparisons[Math.floor(Math.random() * validComparisons.length)] + .comparison ); setFeedback(undefined); + setStudentAnswer(""); }; const [studentAnswer, setStudentAnswer] = useState(""); @@ -457,6 +479,17 @@ const Quiz: React.FC = () => { const graded = await res.json(); setFeedback(graded); + + if (graded.score && graded.score > 3) { + setTrackedComparisons((prev) => + prev.map((tc) => + tc.comparison.country1 === comparison.country1 && + tc.comparison.country2 === comparison.country2 + ? { ...tc, used: true } + : tc + ) + ); + } } catch (err) { console.error(err); alert("Error grading answer"); @@ -473,7 +506,7 @@ const Quiz: React.FC = () => { return ( <> - {!quizOpen && ( + {!quizOpen && validComparisons && (