diff --git a/apps/embedder/src/server/api/packs/[id]/loaders.post.ts b/apps/embedder/src/server/api/packs/[id]/loaders.post.ts index 9e99f5e42a..8428216757 100644 --- a/apps/embedder/src/server/api/packs/[id]/loaders.post.ts +++ b/apps/embedder/src/server/api/packs/[id]/loaders.post.ts @@ -9,6 +9,7 @@ import { eq, and } from 'drizzle-orm' import { useBullMQ, createJob } from '@magickml/embedder-queue' import { randomUUID } from 'crypto' import { Storage } from '@google-cloud/storage' +import { createError, defineEventHandler, readBody } from 'h3' const storage = new Storage({ projectId: process.env.GOOGLE_CLOUD_PROJECT_ID, diff --git a/apps/embedder/src/server/plugins/auth.ts b/apps/embedder/src/server/plugins/auth.ts index 6074d34593..287f8f6453 100644 --- a/apps/embedder/src/server/plugins/auth.ts +++ b/apps/embedder/src/server/plugins/auth.ts @@ -1,4 +1,3 @@ -//@ts-expect-error import { embedderAuthPlugin } from '@magickml/embedder-auth-plugin' export default embedderAuthPlugin diff --git a/apps/embedder/src/server/plugins/worker.ts b/apps/embedder/src/server/plugins/worker.ts index 95b24668a1..651ec0593e 100644 --- a/apps/embedder/src/server/plugins/worker.ts +++ b/apps/embedder/src/server/plugins/worker.ts @@ -1,4 +1,3 @@ -//@ts-expect-error import { embedderWorkerPlugin } from '@magickml/embedder-worker' export default embedderWorkerPlugin diff --git a/apps/embedder/tsconfig.app.json b/apps/embedder/tsconfig.app.json index fb91d7d049..b5586120b9 100644 --- a/apps/embedder/tsconfig.app.json +++ b/apps/embedder/tsconfig.app.json @@ -1,40 +1,10 @@ { - "extends": ["./tsconfig.json"], + "extends": "./tsconfig.json", "compilerOptions": { - "strict": true, - "allowSyntheticDefaultImports": true, - "paths": { - "@magickml/embedder-api-jobs": [ - "packages/embedder/api/jobs/src/index.ts" - ], - "@magickml/embedder-api-loaders": [ - "packages/embedder/api/loaders/src/index.ts" - ], - "@magickml/embedder-api-packs": [ - "packages/embedder/api/packs/src/index.ts" - ], - "@magickml/embedder-auth-plugin": [ - "packages/embedder/auth/plugin/src/index.ts" - ], - "@magickml/embedder-auth-token": [ - "packages/embedder/auth/token/src/index.ts" - ], - "@magickml/embedder-client-ts": [ - "packages/embedder/client/ts/src/index.ts" - ], - "@magickml/embedder-config": ["packages/embedder/config/src/index.ts"], - "@magickml/embedder-db-pinecone": [ - "packages/embedder/db/pinecone/src/index.ts" - ], - "@magickml/embedder-db-pg": ["packages/embedder/db/pg/src/index.ts"], - "@magickml/embedder-queue": ["packages/embedder/queue/src/index.ts"], - - "@magickml/embedder-loaders-core": [ - "packages/embedder/loaders/core/src/index.ts" - ], - "@magickml/embedder-schema": ["packages/embedder/schema/src/index.ts"], - "@magickml/packages-server-db:": ["packages/server/db/src/index.ts"] - } + "outDir": "../../dist/out-tsc", + "module": "esnext", + "types": ["node", "express"] }, - "exclude": [] + "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"], + "include": ["src/**/*.ts", ".nitro/types/nitro.d.ts"] } diff --git a/apps/embedder/tsconfig.json b/apps/embedder/tsconfig.json index b716026582..c1e2dd4e8b 100644 --- a/apps/embedder/tsconfig.json +++ b/apps/embedder/tsconfig.json @@ -1,10 +1,7 @@ { - "compilerOptions": { - "strict": true, - "allowSyntheticDefaultImports": true, - }, + "extends": "../../tsconfig.base.json", "files": [], - "include": [".nitro/types/nitro.d.ts"], + "include": [], "references": [ { "path": "./tsconfig.app.json" @@ -13,5 +10,7 @@ "path": "./tsconfig.spec.json" } ], - "extends": ["./.nitro/types/tsconfig.json", "../../tsconfig.base.json"] + "compilerOptions": { + "esModuleInterop": true + } } diff --git a/packages/client/windows/knowledge/src/lib/dialogs/add/knowledge-upload-content.tsx b/packages/client/windows/knowledge/src/lib/dialogs/add/knowledge-upload-content.tsx index 997186bf44..a7d10c7292 100644 --- a/packages/client/windows/knowledge/src/lib/dialogs/add/knowledge-upload-content.tsx +++ b/packages/client/windows/knowledge/src/lib/dialogs/add/knowledge-upload-content.tsx @@ -10,7 +10,7 @@ import { useAtom } from 'jotai' import { addKnowledgeDialogAtom, addKnowledgeFormAtom } from './state' import toast from 'react-hot-toast' import { CheckIcon, Cross1Icon } from '@radix-ui/react-icons' -import { LoaderType } from '@magickml/embedder/schema' +import { LoaderType } from '@magickml/embedder-schemas' type KnowledgeUploadContentProps = { disabledState: [boolean, React.Dispatch>] diff --git a/packages/client/windows/knowledge/src/lib/dialogs/knowledge-add-dialog.tsx b/packages/client/windows/knowledge/src/lib/dialogs/knowledge-add-dialog.tsx index 0366e900c2..7dc9c7503e 100644 --- a/packages/client/windows/knowledge/src/lib/dialogs/knowledge-add-dialog.tsx +++ b/packages/client/windows/knowledge/src/lib/dialogs/knowledge-add-dialog.tsx @@ -11,7 +11,7 @@ import { useCreateKnowledgeMutation } from 'client/state' import { useConfig } from '@magickml/providers' import { AddKnowledge } from '@magickml/shared-services' import { KnowledgeURLContent } from './add/knowledge-url-content' -import { LoaderType } from '@magickml/embedder/schema' +import { LoaderType } from '@magickml/embedder-schemas' export const ACCEPT = '.eml, .html, .json, .md, .msg, .rst, .rtf, .txt, .xml, .jpeg, .jpg, .png, .csv, .doc, .docx, .epub, .odt, .pdf, .ppt, .pptx, .tsv, .xlsx' diff --git a/portal/cloud b/portal/cloud index 550da9813e..d8c08b264e 160000 --- a/portal/cloud +++ b/portal/cloud @@ -1 +1 @@ -Subproject commit 550da9813ea49cb82ae6479ee459f71c1edd4d4a +Subproject commit d8c08b264e4e028461d4c202b183a8b9755f2308