diff options
Diffstat (limited to 'packages/console/core')
| -rwxr-xr-x | packages/console/core/script/promote-models.ts | 19 | ||||
| -rwxr-xr-x | packages/console/core/script/update-models.ts | 29 | ||||
| -rw-r--r-- | packages/console/core/src/model.ts | 4 | ||||
| -rw-r--r-- | packages/console/core/sst-env.d.ts | 200 |
4 files changed, 134 insertions, 118 deletions
diff --git a/packages/console/core/script/promote-models.ts b/packages/console/core/script/promote-models.ts index 717813e40..0ff859df8 100755 --- a/packages/console/core/script/promote-models.ts +++ b/packages/console/core/script/promote-models.ts @@ -11,20 +11,21 @@ const root = path.resolve(process.cwd(), "..", "..", "..") // read the secret const ret = await $`bun sst secret list`.cwd(root).text() -const value1 = ret - .split("\n") - .find((line) => line.startsWith("ZEN_MODELS1")) - ?.split("=")[1] -const value2 = ret - .split("\n") - .find((line) => line.startsWith("ZEN_MODELS2")) - ?.split("=")[1] +const lines = ret.split("\n") +const value1 = lines.find((line) => line.startsWith("ZEN_MODELS1"))?.split("=")[1] +const value2 = lines.find((line) => line.startsWith("ZEN_MODELS2"))?.split("=")[1] +const value3 = lines.find((line) => line.startsWith("ZEN_MODELS3"))?.split("=")[1] +const value4 = lines.find((line) => line.startsWith("ZEN_MODELS4"))?.split("=")[1] if (!value1) throw new Error("ZEN_MODELS1 not found") if (!value2) throw new Error("ZEN_MODELS2 not found") +if (!value3) throw new Error("ZEN_MODELS3 not found") +if (!value4) throw new Error("ZEN_MODELS4 not found") // validate value -ZenData.validate(JSON.parse(value1 + value2)) +ZenData.validate(JSON.parse(value1 + value2 + value3 + value4)) // update the secret await $`bun sst secret set ZEN_MODELS1 ${value1} --stage ${stage}` await $`bun sst secret set ZEN_MODELS2 ${value2} --stage ${stage}` +await $`bun sst secret set ZEN_MODELS3 ${value3} --stage ${stage}` +await $`bun sst secret set ZEN_MODELS4 ${value4} --stage ${stage}` diff --git a/packages/console/core/script/update-models.ts b/packages/console/core/script/update-models.ts index 807d57826..a8523a5f2 100755 --- a/packages/console/core/script/update-models.ts +++ b/packages/console/core/script/update-models.ts @@ -9,21 +9,20 @@ const root = path.resolve(process.cwd(), "..", "..", "..") const models = await $`bun sst secret list`.cwd(root).text() // read the line starting with "ZEN_MODELS" -const oldValue1 = models - .split("\n") - .find((line) => line.startsWith("ZEN_MODELS1")) - ?.split("=")[1] -const oldValue2 = models - .split("\n") - .find((line) => line.startsWith("ZEN_MODELS2")) - ?.split("=")[1] +const lines = models.split("\n") +const oldValue1 = lines.find((line) => line.startsWith("ZEN_MODELS1"))?.split("=")[1] +const oldValue2 = lines.find((line) => line.startsWith("ZEN_MODELS2"))?.split("=")[1] +const oldValue3 = lines.find((line) => line.startsWith("ZEN_MODELS3"))?.split("=")[1] +const oldValue4 = lines.find((line) => line.startsWith("ZEN_MODELS4"))?.split("=")[1] if (!oldValue1) throw new Error("ZEN_MODELS1 not found") if (!oldValue2) throw new Error("ZEN_MODELS2 not found") +if (!oldValue3) throw new Error("ZEN_MODELS3 not found") +if (!oldValue4) throw new Error("ZEN_MODELS4 not found") // store the prettified json to a temp file const filename = `models-${Date.now()}.json` const tempFile = Bun.file(path.join(os.tmpdir(), filename)) -await tempFile.write(JSON.stringify(JSON.parse(oldValue1 + oldValue2), null, 2)) +await tempFile.write(JSON.stringify(JSON.parse(oldValue1 + oldValue2 + oldValue3 + oldValue4), null, 2)) console.log("tempFile", tempFile.name) // open temp file in vim and read the file on close @@ -32,6 +31,12 @@ const newValue = JSON.stringify(JSON.parse(await tempFile.text())) ZenData.validate(JSON.parse(newValue)) // update the secret -const mid = Math.floor(newValue.length / 2) -await $`bun sst secret set ZEN_MODELS1 ${newValue.slice(0, mid)}` -await $`bun sst secret set ZEN_MODELS2 ${newValue.slice(mid)}` +const chunk = Math.ceil(newValue.length / 4) +const newValue1 = newValue.slice(0, chunk) +const newValue2 = newValue.slice(chunk, chunk * 2) +const newValue3 = newValue.slice(chunk * 2, chunk * 3) +const newValue4 = newValue.slice(chunk * 3) +await $`bun sst secret set ZEN_MODELS1 ${newValue1}` +await $`bun sst secret set ZEN_MODELS2 ${newValue2}` +await $`bun sst secret set ZEN_MODELS3 ${newValue3}` +await $`bun sst secret set ZEN_MODELS4 ${newValue4}` diff --git a/packages/console/core/src/model.ts b/packages/console/core/src/model.ts index bff999e61..ed7911ab9 100644 --- a/packages/console/core/src/model.ts +++ b/packages/console/core/src/model.ts @@ -53,7 +53,9 @@ export namespace ZenData { }) export const list = fn(z.void(), () => { - const json = JSON.parse(Resource.ZEN_MODELS1.value + Resource.ZEN_MODELS2.value) + const json = JSON.parse( + Resource.ZEN_MODELS1.value + Resource.ZEN_MODELS2.value + Resource.ZEN_MODELS3.value + Resource.ZEN_MODELS4.value, + ) return ModelsSchema.parse(json) }) } diff --git a/packages/console/core/sst-env.d.ts b/packages/console/core/sst-env.d.ts index bcd7c2650..ec1970fb1 100644 --- a/packages/console/core/sst-env.d.ts +++ b/packages/console/core/sst-env.d.ts @@ -6,108 +6,116 @@ import "sst" declare module "sst" { export interface Resource { - ADMIN_SECRET: { - type: "sst.sst.Secret" - value: string - } - AUTH_API_URL: { - type: "sst.sst.Linkable" - value: string - } - AWS_SES_ACCESS_KEY_ID: { - type: "sst.sst.Secret" - value: string - } - AWS_SES_SECRET_ACCESS_KEY: { - type: "sst.sst.Secret" - value: string - } - CLOUDFLARE_API_TOKEN: { - type: "sst.sst.Secret" - value: string - } - CLOUDFLARE_DEFAULT_ACCOUNT_ID: { - type: "sst.sst.Secret" - value: string - } - Console: { - type: "sst.cloudflare.SolidStart" - url: string - } - Database: { - database: string - host: string - password: string - port: number - type: "sst.sst.Linkable" - username: string - } - Desktop: { - type: "sst.cloudflare.StaticSite" - url: string - } - EMAILOCTOPUS_API_KEY: { - type: "sst.sst.Secret" - value: string - } - GITHUB_APP_ID: { - type: "sst.sst.Secret" - value: string - } - GITHUB_APP_PRIVATE_KEY: { - type: "sst.sst.Secret" - value: string - } - GITHUB_CLIENT_ID_CONSOLE: { - type: "sst.sst.Secret" - value: string - } - GITHUB_CLIENT_SECRET_CONSOLE: { - type: "sst.sst.Secret" - value: string - } - GOOGLE_CLIENT_ID: { - type: "sst.sst.Secret" - value: string - } - HONEYCOMB_API_KEY: { - type: "sst.sst.Secret" - value: string - } - STRIPE_SECRET_KEY: { - type: "sst.sst.Secret" - value: string - } - STRIPE_WEBHOOK_SECRET: { - type: "sst.sst.Linkable" - value: string - } - Web: { - type: "sst.cloudflare.Astro" - url: string - } - ZEN_MODELS1: { - type: "sst.sst.Secret" - value: string - } - ZEN_MODELS2: { - type: "sst.sst.Secret" - value: string + "ADMIN_SECRET": { + "type": "sst.sst.Secret" + "value": string + } + "AUTH_API_URL": { + "type": "sst.sst.Linkable" + "value": string + } + "AWS_SES_ACCESS_KEY_ID": { + "type": "sst.sst.Secret" + "value": string + } + "AWS_SES_SECRET_ACCESS_KEY": { + "type": "sst.sst.Secret" + "value": string + } + "CLOUDFLARE_API_TOKEN": { + "type": "sst.sst.Secret" + "value": string + } + "CLOUDFLARE_DEFAULT_ACCOUNT_ID": { + "type": "sst.sst.Secret" + "value": string + } + "Console": { + "type": "sst.cloudflare.SolidStart" + "url": string + } + "Database": { + "database": string + "host": string + "password": string + "port": number + "type": "sst.sst.Linkable" + "username": string + } + "Desktop": { + "type": "sst.cloudflare.StaticSite" + "url": string + } + "EMAILOCTOPUS_API_KEY": { + "type": "sst.sst.Secret" + "value": string + } + "GITHUB_APP_ID": { + "type": "sst.sst.Secret" + "value": string + } + "GITHUB_APP_PRIVATE_KEY": { + "type": "sst.sst.Secret" + "value": string + } + "GITHUB_CLIENT_ID_CONSOLE": { + "type": "sst.sst.Secret" + "value": string + } + "GITHUB_CLIENT_SECRET_CONSOLE": { + "type": "sst.sst.Secret" + "value": string + } + "GOOGLE_CLIENT_ID": { + "type": "sst.sst.Secret" + "value": string + } + "HONEYCOMB_API_KEY": { + "type": "sst.sst.Secret" + "value": string + } + "STRIPE_SECRET_KEY": { + "type": "sst.sst.Secret" + "value": string + } + "STRIPE_WEBHOOK_SECRET": { + "type": "sst.sst.Linkable" + "value": string + } + "Web": { + "type": "sst.cloudflare.Astro" + "url": string + } + "ZEN_MODELS1": { + "type": "sst.sst.Secret" + "value": string + } + "ZEN_MODELS2": { + "type": "sst.sst.Secret" + "value": string + } + "ZEN_MODELS3": { + "type": "sst.sst.Secret" + "value": string + } + "ZEN_MODELS4": { + "type": "sst.sst.Secret" + "value": string } } } -// cloudflare -import * as cloudflare from "@cloudflare/workers-types" +// cloudflare +import * as cloudflare from "@cloudflare/workers-types"; declare module "sst" { export interface Resource { - Api: cloudflare.Service - AuthApi: cloudflare.Service - AuthStorage: cloudflare.KVNamespace - Bucket: cloudflare.R2Bucket - GatewayKv: cloudflare.KVNamespace - LogProcessor: cloudflare.Service + "Api": cloudflare.Service + "AuthApi": cloudflare.Service + "AuthStorage": cloudflare.KVNamespace + "Bucket": cloudflare.R2Bucket + "GatewayKv": cloudflare.KVNamespace + "LogProcessor": cloudflare.Service } } import "sst" -export {} +export {}
\ No newline at end of file |