From c71495f22f06fcf6e383d26599f166cdf4c54ad4 Mon Sep 17 00:00:00 2001
From: Yi Ding <yi.s.ding@gmail.com>
Date: Wed, 14 Jun 2023 22:56:38 -0700
Subject: [PATCH] fixed up package structure
---
apps/simple/index.ts | 6 +-
apps/simple/package.json | 5 +-
packages/core/package.json | 7 +-
packages/core/{Index.ts => src/BaseIndex.ts} | 0
packages/core/{ => src}/Document.ts | 0
packages/core/{ => src}/Embedding.ts | 0
packages/core/{ => src}/LLMPredictor.ts | 0
packages/core/{ => src}/Node.ts | 0
packages/core/{ => src}/Prompt.ts | 0
packages/core/{ => src}/QueryEngine.ts | 0
packages/core/{ => src}/Reader.ts | 0
packages/core/{ => src}/Response.ts | 0
.../core/{ => src}/ResponseSynthesizer.ts | 0
packages/core/{ => src}/Retriever.ts | 0
packages/core/{ => src}/ServiceContext.ts | 0
packages/core/{ => src}/StorageContext.ts | 0
packages/core/src/index.ts | 0
packages/core/{ => src}/openai.ts | 0
packages/core/tsconfig.json | 13 ++++
pnpm-lock.yaml | 76 +++++++++++++++++++
20 files changed, 102 insertions(+), 5 deletions(-)
rename packages/core/{Index.ts => src/BaseIndex.ts} (100%)
rename packages/core/{ => src}/Document.ts (100%)
rename packages/core/{ => src}/Embedding.ts (100%)
rename packages/core/{ => src}/LLMPredictor.ts (100%)
rename packages/core/{ => src}/Node.ts (100%)
rename packages/core/{ => src}/Prompt.ts (100%)
rename packages/core/{ => src}/QueryEngine.ts (100%)
rename packages/core/{ => src}/Reader.ts (100%)
rename packages/core/{ => src}/Response.ts (100%)
rename packages/core/{ => src}/ResponseSynthesizer.ts (100%)
rename packages/core/{ => src}/Retriever.ts (100%)
rename packages/core/{ => src}/ServiceContext.ts (100%)
rename packages/core/{ => src}/StorageContext.ts (100%)
create mode 100644 packages/core/src/index.ts
rename packages/core/{ => src}/openai.ts (100%)
create mode 100644 packages/core/tsconfig.json
diff --git a/apps/simple/index.ts b/apps/simple/index.ts
index 0e287557e..254c8703f 100644
--- a/apps/simple/index.ts
+++ b/apps/simple/index.ts
@@ -1,9 +1,9 @@
-import { Document } from "../../packages/core/Document";
-import { VectorStoreIndex } from "../../packages/core/Index";
+import { Document } from "@llamaindex/core/src/Document";
+import { VectorStoreIndex } from "@llamaindex/core/src/BaseIndex";
import essay from "./essay";
const document = new Document("doc1", essay);
const index = VectorStoreIndex.fromDocuments([document]);
const queryEngine = index.asQueryEngine();
-const response = queryEngine.query("foo");
+const response = await queryEngine.aquery("foo");
console.log(response);
diff --git a/apps/simple/package.json b/apps/simple/package.json
index 6d41fe69c..dfde9dc87 100644
--- a/apps/simple/package.json
+++ b/apps/simple/package.json
@@ -1,3 +1,6 @@
{
- "name": "simple"
+ "name": "simple",
+ "dependencies": {
+ "@llamaindex/core": "workspace:*"
+ }
}
diff --git a/packages/core/package.json b/packages/core/package.json
index bf9c32aca..09b49c39c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,3 +1,8 @@
{
- "name": "core"
+ "name": "@llamaindex/core",
+ "dependencies": {
+ "openai": "latest"
+ },
+ "main": "src/index.ts",
+ "types": "src/index.ts"
}
diff --git a/packages/core/Index.ts b/packages/core/src/BaseIndex.ts
similarity index 100%
rename from packages/core/Index.ts
rename to packages/core/src/BaseIndex.ts
diff --git a/packages/core/Document.ts b/packages/core/src/Document.ts
similarity index 100%
rename from packages/core/Document.ts
rename to packages/core/src/Document.ts
diff --git a/packages/core/Embedding.ts b/packages/core/src/Embedding.ts
similarity index 100%
rename from packages/core/Embedding.ts
rename to packages/core/src/Embedding.ts
diff --git a/packages/core/LLMPredictor.ts b/packages/core/src/LLMPredictor.ts
similarity index 100%
rename from packages/core/LLMPredictor.ts
rename to packages/core/src/LLMPredictor.ts
diff --git a/packages/core/Node.ts b/packages/core/src/Node.ts
similarity index 100%
rename from packages/core/Node.ts
rename to packages/core/src/Node.ts
diff --git a/packages/core/Prompt.ts b/packages/core/src/Prompt.ts
similarity index 100%
rename from packages/core/Prompt.ts
rename to packages/core/src/Prompt.ts
diff --git a/packages/core/QueryEngine.ts b/packages/core/src/QueryEngine.ts
similarity index 100%
rename from packages/core/QueryEngine.ts
rename to packages/core/src/QueryEngine.ts
diff --git a/packages/core/Reader.ts b/packages/core/src/Reader.ts
similarity index 100%
rename from packages/core/Reader.ts
rename to packages/core/src/Reader.ts
diff --git a/packages/core/Response.ts b/packages/core/src/Response.ts
similarity index 100%
rename from packages/core/Response.ts
rename to packages/core/src/Response.ts
diff --git a/packages/core/ResponseSynthesizer.ts b/packages/core/src/ResponseSynthesizer.ts
similarity index 100%
rename from packages/core/ResponseSynthesizer.ts
rename to packages/core/src/ResponseSynthesizer.ts
diff --git a/packages/core/Retriever.ts b/packages/core/src/Retriever.ts
similarity index 100%
rename from packages/core/Retriever.ts
rename to packages/core/src/Retriever.ts
diff --git a/packages/core/ServiceContext.ts b/packages/core/src/ServiceContext.ts
similarity index 100%
rename from packages/core/ServiceContext.ts
rename to packages/core/src/ServiceContext.ts
diff --git a/packages/core/StorageContext.ts b/packages/core/src/StorageContext.ts
similarity index 100%
rename from packages/core/StorageContext.ts
rename to packages/core/src/StorageContext.ts
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/core/openai.ts b/packages/core/src/openai.ts
similarity index 100%
rename from packages/core/openai.ts
rename to packages/core/src/openai.ts
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
new file mode 100644
index 000000000..67f916782
--- /dev/null
+++ b/packages/core/tsconfig.json
@@ -0,0 +1,13 @@
+{
+ "compilerOptions": {
+ "esModuleInterop": true,
+ "forceConsistentCasingInFileNames": true,
+ "isolatedModules": true,
+ "moduleResolution": "node",
+ "preserveWatchOutput": true,
+ "skipLibCheck": true,
+ "noEmit": true,
+ "strict": true
+ },
+ "exclude": ["node_modules"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b64c09263..c7c846944 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -61,6 +61,12 @@ importers:
specifier: ^4.5.3
version: 4.9.5
+ apps/simple:
+ dependencies:
+ '@llamaindex/core':
+ specifier: workspace:*
+ version: link:../../packages/core
+
apps/web:
dependencies:
next:
@@ -95,6 +101,12 @@ importers:
specifier: ^4.5.3
version: 4.9.5
+ packages/core:
+ dependencies:
+ openai:
+ specifier: latest
+ version: 3.3.0
+
packages/eslint-config-custom:
dependencies:
eslint-config-next:
@@ -652,6 +664,10 @@ packages:
resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
engines: {node: '>=8'}
+ /asynckit@0.4.0:
+ resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+ dev: false
+
/available-typed-arrays@1.0.5:
resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
engines: {node: '>= 0.4'}
@@ -662,6 +678,14 @@ packages:
engines: {node: '>=4'}
dev: false
+ /axios@0.26.1:
+ resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
+ dependencies:
+ follow-redirects: 1.15.2
+ transitivePeerDependencies:
+ - debug
+ dev: false
+
/axobject-query@3.1.1:
resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==}
dependencies:
@@ -852,6 +876,13 @@ packages:
/color-name@1.1.4:
resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+ /combined-stream@1.0.8:
+ resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+ engines: {node: '>= 0.8'}
+ dependencies:
+ delayed-stream: 1.0.0
+ dev: false
+
/commander@10.0.1:
resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
engines: {node: '>=14'}
@@ -996,6 +1027,11 @@ packages:
slash: 3.0.0
dev: true
+ /delayed-stream@1.0.0:
+ resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+ engines: {node: '>=0.4.0'}
+ dev: false
+
/diff@4.0.2:
resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
engines: {node: '>=0.3.1'}
@@ -1563,12 +1599,31 @@ packages:
/flatted@3.2.7:
resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
+ /follow-redirects@1.15.2:
+ resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+ engines: {node: '>=4.0'}
+ peerDependencies:
+ debug: '*'
+ peerDependenciesMeta:
+ debug:
+ optional: true
+ dev: false
+
/for-each@0.3.3:
resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
dependencies:
is-callable: 1.2.7
dev: false
+ /form-data@4.0.0:
+ resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
+ engines: {node: '>= 6'}
+ dependencies:
+ asynckit: 0.4.0
+ combined-stream: 1.0.8
+ mime-types: 2.1.35
+ dev: false
+
/fs-extra@10.1.0:
resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
engines: {node: '>=12'}
@@ -2217,6 +2272,18 @@ packages:
braces: 3.0.2
picomatch: 2.3.1
+ /mime-db@1.52.0:
+ resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+ engines: {node: '>= 0.6'}
+ dev: false
+
+ /mime-types@2.1.35:
+ resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+ engines: {node: '>= 0.6'}
+ dependencies:
+ mime-db: 1.52.0
+ dev: false
+
/mimic-fn@2.1.0:
resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
engines: {node: '>=6'}
@@ -2445,6 +2512,15 @@ packages:
is-wsl: 2.2.0
dev: false
+ /openai@3.3.0:
+ resolution: {integrity: sha512-uqxI/Au+aPRnsaQRe8CojU0eCR7I0mBiKjD3sNMzY6DaC1ZVrc85u98mtJW6voDug8fgGN+DIZmTDxTthxb7dQ==}
+ dependencies:
+ axios: 0.26.1
+ form-data: 4.0.0
+ transitivePeerDependencies:
+ - debug
+ dev: false
+
/optionator@0.9.1:
resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
engines: {node: '>= 0.8.0'}
--
GitLab