Same agent Smaller bill. The tools and infrastructure to get more work from your AI. Fewer tokens. Less compute. Lower cost.
TypeScript agent-harnessagent-harness-engineeringai-engineeringai-observabilityamd-gpuclaude-codeclickhousecodexcoding-agentcoding-agentscursorgenaigpu-monitoringllm-observabilityllmopsnvidia-smiobservabilityopen-sourceopenaiopentelemetry
feat: Added init seed values for the db (#85)
Aman Agarwald12c4eb43896
diff --git a/src/client/README.md b/src/client/README.mdindex 884cd776..eafbfc39 100644--- a/src/client/README.md+++ b/src/client/README.md@@ -38,7 +38,21 @@ Doku Client frontend uses Nextjs, Typescript and Tailwind. The application usesnpx prisma migrate deploynpx prisma generate````-6. Start the dev server+6. If you want to create a default user and a default db config run :+ ```sh+ npx prisma db seed+ ````+ `Note: Make sure the db is empty.`+ This will create a default user with+ - email : [email protected]+ - password : dokulabsuser+ For a default db config you need to pass some environment variables (some have default values):+ - `INIT_DB_USERNAME` (optional) ---> "default"+ - `INIT_DB_PASSWORD` (optional) ---> ""+ - `INIT_DB_HOST` (required)+ - `INIT_DB_PORT` (required)+ - `INIT_DB_DATABASE` (optional) ---> "default"+7. Start the dev server```shnpm run dev````diff --git a/src/client/package-lock.json b/src/client/package-lock.jsonindex c23d7cc7..ab81fd47 100644--- a/src/client/package-lock.json+++ b/src/client/package-lock.json@@ -28,7 +28,7 @@},"devDependencies": {"@types/lodash": "^4.14.202",- "@types/node": "^20",+ "@types/node": "^20.11.24","@types/react": "^18","@types/react-dom": "^18","@types/react-syntax-highlighter": "^15.5.11",@@ -38,7 +38,8 @@"postcss": "^8","prisma": "^5.8.1","tailwindcss": "^3.3.0",- "typescript": "^5"+ "ts-node": "^10.9.2",+ "typescript": "^5.3.3"}},"node_modules/@aashutoshrathi/word-wrap": {@@ -88,6 +89,28 @@"resolved": "https://registry.npmjs.org/@clickhouse/client-common/-/client-common-0.2.10.tgz","integrity": "sha512-BvTY0IXS96y9RUeNCpKL4HUzHmY80L0lDcGN0lmUD6zjOqYMn78+xyHYJ/AIAX7JQsc+/KwFt2soZutQTKxoGQ=="},+ "node_modules/@cspotcode/source-map-support": {+ "version": "0.8.1",+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",+ "devOptional": true,+ "dependencies": {+ "@jridgewell/trace-mapping": "0.3.9"+ },+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {+ "version": "0.3.9",+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",+ "devOptional": true,+ "dependencies": {+ "@jridgewell/resolve-uri": "^3.0.3",+ "@jridgewell/sourcemap-codec": "^1.4.10"+ }+ },"node_modules/@eslint-community/eslint-utils": {"version": "4.4.0","resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",@@ -686,6 +709,30 @@"url": "https://opencollective.com/date-fns"}},+ "node_modules/@tsconfig/node10": {+ "version": "1.0.9",+ "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",+ "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",+ "devOptional": true+ },+ "node_modules/@tsconfig/node12": {+ "version": "1.0.11",+ "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",+ "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",+ "devOptional": true+ },+ "node_modules/@tsconfig/node14": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",+ "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",+ "devOptional": true+ },+ "node_modules/@tsconfig/node16": {+ "version": "1.0.4",+ "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",+ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",+ "devOptional": true+ },"node_modules/@types/d3-array": {"version": "3.2.1","resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",@@ -761,10 +808,10 @@"dev": true},"node_modules/@types/node": {- "version": "20.11.5",- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz",- "integrity": "sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==",- "dev": true,+ "version": "20.11.24",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",+ "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",+ "devOptional": true,"dependencies": {"undici-types": "~5.26.4"}@@ -952,7 +999,7 @@"version": "8.11.3","resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz","integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",- "dev": true,+ "devOptional": true,"bin": {"acorn": "bin/acorn"},@@ -969,6 +1016,15 @@"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"}},+ "node_modules/acorn-walk": {+ "version": "8.3.2",+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",+ "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",+ "devOptional": true,+ "engines": {+ "node": ">=0.4.0"+ }+ },"node_modules/ajv": {"version": "6.12.6","resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",@@ -1550,6 +1606,12 @@"toggle-selection": "^1.0.6"}},+ "node_modules/create-require": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",+ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",+ "devOptional": true+ },"node_modules/cross-spawn": {"version": "7.0.3","resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",@@ -1777,6 +1839,15 @@"resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz","integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="},+ "node_modules/diff": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",+ "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",+ "devOptional": true,+ "engines": {+ "node": ">=0.3.1"+ }+ },"node_modules/dir-glob": {"version": "3.0.1","resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",@@ -3580,6 +3651,12 @@"node": ">=10"}},+ "node_modules/make-error": {+ "version": "1.3.6",+ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",+ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",+ "devOptional": true+ },"node_modules/merge2": {"version": "1.4.1","resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",@@ -5265,6 +5342,55 @@"resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz","integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="},+ "node_modules/ts-node": {+ "version": "10.9.2",+ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",+ "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",+ "devOptional": true,+ "dependencies": {+ "@cspotcode/source-map-support": "^0.8.0",+ "@tsconfig/node10": "^1.0.7",+ "@tsconfig/node12": "^1.0.7",+ "@tsconfig/node14": "^1.0.0",+ "@tsconfig/node16": "^1.0.2",+ "acorn": "^8.4.1",+ "acorn-walk": "^8.1.1",+ "arg": "^4.1.0",+ "create-require": "^1.1.0",+ "diff": "^4.0.1",+ "make-error": "^1.1.1",+ "v8-compile-cache-lib": "^3.0.1",+ "yn": "3.1.1"+ },+ "bin": {+ "ts-node": "dist/bin.js",+ "ts-node-cwd": "dist/bin-cwd.js",+ "ts-node-esm": "dist/bin-esm.js",+ "ts-node-script": "dist/bin-script.js",+ "ts-node-transpile-only": "dist/bin-transpile.js",+ "ts-script": "dist/bin-script-deprecated.js"+ },+ "peerDependencies": {+ "@swc/core": ">=1.2.50",+ "@swc/wasm": ">=1.2.50",+ "@types/node": "*",+ "typescript": ">=2.7"+ },+ "peerDependenciesMeta": {+ "@swc/core": {+ "optional": true+ },+ "@swc/wasm": {+ "optional": true+ }+ }+ },+ "node_modules/ts-node/node_modules/arg": {+ "version": "4.1.3",+ "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",+ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",+ "devOptional": true+ },"node_modules/tsconfig-paths": {"version": "3.15.0","resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",@@ -5375,7 +5501,7 @@"version": "5.3.3","resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz","integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",- "dev": true,+ "devOptional": true,"bin": {"tsc": "bin/tsc","tsserver": "bin/tsserver"@@ -5403,7 +5529,7 @@"version": "5.26.5","resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz","integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",- "dev": true+ "devOptional": true},"node_modules/update-browserslist-db": {"version": "1.0.13",@@ -5457,6 +5583,12 @@"uuid": "dist/bin/uuid"}},+ "node_modules/v8-compile-cache-lib": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",+ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",+ "devOptional": true+ },"node_modules/victory-vendor": {"version": "36.8.2","resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.8.2.tgz",@@ -5694,6 +5826,15 @@"node": ">= 14"}},+ "node_modules/yn": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",+ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",+ "devOptional": true,+ "engines": {+ "node": ">=6"+ }+ },"node_modules/yocto-queue": {"version": "0.1.0","resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",diff --git a/src/client/package.json b/src/client/package.jsonindex 94284f47..0c5a151d 100644--- a/src/client/package.json+++ b/src/client/package.json@@ -6,7 +6,8 @@"dev": "next dev","build": "next build","start": "next start",- "lint": "next lint"+ "lint": "next lint",+ "seed": "npx prisma db seed"},"dependencies": {"@clickhouse/client": "^0.2.10",@@ -29,7 +30,7 @@},"devDependencies": {"@types/lodash": "^4.14.202",- "@types/node": "^20",+ "@types/node": "^20.11.24","@types/react": "^18","@types/react-dom": "^18","@types/react-syntax-highlighter": "^15.5.11",@@ -39,6 +40,10 @@"postcss": "^8","prisma": "^5.8.1","tailwindcss": "^3.3.0",- "typescript": "^5"+ "ts-node": "^10.9.2",+ "typescript": "^5.3.3"+ },+ "prisma": {+ "seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"}-}+}\ No newline at end of filediff --git a/src/client/prisma/seed.ts b/src/client/prisma/seed.tsnew file mode 100644index 00000000..f7b354bf--- /dev/null+++ b/src/client/prisma/seed.ts@@ -0,0 +1,61 @@+import { PrismaClient } from "@prisma/client";+const prisma = new PrismaClient();+async function main() {+ // const defaultPassword = "dokulabsuser"; ⤵+ const hashedPassword =+ "$2a$10$XmL4Q45wWgPzMJXlM5L70eFyYvUGgIeRRm5f4.OOlcaIM/sQB6j/S";+ const user = await prisma.user.upsert({+ where: { email: "[email protected]" },+ update: {},+ create: {+ email: "[email protected]",+ password: hashedPassword,+ name: "User",+ },+ });++ const environmentDBConfig = {+ username: process.env.INIT_DB_USERNAME || "default",+ password: process.env.INIT_DB_PASSWORD || "",+ host: process.env.INIT_DB_HOST,+ port: process.env.INIT_DB_PORT,+ database: process.env.INIT_DB_DATABASE || "default",+ };++ if (environmentDBConfig.host && environmentDBConfig.port) {+ const dbConfig = await prisma.databaseConfig.upsert({+ where: { name: "Default DB", AND: { createdByUserId: user.id } },+ update: {},+ create: {+ environment: "production",+ name: "Default DB",+ ...environmentDBConfig,+ createdByUserId: user.id,+ },+ });++ await prisma.databaseConfigUser.upsert({+ where: {+ databaseConfigId_userId: {+ userId: user.id,+ databaseConfigId: dbConfig.id,+ },+ },+ update: {},+ create: {+ userId: user.id,+ databaseConfigId: dbConfig.id,+ isCurrent: true,+ },+ });+ }+}+main()+ .then(async () => {+ await prisma.$disconnect();+ })+ .catch(async (e) => {+ console.error(e);+ await prisma.$disconnect();+ process.exit(1);+ });diff --git a/src/client/src/app/auth.ts b/src/client/src/app/auth.tsindex 12ad235f..fea1c116 100644--- a/src/client/src/app/auth.ts+++ b/src/client/src/app/auth.ts@@ -4,13 +4,8 @@ import CredentialsProvider from "next-auth/providers/credentials";import { PrismaAdapter } from "@next-auth/prisma-adapter";import { PrismaClient } from "@prisma/client";import asaw from "@/utils/asaw";-import {- createNewUser,- getUserByEmail,- isPasswordMatches,- updateUser,-} from "@/lib/user";-import { compare } from "bcrypt-ts";+import { createNewUser, getUserByEmail, updateUser } from "@/lib/user";+import { doesPasswordMatches } from "@/utils/user";const prisma = new PrismaClient();@@ -86,7 +81,7 @@ export const authOptions = {getUserByEmail({ email: credentials.email, selectPassword: true }));if (!user || err) return err || "No such user exists!";- const passwordsMatch = await isPasswordMatches(+ const passwordsMatch = await doesPasswordMatches(credentials.password,user.password);diff --git a/src/client/src/lib/doku/common.ts b/src/client/src/lib/doku/common.tsindex 91fb4944..4dee6536 100644--- a/src/client/src/lib/doku/common.ts+++ b/src/client/src/lib/doku/common.ts@@ -29,10 +29,12 @@ export type DataCollectorType = { err?: unknown; data?: unknown };export async function dataCollector(query: string): Promise<DataCollectorType> {const [err, dbConfig] = await asaw(getDBConfigByUser(true));if (err) return { err, data: [] };- const clickhousePool = createClickhousePool(dbConfig);- const client = await clickhousePool.acquire();+ let clickhousePool;+ let client;try {+ clickhousePool = createClickhousePool(dbConfig);+ client = await clickhousePool.acquire();const result = await client.query({ query, format: "JSONEachRow" });const data = await result.json();return { data };@@ -40,6 +42,6 @@ export async function dataCollector(query: string): Promise<DataCollectorType> {console.trace(error);return { err: `ClickHouse Query Error: ${error.message}`, data: [] };} finally {- clickhousePool.release(client);+ if (clickhousePool && client) clickhousePool?.release(client);}}diff --git a/src/client/src/lib/user.ts b/src/client/src/lib/user.tsindex 29337004..51fbdf8e 100644--- a/src/client/src/lib/user.ts+++ b/src/client/src/lib/user.ts@@ -1,21 +1,8 @@import prisma from "./prisma";import asaw from "@/utils/asaw";-import { compare, genSaltSync, hashSync } from "bcrypt-ts";import { getCurrentUser } from "./session";import { User } from "@prisma/client";--const getHashedPassword = (password: string): string => {- const salt = genSaltSync(10);- const hash = hashSync(password, salt);- return hash;-};--export const isPasswordMatches = async (- password: string,- userPassword: string-): Promise<boolean> => {- return await compare(password, userPassword);-};+import { getHashedPassword, doesPasswordMatches } from "@/utils/user";function exclude<User>(user: User,@@ -131,7 +118,7 @@ export const updateUserProfile = async ({if (newPassword) {if (!currentPassword)throw new Error("Provide current password to update it to new one!");- const passwordsMatch = await isPasswordMatches(+ const passwordsMatch = await doesPasswordMatches(currentPassword,user.password || "");diff --git a/src/client/src/utils/user.ts b/src/client/src/utils/user.tsnew file mode 100644index 00000000..51657b5d--- /dev/null+++ b/src/client/src/utils/user.ts@@ -0,0 +1,14 @@+import { compare, genSaltSync, hashSync } from "bcrypt-ts";++export const getHashedPassword = (password: string): string => {+ const salt = genSaltSync(10);+ const hash = hashSync(password, salt);+ return hash;+};++export const doesPasswordMatches = async (+ password: string,+ userPassword: string+): Promise<boolean> => {+ return await compare(password, userPassword);+};