From c667ff02b606fc8d88b2d513f076a818ce99aaf7 Mon Sep 17 00:00:00 2001 From: Jagger <634750802@qq.com> Date: Tue, 16 Apr 2024 13:41:46 +0800 Subject: [PATCH] try to fix Dockerfile --- extensions/fs-document-storage/meta.ts | 2 +- extensions/llm/cohere/reranker/meta.ts | 2 +- extensions/llm/jinaai/reranker/meta.ts | 2 +- .../vercel-blob-document-storage/meta.ts | 4 ++-- package.json | 2 +- packages/zod-extension/.gitignore | 1 - packages/zod-extension/index.d.ts | 15 ------------ packages/zod-extension/index.js | 1 - packages/zod-extension/index.mjs | 8 ------- packages/zod-extension/package.json | 9 -------- packages/zod-extension/patch.js | 9 -------- packages/zod-extension/patch.mjs | 9 -------- pnpm-lock.yaml | 23 +++++++------------ src/components/ui/auto-form/fields/object.tsx | 6 +---- src/components/ui/auto-form/types.ts | 1 - 15 files changed, 15 insertions(+), 79 deletions(-) delete mode 100644 packages/zod-extension/.gitignore delete mode 100644 packages/zod-extension/index.d.ts delete mode 100644 packages/zod-extension/index.js delete mode 100644 packages/zod-extension/index.mjs delete mode 100644 packages/zod-extension/package.json delete mode 100644 packages/zod-extension/patch.js delete mode 100644 packages/zod-extension/patch.mjs diff --git a/extensions/fs-document-storage/meta.ts b/extensions/fs-document-storage/meta.ts index fb60a997..eaabea09 100644 --- a/extensions/fs-document-storage/meta.ts +++ b/extensions/fs-document-storage/meta.ts @@ -5,7 +5,7 @@ import Readme from './readme.mdx'; const identifier = 'rag.document-storage.fs'; const displayName = 'File system storage'; const optionsSchema = z.object({ - path: z.string().optional().placeholder('DOCUMENT_STORE_PATH'), + path: z.string().optional(), }); export type FileSystemDocumentStorageOptions = z.infer; diff --git a/extensions/llm/cohere/reranker/meta.ts b/extensions/llm/cohere/reranker/meta.ts index a70709c3..c6e0839d 100644 --- a/extensions/llm/cohere/reranker/meta.ts +++ b/extensions/llm/cohere/reranker/meta.ts @@ -10,7 +10,7 @@ export interface CohereRerankerOptions { const identifier = 'rag.reranker.cohere'; const displayName = 'Cohere Reranker'; const optionsSchema = z.object({ - token: z.string().optional().placeholder('COHERE_TOKEN'), + token: z.string().optional(), model: z.string().optional(), }); diff --git a/extensions/llm/jinaai/reranker/meta.ts b/extensions/llm/jinaai/reranker/meta.ts index 8dc97a44..30919b5b 100644 --- a/extensions/llm/jinaai/reranker/meta.ts +++ b/extensions/llm/jinaai/reranker/meta.ts @@ -10,7 +10,7 @@ export interface JinaAIRerankerOptions { const identifier = 'rag.reranker.jinaai'; const displayName = 'Jina AI Reranker'; const optionsSchema = z.object({ - token: z.string().optional().placeholder('JINAAI_TOKEN'), + token: z.string().optional(), model: z.string().optional(), }); diff --git a/extensions/vercel-blob-document-storage/meta.ts b/extensions/vercel-blob-document-storage/meta.ts index f118e9fb..18a0f01b 100644 --- a/extensions/vercel-blob-document-storage/meta.ts +++ b/extensions/vercel-blob-document-storage/meta.ts @@ -5,8 +5,8 @@ import Readme from './readme.mdx'; const identifier = 'rag.document-storage.vercel-blob'; const displayName = 'Vercel Blob'; const optionsSchema = z.object({ - token: z.string().optional().placeholder('BLOB_READ_WRITE_TOKEN'), - prefix: z.string().optional().placeholder('VERCEL_BLOB_STORAGE_PREFIX'), + token: z.string().optional(), + prefix: z.string().optional(), }); export type VercelBlobDocumentStorageOptions = z.infer; diff --git a/package.json b/package.json index 3dc5f817..026adc41 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "unified": "^11.0.4", "unist-util-remove": "^4.0.0", "vaul": "^0.8.0", - "zod": "workspace:zod-extension@^" + "zod": "^3.22.4" }, "devDependencies": { "@createrag/extension-cohere-reranker": "workspace:^", diff --git a/packages/zod-extension/.gitignore b/packages/zod-extension/.gitignore deleted file mode 100644 index b512c09d..00000000 --- a/packages/zod-extension/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules \ No newline at end of file diff --git a/packages/zod-extension/index.d.ts b/packages/zod-extension/index.d.ts deleted file mode 100644 index b32b9a79..00000000 --- a/packages/zod-extension/index.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -export { default } from 'zod'; -export * from 'zod'; - -declare module 'zod' { - interface ZodTypeDef { - label?: string; - placeholder?: string; - } - - interface ZodType { - label (label: string | undefined): this; - - placeholder (string: string | undefined): this; - } -} diff --git a/packages/zod-extension/index.js b/packages/zod-extension/index.js deleted file mode 100644 index b088d484..00000000 --- a/packages/zod-extension/index.js +++ /dev/null @@ -1 +0,0 @@ -require("./patch.js")(exports = require('zod')); diff --git a/packages/zod-extension/index.mjs b/packages/zod-extension/index.mjs deleted file mode 100644 index 42166fdd..00000000 --- a/packages/zod-extension/index.mjs +++ /dev/null @@ -1,8 +0,0 @@ -import z from 'zod'; -import patch from "./patch.mjs"; - -patch(z); - -export { default } from 'zod' -export * from 'zod' - diff --git a/packages/zod-extension/package.json b/packages/zod-extension/package.json deleted file mode 100644 index 41abce85..00000000 --- a/packages/zod-extension/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "zod-extension", - "main": "index.js", - "version": "3.22.4", - "module": "index.mjs", - "dependencies": { - "zod": "^3.22.4" - } -} \ No newline at end of file diff --git a/packages/zod-extension/patch.js b/packages/zod-extension/patch.js deleted file mode 100644 index dfcc6f38..00000000 --- a/packages/zod-extension/patch.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = function patch(z) { - z.ZodType.prototype.placeholder = function placeholder(placeholder) { - return new this.constructor({ ...this._def, placeholder }); - }; - - z.ZodType.prototype.label = function label(label) { - return new this.constructor({ ...this._def, label }); - }; -} \ No newline at end of file diff --git a/packages/zod-extension/patch.mjs b/packages/zod-extension/patch.mjs deleted file mode 100644 index 71c78565..00000000 --- a/packages/zod-extension/patch.mjs +++ /dev/null @@ -1,9 +0,0 @@ -export default function patch(z) { - z.ZodType.prototype.placeholder = function placeholder(placeholder) { - return new this.constructor({ ...this._def, placeholder }); - }; - - z.ZodType.prototype.label = function label(label) { - return new this.constructor({ ...this._def, label }); - }; -} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 273a9bd3..db439655 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -246,8 +246,8 @@ importers: specifier: ^0.8.0 version: 0.8.7(@types/react-dom@18.2.18)(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0) zod: - specifier: workspace:zod-extension@^ - version: link:packages/zod-extension + specifier: ^3.22.4 + version: 3.22.4 devDependencies: '@createrag/extension-cohere-reranker': specifier: workspace:^ @@ -326,7 +326,7 @@ importers: version: 1.32.5 ai: specifier: ^3.0.15 - version: 3.0.15(react@18.2.0)(solid-js@1.8.12)(svelte@4.2.9)(vue@3.4.15)(zod@packages+zod-extension) + version: 3.0.15(react@18.2.0)(solid-js@1.8.12)(svelte@4.2.9)(vue@3.4.15)(zod@3.22.4) autoprefixer: specifier: ^10.0.1 version: 10.4.17(postcss@8.4.33) @@ -406,12 +406,6 @@ importers: extensions/vercel-blob-document-storage: {} - packages/zod-extension: - dependencies: - zod: - specifier: ^3.22.4 - version: 3.22.4 - www: dependencies: next: @@ -4869,7 +4863,7 @@ packages: humanize-ms: 1.2.1 dev: false - /ai@3.0.15(react@18.2.0)(solid-js@1.8.12)(svelte@4.2.9)(vue@3.4.15)(zod@packages+zod-extension): + /ai@3.0.15(react@18.2.0)(solid-js@1.8.12)(svelte@4.2.9)(vue@3.4.15)(zod@3.22.4): resolution: {integrity: sha512-ZQOsVWvH8OOAz9nuOluOWUs/3U+c3w7m6iWEQPbaxsuRcG/8W6fjPD6gdtzwRA+wX5i2OxoA/01iX1VD2yVA1A==} engines: {node: '>=14.6'} peerDependencies: @@ -4903,8 +4897,8 @@ packages: swr-store: 0.10.6 swrv: 1.0.4(vue@3.4.15) vue: 3.4.15(typescript@5.3.3) - zod: link:packages/zod-extension - zod-to-json-schema: 3.22.5(zod@packages+zod-extension) + zod: 3.22.4 + zod-to-json-schema: 3.22.5(zod@3.22.4) dev: true /ajv-keywords@3.5.2(ajv@6.12.6): @@ -13433,17 +13427,16 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - /zod-to-json-schema@3.22.5(zod@packages+zod-extension): + /zod-to-json-schema@3.22.5(zod@3.22.4): resolution: {integrity: sha512-+akaPo6a0zpVCCseDed504KBJUQpEW5QZw7RMneNmKw+fGaML1Z9tUNLnHHAC8x6dzVRO1eB2oEMyZRnuBZg7Q==} peerDependencies: zod: ^3.22.4 dependencies: - zod: link:packages/zod-extension + zod: 3.22.4 dev: true /zod@3.22.4: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} - dev: false /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} diff --git a/src/components/ui/auto-form/fields/object.tsx b/src/components/ui/auto-form/fields/object.tsx index be917121..e28a7643 100644 --- a/src/components/ui/auto-form/fields/object.tsx +++ b/src/components/ui/auto-form/fields/object.tsx @@ -68,9 +68,7 @@ export default function AutoFormObject< let item = shape[name] as z.ZodAny; item = handleIfZodNumber(item) as z.ZodAny; const zodBaseType = getBaseType(item); - const itemName = item._def.label ?? beautifyObjectName(name); - const itemPlaceholder = item._def.placeholder; - const itemDescription = item._def.description; + const itemName = item._def.description ?? beautifyObjectName(name); const key = [...path, name].join("."); const { @@ -150,7 +148,6 @@ export default function AutoFormObject< const value = field.value ?? defaultValue ?? ""; const fieldProps = { - placeholder: itemPlaceholder, ...zodToHtmlInputProps(item), ...field, ...fieldConfigItem.inputProps, @@ -170,7 +167,6 @@ export default function AutoFormObject< field={field} fieldConfigItem={fieldConfigItem} label={itemName} - description={itemDescription} isRequired={isRequired} zodItem={item} fieldProps={fieldProps} diff --git a/src/components/ui/auto-form/types.ts b/src/components/ui/auto-form/types.ts index 6b953e9f..872d90be 100644 --- a/src/components/ui/auto-form/types.ts +++ b/src/components/ui/auto-form/types.ts @@ -68,7 +68,6 @@ export type AutoFormInputComponentProps = { field: ControllerRenderProps; fieldConfigItem: FieldConfigItem; label: string; - description?: string; isRequired: boolean; fieldProps: any; zodItem: z.ZodAny;