From ddf3aef7dcfb2bf2d102a04ea8e2a22cea201909 Mon Sep 17 00:00:00 2001
From: Thuc Pham <51660321+thucpn@users.noreply.github.com>
Date: Mon, 27 May 2024 18:20:27 +0700
Subject: [PATCH] remove node path
---
.../typescript/agent/tools/interpreter.ts | 8 +--
.../streaming/fastapi/app/api/routers/chat.py | 8 +--
.../nextjs/app/api/chat/stream-helper.ts | 9 +++-
.../app/components/ui/chat/chat-sources.tsx | 51 ++++---------------
.../components/ui/chat/widgets/PdfDialog.tsx | 5 +-
5 files changed, 27 insertions(+), 54 deletions(-)
diff --git a/templates/components/engines/typescript/agent/tools/interpreter.ts b/templates/components/engines/typescript/agent/tools/interpreter.ts
index d34aa6c1..cad7a0a0 100644
--- a/templates/components/engines/typescript/agent/tools/interpreter.ts
+++ b/templates/components/engines/typescript/agent/tools/interpreter.ts
@@ -15,7 +15,7 @@ export type InterpreterToolParams = {
fileServerURLPrefix?: string;
};
-export type InterpreterToolOuput = {
+export type InterpreterToolOutput = {
isError: boolean;
logs: Logs;
extraResult: InterpreterExtraResult[];
@@ -88,7 +88,7 @@ export class InterpreterTool implements BaseTool<InterpreterParameter> {
return this.codeInterpreter;
}
- public async codeInterpret(code: string): Promise<InterpreterToolOuput> {
+ public async codeInterpret(code: string): Promise<InterpreterToolOutput> {
console.log(
`\n${"=".repeat(50)}\n> Running following AI-generated code:\n${code}\n${"=".repeat(50)}`,
);
@@ -96,7 +96,7 @@ export class InterpreterTool implements BaseTool<InterpreterParameter> {
const exec = await interpreter.notebook.execCell(code);
if (exec.error) console.error("[Code Interpreter error]", exec.error);
const extraResult = await this.getExtraResult(exec.results[0]);
- const result: InterpreterToolOuput = {
+ const result: InterpreterToolOutput = {
isError: !!exec.error,
logs: exec.logs,
extraResult,
@@ -104,7 +104,7 @@ export class InterpreterTool implements BaseTool<InterpreterParameter> {
return result;
}
- async call(input: InterpreterParameter): Promise<InterpreterToolOuput> {
+ async call(input: InterpreterParameter): Promise<InterpreterToolOutput> {
const result = await this.codeInterpret(input.code);
await this.codeInterpreter?.close();
return result;
diff --git a/templates/types/streaming/fastapi/app/api/routers/chat.py b/templates/types/streaming/fastapi/app/api/routers/chat.py
index 1c022b4b..d3f2ce63 100644
--- a/templates/types/streaming/fastapi/app/api/routers/chat.py
+++ b/templates/types/streaming/fastapi/app/api/routers/chat.py
@@ -48,9 +48,11 @@ class _SourceNodes(BaseModel):
if not url:
file_name = metadata.get("file_name")
- if file_name:
- file_server_url_prefix = os.getenv("FILESERVER_URL_PREFIX", "")
- url = f"{file_server_url_prefix}/data/{file_name}"
+ url_prefix = os.getenv("FILESERVER_URL_PREFIX")
+ if not url_prefix:
+ print("Warning: FILESERVER_URL_PREFIX not set in environment variables")
+ if file_name and url_prefix:
+ url = f"{url_prefix}/data/{file_name}"
return cls(
id=source_node.node.node_id,
diff --git a/templates/types/streaming/nextjs/app/api/chat/stream-helper.ts b/templates/types/streaming/nextjs/app/api/chat/stream-helper.ts
index 574738e8..ffc5dfc5 100644
--- a/templates/types/streaming/nextjs/app/api/chat/stream-helper.ts
+++ b/templates/types/streaming/nextjs/app/api/chat/stream-helper.ts
@@ -21,9 +21,14 @@ function getNodeUrl(metadata: Metadata) {
const url = metadata["URL"];
if (url) return url;
const fileName = metadata["file_name"];
+ if (!process.env.FILESERVER_URL_PREFIX) {
+ console.warn(
+ "FILESERVER_URL_PREFIX is not set. File URLs will not be generated.",
+ );
+ return undefined;
+ }
if (fileName) {
- const fileServerUrlPrefix = process.env.FILESERVER_URL_PREFIX || "";
- return `${fileServerUrlPrefix}/data/${fileName}`;
+ return `${process.env.FILESERVER_URL_PREFIX}/data/${fileName}`;
}
return undefined;
}
diff --git a/templates/types/streaming/nextjs/app/components/ui/chat/chat-sources.tsx b/templates/types/streaming/nextjs/app/components/ui/chat/chat-sources.tsx
index fa32930a..eb51b9aa 100644
--- a/templates/types/streaming/nextjs/app/components/ui/chat/chat-sources.tsx
+++ b/templates/types/streaming/nextjs/app/components/ui/chat/chat-sources.tsx
@@ -2,11 +2,10 @@ import { Check, Copy } from "lucide-react";
import { useMemo } from "react";
import { Button } from "../button";
import { HoverCard, HoverCardContent, HoverCardTrigger } from "../hover-card";
-import { SourceData, SourceNode } from "./index";
+import { SourceData } from "./index";
import { useCopyToClipboard } from "./use-copy-to-clipboard";
import PdfDialog from "./widgets/PdfDialog";
-const DATA_SOURCE_FOLDER = "data";
const SCORE_THRESHOLD = 0.3;
function SourceNumberButton({ index }: { index: number }) {
@@ -17,45 +16,11 @@ function SourceNumberButton({ index }: { index: number }) {
);
}
-enum NODE_TYPE {
- URL,
- FILE,
- UNKNOWN,
-}
-
type NodeInfo = {
id: string;
- type: NODE_TYPE;
- path?: string;
url?: string;
};
-function getNodeInfo(node: SourceNode): NodeInfo {
- if (typeof node.metadata["URL"] === "string") {
- return {
- id: node.id,
- type: NODE_TYPE.URL,
- path: node.url,
- url: node.url,
- };
- }
- if (typeof node.metadata["file_path"] === "string") {
- const fileName = node.metadata["file_name"] as string;
- const filePath = `${DATA_SOURCE_FOLDER}/${fileName}`;
- return {
- id: node.id,
- type: NODE_TYPE.FILE,
- path: filePath,
- url: node.url,
- };
- }
-
- return {
- id: node.id,
- type: NODE_TYPE.UNKNOWN,
- };
-}
-
export function ChatSources({ data }: { data: SourceData }) {
const sources: NodeInfo[] = useMemo(() => {
// aggregate nodes by url or file_path (get the highest one by score)
@@ -65,8 +30,11 @@ export function ChatSources({ data }: { data: SourceData }) {
.filter((node) => (node.score ?? 1) > SCORE_THRESHOLD)
.sort((a, b) => (b.score ?? 1) - (a.score ?? 1))
.forEach((node) => {
- const nodeInfo = getNodeInfo(node);
- const key = nodeInfo.path ?? nodeInfo.id; // use id as key for UNKNOWN type
+ const nodeInfo = {
+ id: node.id,
+ url: node.url,
+ };
+ const key = nodeInfo.url ?? nodeInfo.id; // use id as key for UNKNOWN type
if (!nodesByPath[key]) {
nodesByPath[key] = nodeInfo;
}
@@ -82,13 +50,12 @@ export function ChatSources({ data }: { data: SourceData }) {
<span className="font-semibold">Sources:</span>
<div className="inline-flex gap-1 items-center">
{sources.map((nodeInfo: NodeInfo, index: number) => {
- if (nodeInfo.path?.endsWith(".pdf")) {
+ if (nodeInfo.url?.endsWith(".pdf")) {
return (
<PdfDialog
key={nodeInfo.id}
documentId={nodeInfo.id}
url={nodeInfo.url!}
- path={nodeInfo.path}
trigger={<SourceNumberButton index={index} />}
/>
);
@@ -114,13 +81,13 @@ export function ChatSources({ data }: { data: SourceData }) {
function NodeInfo({ nodeInfo }: { nodeInfo: NodeInfo }) {
const { isCopied, copyToClipboard } = useCopyToClipboard({ timeout: 1000 });
- if (nodeInfo.type !== NODE_TYPE.UNKNOWN) {
+ if (nodeInfo.url) {
// this is a node generated by the web loader or file loader,
// add a link to view its URL and a button to copy the URL to the clipboard
return (
<div className="flex items-center my-2">
<a className="hover:text-blue-900" href={nodeInfo.url} target="_blank">
- <span>{nodeInfo.path}</span>
+ <span>{nodeInfo.url}</span>
</a>
<Button
onClick={() => copyToClipboard(nodeInfo.url!)}
diff --git a/templates/types/streaming/nextjs/app/components/ui/chat/widgets/PdfDialog.tsx b/templates/types/streaming/nextjs/app/components/ui/chat/widgets/PdfDialog.tsx
index 00274546..42c2ad47 100644
--- a/templates/types/streaming/nextjs/app/components/ui/chat/widgets/PdfDialog.tsx
+++ b/templates/types/streaming/nextjs/app/components/ui/chat/widgets/PdfDialog.tsx
@@ -12,7 +12,6 @@ import {
export interface PdfDialogProps {
documentId: string;
- path: string;
url: string;
trigger: React.ReactNode;
}
@@ -26,13 +25,13 @@ export default function PdfDialog(props: PdfDialogProps) {
<div className="space-y-2">
<DrawerTitle>PDF Content</DrawerTitle>
<DrawerDescription>
- File path:{" "}
+ File URL:{" "}
<a
className="hover:text-blue-900"
href={props.url}
target="_blank"
>
- {props.path}
+ {props.url}
</a>
</DrawerDescription>
</div>
--
GitLab