diff --git a/packages/core/package.json b/packages/core/package.json index 0abb2fefef59b05fea324803a3d27cdcda65491a..76ce2a65cc3510aba65ea64320274f6428d9d433 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -21,6 +21,7 @@ "notion-md-crawler": "^0.0.2", "openai": "^4.20.1", "papaparse": "^5.4.1", + "pathe": "^1.1.2", "pdfjs-dist": "4.0.269", "pg": "^8.11.3", "pgvector": "^0.1.5", diff --git a/packages/core/src/Node.ts b/packages/core/src/Node.ts index ba47f35818154dfca746d93395def6a02f577c71..538d4a020f99097de364ce3ac2547a53e0baf55f 100644 --- a/packages/core/src/Node.ts +++ b/packages/core/src/Node.ts @@ -1,6 +1,5 @@ import _ from "lodash"; -import path from "node:path"; -import { createSHA256, randomUUID } from "./env"; +import { createSHA256, path, randomUUID } from "./env"; export enum NodeRelationship { SOURCE = "SOURCE", diff --git a/packages/core/src/env/index.edge-light.ts b/packages/core/src/env/index.edge-light.ts index 562710cbcd604e3b8888f5b29f9fea67074265ab..522fcca3e3b4cdc2d5982aa2af9b2a30504ad55d 100644 --- a/packages/core/src/env/index.edge-light.ts +++ b/packages/core/src/env/index.edge-light.ts @@ -1,6 +1,9 @@ import { Sha256 } from "@aws-crypto/sha256-js"; +import pathe from "pathe"; import { CompleteFileSystem, InMemoryFileSystem } from "../storage"; +export { pathe as path }; + export interface SHA256 { update(data: string | Uint8Array): void; // to base64 diff --git a/packages/core/src/env/index.ts b/packages/core/src/env/index.ts index 6d164da0fc9adb66dc70e22f27191ecf9da9c328..a88c1b3afddc66d895ee2401c3f4c3bd7755408c 100644 --- a/packages/core/src/env/index.ts +++ b/packages/core/src/env/index.ts @@ -2,6 +2,7 @@ import { ok } from "node:assert"; import { createHash, randomUUID } from "node:crypto"; import fs from "node:fs/promises"; import { EOL } from "node:os"; +import path from "node:path"; import type { CompleteFileSystem } from "../storage"; import type { SHA256 } from "./index.edge-light"; @@ -19,4 +20,4 @@ export function createSHA256(): SHA256 { export const defaultFS: CompleteFileSystem = fs; -export { EOL, ok, randomUUID }; +export { EOL, ok, path, randomUUID }; diff --git a/packages/core/src/storage/StorageContext.ts b/packages/core/src/storage/StorageContext.ts index 06658ca20488e824572491f5b2d56a2de10aa6bb..50e973a08f9e942babd91f097b048aaa9cd1681f 100644 --- a/packages/core/src/storage/StorageContext.ts +++ b/packages/core/src/storage/StorageContext.ts @@ -1,5 +1,4 @@ -import path from "path"; -import { defaultFS } from "../env"; +import { defaultFS, path } from "../env"; import { GenericFileSystem } from "./FileSystem"; import { DEFAULT_IMAGE_VECTOR_NAMESPACE, DEFAULT_NAMESPACE } from "./constants"; import { SimpleDocumentStore } from "./docStore/SimpleDocumentStore"; diff --git a/packages/core/src/storage/docStore/SimpleDocumentStore.ts b/packages/core/src/storage/docStore/SimpleDocumentStore.ts index 453d76a7c7e4ce28e4231667bc5b89acdcec2464..c05d93424f77e3c44b418e8baefee5fa5d2e6b19 100644 --- a/packages/core/src/storage/docStore/SimpleDocumentStore.ts +++ b/packages/core/src/storage/docStore/SimpleDocumentStore.ts @@ -1,6 +1,5 @@ import _ from "lodash"; -import path from "path"; -import { defaultFS } from "../../env"; +import { defaultFS, path } from "../../env"; import { GenericFileSystem } from "../FileSystem"; import { DEFAULT_DOC_STORE_PERSIST_FILENAME, diff --git a/packages/core/src/storage/indexStore/SimpleIndexStore.ts b/packages/core/src/storage/indexStore/SimpleIndexStore.ts index 4ab7c0530548f325096ae4831df356e3c8679eb2..faa68ac3f31763d1af80a16439f732cc16cf8249 100644 --- a/packages/core/src/storage/indexStore/SimpleIndexStore.ts +++ b/packages/core/src/storage/indexStore/SimpleIndexStore.ts @@ -1,5 +1,4 @@ -import path from "path"; -import { defaultFS } from "../../env"; +import { defaultFS, path } from "../../env"; import { GenericFileSystem } from "../FileSystem"; import { DEFAULT_INDEX_STORE_PERSIST_FILENAME, diff --git a/packages/core/src/storage/kvStore/SimpleKVStore.ts b/packages/core/src/storage/kvStore/SimpleKVStore.ts index 6581d3711d7715875280fc58dabf8157590ecaa0..30c932debdad9ae390889c4546abd1d9f5040c19 100644 --- a/packages/core/src/storage/kvStore/SimpleKVStore.ts +++ b/packages/core/src/storage/kvStore/SimpleKVStore.ts @@ -1,6 +1,5 @@ import _ from "lodash"; -import path from "path"; -import { defaultFS } from "../../env"; +import { defaultFS, path } from "../../env"; import { GenericFileSystem, exists } from "../FileSystem"; import { DEFAULT_COLLECTION } from "../constants"; import { BaseKVStore } from "./types"; diff --git a/packages/core/src/storage/vectorStore/SimpleVectorStore.ts b/packages/core/src/storage/vectorStore/SimpleVectorStore.ts index 5a6679d8993c0eb81b08134161108f47000966a7..5c9170628440d1ea4e9d283dbec752f45a5e06b6 100644 --- a/packages/core/src/storage/vectorStore/SimpleVectorStore.ts +++ b/packages/core/src/storage/vectorStore/SimpleVectorStore.ts @@ -1,12 +1,11 @@ import _ from "lodash"; -import path from "path"; import { BaseNode } from "../../Node"; import { getTopKEmbeddings, getTopKEmbeddingsLearner, getTopKMMREmbeddings, } from "../../embeddings"; -import { defaultFS } from "../../env"; +import { defaultFS, path } from "../../env"; import { GenericFileSystem, exists } from "../FileSystem"; import { DEFAULT_PERSIST_DIR } from "../constants"; import { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c31ae4971eba292ab047612537cf9f5f0eb31dc..c68167bd11d4bc1b58871831776231f812bd50db 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -203,6 +203,9 @@ importers: papaparse: specifier: ^5.4.1 version: 5.4.1 + pathe: + specifier: ^1.1.2 + version: 1.1.2 pdfjs-dist: specifier: 4.0.269 version: 4.0.269 @@ -12207,6 +12210,10 @@ packages: dev: false optional: true + /pathe@1.1.2: + resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} + dev: false + /pdfjs-dist@4.0.269: resolution: {integrity: sha512-jjWO56tcOjnmPqDf8PmXDeZ781AGvpHMYI3HhNtaFKTRXXPaD1ArSrhVe38/XsrIQJ0onISCND/vuXaWJkiDWw==} engines: {node: '>=18'}