From 9a844f3c34a6211e3813a04a0dbd46b4b7840be9 Mon Sep 17 00:00:00 2001
From: Yi Ding <yi.s.ding@gmail.com>
Date: Wed, 14 Jun 2023 22:42:13 -0700
Subject: [PATCH] reader and queryengine update
---
apps/simple/package.json | 3 +++
packages/core/QueryEngine.ts | 8 +-------
packages/core/Reader.ts | 17 +++++++++++++++++
packages/core/ServiceContext.ts | 2 +-
packages/core/openai.ts | 7 ++++++-
packages/core/package.json | 3 +++
6 files changed, 31 insertions(+), 9 deletions(-)
create mode 100644 apps/simple/package.json
create mode 100644 packages/core/package.json
diff --git a/apps/simple/package.json b/apps/simple/package.json
new file mode 100644
index 000000000..6d41fe69c
--- /dev/null
+++ b/apps/simple/package.json
@@ -0,0 +1,3 @@
+{
+ "name": "simple"
+}
diff --git a/packages/core/QueryEngine.ts b/packages/core/QueryEngine.ts
index 9a8cbdbc0..fb3acbf3b 100644
--- a/packages/core/QueryEngine.ts
+++ b/packages/core/QueryEngine.ts
@@ -1,13 +1,7 @@
import { Response } from "./Response";
export class BaseQueryEngine {
- query(q: string): Response {
+ async aquery(q: string): Promise<Response> {
return new Response();
}
-
- aquery(q: string): Promise<Response> {
- return new Promise<Response>((resolve, reject) => {
- resolve(new Response());
- });
- }
}
diff --git a/packages/core/Reader.ts b/packages/core/Reader.ts
index e69de29bb..90a25a44e 100644
--- a/packages/core/Reader.ts
+++ b/packages/core/Reader.ts
@@ -0,0 +1,17 @@
+import { Document } from "./Document";
+
+export interface BaseReader {
+ loadData(...args: any[]): Promise<Document>;
+}
+
+export class SimpleDirectoryReader implements BaseReader {
+ async loadData(options) {
+ return new Document("1", "");
+ }
+}
+
+export class PDFReader implements BaseReader {
+ async loadData(options) {
+ return new Document("1", "");
+ }
+}
diff --git a/packages/core/ServiceContext.ts b/packages/core/ServiceContext.ts
index ab5d9a760..10fcb25b9 100644
--- a/packages/core/ServiceContext.ts
+++ b/packages/core/ServiceContext.ts
@@ -1,6 +1,6 @@
interface ServiceContext {
llmPredictor?: any;
- promptHelper: any;
+ // promptHelper: any;
embedModel: any;
nodeParser: any;
// llamaLogger: any;
diff --git a/packages/core/openai.ts b/packages/core/openai.ts
index 794267fc4..d22971cf6 100644
--- a/packages/core/openai.ts
+++ b/packages/core/openai.ts
@@ -33,9 +33,14 @@ interface FunctionMessage {
export type Message = ChatMessage | FunctionMessage;
+interface Function {
+ name: string;
+}
+
export const getChatCompletions = async (
messages: Message[],
- model = "gpt-3.5-turbo"
+ model = "gpt-3.5-turbo",
+ functions: Function[] | null = null
) => {
return await fetch(OPENAI_CHAT_COMPLETIONS_URL, {
method: "POST",
diff --git a/packages/core/package.json b/packages/core/package.json
new file mode 100644
index 000000000..bf9c32aca
--- /dev/null
+++ b/packages/core/package.json
@@ -0,0 +1,3 @@
+{
+ "name": "core"
+}
--
GitLab