mirror of
https://github.com/onyx-dot-app/onyx.git
synced 2026-02-23 10:45:44 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58b5db8491 |
@@ -3,8 +3,8 @@ set -e
|
||||
|
||||
cleanup() {
|
||||
echo "Error occurred. Cleaning up..."
|
||||
docker stop onyx_postgres onyx_vespa onyx_redis onyx_minio 2>/dev/null || true
|
||||
docker rm onyx_postgres onyx_vespa onyx_redis onyx_minio 2>/dev/null || true
|
||||
docker stop onyx_postgres onyx_vespa onyx_redis onyx_minio onyx_code_interpreter 2>/dev/null || true
|
||||
docker rm onyx_postgres onyx_vespa onyx_redis onyx_minio onyx_code_interpreter 2>/dev/null || true
|
||||
}
|
||||
|
||||
# Trap errors and output a message, then cleanup
|
||||
@@ -20,8 +20,8 @@ MINIO_VOLUME=${4:-""} # Default is empty if not provided
|
||||
|
||||
# Stop and remove the existing containers
|
||||
echo "Stopping and removing existing containers..."
|
||||
docker stop onyx_postgres onyx_vespa onyx_redis onyx_minio 2>/dev/null || true
|
||||
docker rm onyx_postgres onyx_vespa onyx_redis onyx_minio 2>/dev/null || true
|
||||
docker stop onyx_postgres onyx_vespa onyx_redis onyx_minio onyx_code_interpreter 2>/dev/null || true
|
||||
docker rm onyx_postgres onyx_vespa onyx_redis onyx_minio onyx_code_interpreter 2>/dev/null || true
|
||||
|
||||
# Start the PostgreSQL container with optional volume
|
||||
echo "Starting PostgreSQL container..."
|
||||
@@ -55,6 +55,10 @@ else
|
||||
docker run --detach --name onyx_minio --publish 9004:9000 --publish 9005:9001 -e MINIO_ROOT_USER=minioadmin -e MINIO_ROOT_PASSWORD=minioadmin minio/minio server /data --console-address ":9001"
|
||||
fi
|
||||
|
||||
# Start the Code Interpreter container
|
||||
echo "Starting Code Interpreter container..."
|
||||
docker run --detach --name onyx_code_interpreter --publish 8000:8000 --user root -v /var/run/docker.sock:/var/run/docker.sock onyxdotapp/code-interpreter:latest bash ./entrypoint.sh code-interpreter-api
|
||||
|
||||
# Ensure alembic runs in the correct directory (backend/)
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
||||
PARENT_DIR="$(dirname "$SCRIPT_DIR")"
|
||||
|
||||
@@ -487,16 +487,7 @@ services:
|
||||
|
||||
code-interpreter:
|
||||
image: onyxdotapp/code-interpreter:${CODE_INTERPRETER_IMAGE_TAG:-latest}
|
||||
entrypoint: ["/bin/bash", "-c"]
|
||||
command: >
|
||||
"
|
||||
if [ \"$${CODE_INTERPRETER_BETA_ENABLED}\" = \"True\" ] || [ \"$${CODE_INTERPRETER_BETA_ENABLED}\" = \"true\" ]; then
|
||||
exec bash ./entrypoint.sh code-interpreter-api;
|
||||
else
|
||||
echo 'Skipping code interpreter';
|
||||
exec tail -f /dev/null;
|
||||
fi
|
||||
"
|
||||
command: ["bash", "./entrypoint.sh", "code-interpreter-api"]
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- path: .env
|
||||
|
||||
@@ -69,6 +69,4 @@ services:
|
||||
inference_model_server:
|
||||
profiles: ["inference"]
|
||||
|
||||
# Code interpreter is not needed in minimal mode.
|
||||
code-interpreter:
|
||||
profiles: ["code-interpreter"]
|
||||
code-interpreter: {}
|
||||
|
||||
@@ -315,16 +315,7 @@ services:
|
||||
|
||||
code-interpreter:
|
||||
image: onyxdotapp/code-interpreter:${CODE_INTERPRETER_IMAGE_TAG:-latest}
|
||||
entrypoint: ["/bin/bash", "-c"]
|
||||
command: >
|
||||
"
|
||||
if [ \"$${CODE_INTERPRETER_BETA_ENABLED}\" = \"True\" ] || [ \"$${CODE_INTERPRETER_BETA_ENABLED}\" = \"true\" ]; then
|
||||
exec bash ./entrypoint.sh code-interpreter-api;
|
||||
else
|
||||
echo 'Skipping code interpreter';
|
||||
exec tail -f /dev/null;
|
||||
fi
|
||||
"
|
||||
command: ["bash", "./entrypoint.sh", "code-interpreter-api"]
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- path: .env
|
||||
|
||||
@@ -352,16 +352,7 @@ services:
|
||||
|
||||
code-interpreter:
|
||||
image: onyxdotapp/code-interpreter:${CODE_INTERPRETER_IMAGE_TAG:-latest}
|
||||
entrypoint: ["/bin/bash", "-c"]
|
||||
command: >
|
||||
"
|
||||
if [ \"$${CODE_INTERPRETER_BETA_ENABLED}\" = \"True\" ] || [ \"$${CODE_INTERPRETER_BETA_ENABLED}\" = \"true\" ]; then
|
||||
exec bash ./entrypoint.sh code-interpreter-api;
|
||||
else
|
||||
echo 'Skipping code interpreter';
|
||||
exec tail -f /dev/null;
|
||||
fi
|
||||
"
|
||||
command: ["bash", "./entrypoint.sh", "code-interpreter-api"]
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- path: .env
|
||||
|
||||
@@ -527,16 +527,7 @@ services:
|
||||
|
||||
code-interpreter:
|
||||
image: onyxdotapp/code-interpreter:${CODE_INTERPRETER_IMAGE_TAG:-latest}
|
||||
entrypoint: ["/bin/bash", "-c"]
|
||||
command: >
|
||||
"
|
||||
if [ \"$${CODE_INTERPRETER_BETA_ENABLED}\" = \"True\" ] || [ \"$${CODE_INTERPRETER_BETA_ENABLED}\" = \"true\" ]; then
|
||||
exec bash ./entrypoint.sh code-interpreter-api;
|
||||
else
|
||||
echo 'Skipping code interpreter';
|
||||
exec tail -f /dev/null;
|
||||
fi
|
||||
"
|
||||
command: ["bash", "./entrypoint.sh", "code-interpreter-api"]
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- path: .env
|
||||
|
||||
@@ -955,9 +955,9 @@ minio:
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
|
||||
# Code Interpreter - Python code execution service (beta feature)
|
||||
# Code Interpreter - Python code execution service
|
||||
codeInterpreter:
|
||||
enabled: false # Disabled by default (beta feature)
|
||||
enabled: true
|
||||
|
||||
replicaCount: 1
|
||||
|
||||
|
||||
@@ -7,27 +7,15 @@ interface LinguistLanguage {
|
||||
filenames?: string[];
|
||||
}
|
||||
|
||||
const allLanguages = Object.values(languages) as LinguistLanguage[];
|
||||
|
||||
// Collect extensions that linguist-languages assigns to "Markdown" so we can
|
||||
// exclude them from the code-language map (some programming languages also
|
||||
// claim `.md`).
|
||||
const markdownExtensions = new Set(
|
||||
allLanguages
|
||||
.find((lang) => lang.name === "Markdown")
|
||||
?.extensions?.map((ext) => ext.toLowerCase()) ?? []
|
||||
);
|
||||
|
||||
// Build extension → language name and filename → language name maps at module load
|
||||
const extensionMap = new Map<string, string>();
|
||||
const filenameMap = new Map<string, string>();
|
||||
|
||||
for (const lang of allLanguages) {
|
||||
for (const lang of Object.values(languages) as LinguistLanguage[]) {
|
||||
if (lang.type !== "programming") continue;
|
||||
|
||||
const name = lang.name.toLowerCase();
|
||||
for (const ext of lang.extensions ?? []) {
|
||||
if (markdownExtensions.has(ext)) continue;
|
||||
// First language to claim an extension wins
|
||||
if (!extensionMap.has(ext)) {
|
||||
extensionMap.set(ext, name);
|
||||
@@ -50,12 +38,3 @@ export function getCodeLanguage(name: string): string | null {
|
||||
const ext = lower.match(/\.[^.]+$/)?.[0];
|
||||
return (ext && extensionMap.get(ext)) ?? filenameMap.get(lower) ?? null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the file name has a Markdown extension (as defined by
|
||||
* linguist-languages) and should be rendered as rich text rather than code.
|
||||
*/
|
||||
export function isMarkdownFile(name: string): boolean {
|
||||
const ext = name.toLowerCase().match(/\.[^.]+$/)?.[0];
|
||||
return !!ext && markdownExtensions.has(ext);
|
||||
}
|
||||
|
||||
@@ -25,7 +25,9 @@ import { AppPopup } from "@/app/app/components/AppPopup";
|
||||
import ExceptionTraceModal from "@/components/modals/ExceptionTraceModal";
|
||||
import { useUser } from "@/providers/UserProvider";
|
||||
import NoAssistantModal from "@/components/modals/NoAssistantModal";
|
||||
import PreviewModal from "@/sections/modals/PreviewModal";
|
||||
import TextViewModal from "@/sections/modals/TextViewModal";
|
||||
import CodeViewModal from "@/sections/modals/CodeViewModal";
|
||||
import { getCodeLanguage } from "@/lib/languages";
|
||||
import Modal from "@/refresh-components/Modal";
|
||||
import { useSendMessageToParent } from "@/lib/extension/utils";
|
||||
import { SUBMIT_MESSAGE_TYPES } from "@/lib/extension/constants";
|
||||
@@ -684,12 +686,18 @@ export default function AppPage({ firstMessage }: ChatPageProps) {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{presentingDocument && (
|
||||
<PreviewModal
|
||||
presentingDocument={presentingDocument}
|
||||
onClose={() => setPresentingDocument(null)}
|
||||
/>
|
||||
)}
|
||||
{presentingDocument &&
|
||||
(getCodeLanguage(presentingDocument.semantic_identifier || "") ? (
|
||||
<CodeViewModal
|
||||
presentingDocument={presentingDocument}
|
||||
onClose={() => setPresentingDocument(null)}
|
||||
/>
|
||||
) : (
|
||||
<TextViewModal
|
||||
presentingDocument={presentingDocument}
|
||||
onClose={() => setPresentingDocument(null)}
|
||||
/>
|
||||
))}
|
||||
|
||||
{stackTraceModalContent && (
|
||||
<ExceptionTraceModal
|
||||
|
||||
188
web/src/sections/modals/CodeViewModal.tsx
Normal file
188
web/src/sections/modals/CodeViewModal.tsx
Normal file
@@ -0,0 +1,188 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect, useMemo } from "react";
|
||||
import { MinimalOnyxDocument } from "@/lib/search/interfaces";
|
||||
import Modal from "@/refresh-components/Modal";
|
||||
import Text from "@/refresh-components/texts/Text";
|
||||
import CopyIconButton from "@/refresh-components/buttons/CopyIconButton";
|
||||
import SimpleLoader from "@/refresh-components/loaders/SimpleLoader";
|
||||
import { Button } from "@opal/components";
|
||||
import { SvgDownload } from "@opal/icons";
|
||||
import { Section } from "@/layouts/general-layouts";
|
||||
import { getCodeLanguage } from "@/lib/languages";
|
||||
import MinimalMarkdown from "@/components/chat/MinimalMarkdown";
|
||||
import { CodeBlock } from "@/app/app/message/CodeBlock";
|
||||
import { extractCodeText } from "@/app/app/message/codeUtils";
|
||||
import { fetchChatFile } from "@/lib/chat/svc";
|
||||
|
||||
export interface CodeViewProps {
|
||||
presentingDocument: MinimalOnyxDocument;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export default function CodeViewModal({
|
||||
presentingDocument,
|
||||
onClose,
|
||||
}: CodeViewProps) {
|
||||
const [fileContent, setFileContent] = useState("");
|
||||
const [fileUrl, setFileUrl] = useState("");
|
||||
const [fileName, setFileName] = useState("");
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [loadError, setLoadError] = useState<string | null>(null);
|
||||
|
||||
const language =
|
||||
getCodeLanguage(presentingDocument.semantic_identifier || "") ||
|
||||
"plaintext";
|
||||
|
||||
const lineCount = useMemo(() => {
|
||||
if (!fileContent) return 0;
|
||||
return fileContent.split("\n").length;
|
||||
}, [fileContent]);
|
||||
|
||||
const fileSize = useMemo(() => {
|
||||
if (!fileContent) return "";
|
||||
const bytes = new TextEncoder().encode(fileContent).length;
|
||||
if (bytes < 1024) return `${bytes} B`;
|
||||
const kb = bytes / 1024;
|
||||
if (kb < 1024) return `${kb.toFixed(2)} KB`;
|
||||
const mb = kb / 1024;
|
||||
return `${mb.toFixed(2)} MB`;
|
||||
}, [fileContent]);
|
||||
|
||||
const headerDescription = useMemo(() => {
|
||||
if (!fileContent) return "";
|
||||
return `${language} - ${lineCount} ${
|
||||
lineCount === 1 ? "line" : "lines"
|
||||
} · ${fileSize}`;
|
||||
}, [fileContent, language, lineCount, fileSize]);
|
||||
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
setIsLoading(true);
|
||||
setLoadError(null);
|
||||
setFileContent("");
|
||||
const fileIdLocal =
|
||||
presentingDocument.document_id.split("__")[1] ||
|
||||
presentingDocument.document_id;
|
||||
|
||||
try {
|
||||
const response = await fetchChatFile(fileIdLocal);
|
||||
const blob = await response.blob();
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
setFileUrl((prev) => {
|
||||
if (prev) {
|
||||
window.URL.revokeObjectURL(prev);
|
||||
}
|
||||
return url;
|
||||
});
|
||||
setFileName(presentingDocument.semantic_identifier || "document");
|
||||
setFileContent(await blob.text());
|
||||
} catch {
|
||||
setLoadError("Failed to load document.");
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
})();
|
||||
}, [presentingDocument]);
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
if (fileUrl) {
|
||||
window.URL.revokeObjectURL(fileUrl);
|
||||
}
|
||||
};
|
||||
}, [fileUrl]);
|
||||
|
||||
return (
|
||||
<Modal
|
||||
open
|
||||
onOpenChange={(open) => {
|
||||
if (!open) {
|
||||
onClose();
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Modal.Content
|
||||
width="md"
|
||||
height="lg"
|
||||
preventAccidentalClose={false}
|
||||
onOpenAutoFocus={(e) => e.preventDefault()}
|
||||
>
|
||||
<Modal.Header
|
||||
title={fileName || "Code"}
|
||||
description={headerDescription}
|
||||
onClose={onClose}
|
||||
/>
|
||||
|
||||
<Modal.Body padding={0} gap={0}>
|
||||
<Section padding={0} gap={0}>
|
||||
{isLoading ? (
|
||||
<Section>
|
||||
<SimpleLoader className="h-8 w-8" />
|
||||
</Section>
|
||||
) : loadError ? (
|
||||
<Section padding={1}>
|
||||
<Text text03 mainUiBody>
|
||||
{loadError}
|
||||
</Text>
|
||||
</Section>
|
||||
) : (
|
||||
<MinimalMarkdown
|
||||
content={`\`\`\`${language}\n${fileContent}\n\`\`\``}
|
||||
className="w-full h-full break-words"
|
||||
components={{
|
||||
code: ({
|
||||
node,
|
||||
className: codeClassName,
|
||||
children,
|
||||
...props
|
||||
}: any) => {
|
||||
const codeText = extractCodeText(
|
||||
node,
|
||||
fileContent,
|
||||
children
|
||||
);
|
||||
return (
|
||||
<CodeBlock className="" codeText={codeText}>
|
||||
{children}
|
||||
</CodeBlock>
|
||||
);
|
||||
},
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</Section>
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Section
|
||||
flexDirection="row"
|
||||
justifyContent="between"
|
||||
alignItems="center"
|
||||
>
|
||||
<Text text03 mainContentMuted>
|
||||
{lineCount} {lineCount === 1 ? "line" : "lines"}
|
||||
</Text>
|
||||
<Section flexDirection="row" gap={0.5} width="fit">
|
||||
<CopyIconButton
|
||||
getCopyText={() => fileContent}
|
||||
tooltip="Copy code"
|
||||
size="sm"
|
||||
/>
|
||||
<a
|
||||
href={fileUrl}
|
||||
download={fileName || presentingDocument.document_id}
|
||||
>
|
||||
<Button
|
||||
icon={SvgDownload}
|
||||
tooltip="Download"
|
||||
size="sm"
|
||||
prominence="tertiary"
|
||||
/>
|
||||
</a>
|
||||
</Section>
|
||||
</Section>
|
||||
</Modal.Footer>
|
||||
</Modal.Content>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -1,252 +0,0 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect, useCallback, useMemo } from "react";
|
||||
import { MinimalOnyxDocument } from "@/lib/search/interfaces";
|
||||
import Modal from "@/refresh-components/Modal";
|
||||
import Text from "@/refresh-components/texts/Text";
|
||||
import SimpleLoader from "@/refresh-components/loaders/SimpleLoader";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { Section } from "@/layouts/general-layouts";
|
||||
import { getCodeLanguage } from "@/lib/languages";
|
||||
import { fetchChatFile } from "@/lib/chat/svc";
|
||||
import {
|
||||
PreviewContext,
|
||||
resolveVariant,
|
||||
} from "@/sections/modals/PreviewModalVariants";
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// MIME resolution helper
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
function resolveMimeType(mimeType: string, fileName: string): string {
|
||||
if (mimeType !== "application/octet-stream") return mimeType;
|
||||
const lower = fileName.toLowerCase();
|
||||
if (lower.endsWith(".md") || lower.endsWith(".markdown"))
|
||||
return "text/markdown";
|
||||
if (lower.endsWith(".txt")) return "text/plain";
|
||||
if (lower.endsWith(".csv")) return "text/csv";
|
||||
return mimeType;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// PreviewModal
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
interface PreviewModalProps {
|
||||
presentingDocument: MinimalOnyxDocument;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export default function PreviewModal({
|
||||
presentingDocument,
|
||||
onClose,
|
||||
}: PreviewModalProps) {
|
||||
const [fileContent, setFileContent] = useState("");
|
||||
const [fileUrl, setFileUrl] = useState("");
|
||||
const [fileName, setFileName] = useState("");
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [loadError, setLoadError] = useState<string | null>(null);
|
||||
const [mimeType, setMimeType] = useState("application/octet-stream");
|
||||
const [zoom, setZoom] = useState(100);
|
||||
|
||||
// Resolve variant ----------------------------------------------------------
|
||||
|
||||
const variant = useMemo(
|
||||
() => resolveVariant(presentingDocument.semantic_identifier, mimeType),
|
||||
[presentingDocument.semantic_identifier, mimeType]
|
||||
);
|
||||
|
||||
// Derived values -----------------------------------------------------------
|
||||
|
||||
const language = useMemo(
|
||||
() =>
|
||||
getCodeLanguage(presentingDocument.semantic_identifier || "") ||
|
||||
"plaintext",
|
||||
[presentingDocument.semantic_identifier]
|
||||
);
|
||||
|
||||
const lineCount = useMemo(() => {
|
||||
if (!fileContent) return 0;
|
||||
return fileContent.split("\n").length;
|
||||
}, [fileContent]);
|
||||
|
||||
const fileSize = useMemo(() => {
|
||||
if (!fileContent) return "";
|
||||
const bytes = new TextEncoder().encode(fileContent).length;
|
||||
if (bytes < 1024) return `${bytes} B`;
|
||||
const kb = bytes / 1024;
|
||||
if (kb < 1024) return `${kb.toFixed(2)} KB`;
|
||||
const mb = kb / 1024;
|
||||
return `${mb.toFixed(2)} MB`;
|
||||
}, [fileContent]);
|
||||
|
||||
// File fetching ------------------------------------------------------------
|
||||
|
||||
const fetchFile = useCallback(async () => {
|
||||
setIsLoading(true);
|
||||
setLoadError(null);
|
||||
setFileContent("");
|
||||
const fileIdLocal =
|
||||
presentingDocument.document_id.split("__")[1] ||
|
||||
presentingDocument.document_id;
|
||||
|
||||
try {
|
||||
const response = await fetchChatFile(fileIdLocal);
|
||||
|
||||
const blob = await response.blob();
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
setFileUrl((prev) => {
|
||||
if (prev) window.URL.revokeObjectURL(prev);
|
||||
return url;
|
||||
});
|
||||
|
||||
const originalFileName =
|
||||
presentingDocument.semantic_identifier || "document";
|
||||
setFileName(originalFileName);
|
||||
|
||||
const rawContentType =
|
||||
response.headers.get("Content-Type") || "application/octet-stream";
|
||||
const resolvedMime = resolveMimeType(rawContentType, originalFileName);
|
||||
setMimeType(resolvedMime);
|
||||
|
||||
const resolved = resolveVariant(
|
||||
presentingDocument.semantic_identifier,
|
||||
resolvedMime
|
||||
);
|
||||
if (resolved.needsTextContent) {
|
||||
setFileContent(await blob.text());
|
||||
}
|
||||
} catch {
|
||||
setLoadError("Failed to load document.");
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
}, [presentingDocument]);
|
||||
|
||||
useEffect(() => {
|
||||
fetchFile();
|
||||
}, [fetchFile]);
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
if (fileUrl) window.URL.revokeObjectURL(fileUrl);
|
||||
};
|
||||
}, [fileUrl]);
|
||||
|
||||
// Actions ------------------------------------------------------------------
|
||||
|
||||
const handleDownload = useCallback(() => {
|
||||
const link = document.createElement("a");
|
||||
link.href = fileUrl;
|
||||
link.download = fileName || presentingDocument.document_id;
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
document.body.removeChild(link);
|
||||
}, [fileUrl, fileName, presentingDocument.document_id]);
|
||||
|
||||
const handleZoomIn = useCallback(
|
||||
() => setZoom((prev) => Math.min(prev + 25, 200)),
|
||||
[]
|
||||
);
|
||||
const handleZoomOut = useCallback(
|
||||
() => setZoom((prev) => Math.max(prev - 25, 25)),
|
||||
[]
|
||||
);
|
||||
|
||||
// Build context ------------------------------------------------------------
|
||||
|
||||
const ctx: PreviewContext = useMemo(
|
||||
() => ({
|
||||
fileContent,
|
||||
fileUrl,
|
||||
fileName,
|
||||
language,
|
||||
lineCount,
|
||||
fileSize,
|
||||
zoom,
|
||||
onZoomIn: handleZoomIn,
|
||||
onZoomOut: handleZoomOut,
|
||||
onDownload: handleDownload,
|
||||
}),
|
||||
[
|
||||
fileContent,
|
||||
fileUrl,
|
||||
fileName,
|
||||
language,
|
||||
lineCount,
|
||||
fileSize,
|
||||
zoom,
|
||||
handleZoomIn,
|
||||
handleZoomOut,
|
||||
handleDownload,
|
||||
]
|
||||
);
|
||||
|
||||
// Render -------------------------------------------------------------------
|
||||
|
||||
return (
|
||||
<Modal
|
||||
open
|
||||
onOpenChange={(open) => {
|
||||
if (!open) onClose();
|
||||
}}
|
||||
>
|
||||
<Modal.Content
|
||||
width={variant.width}
|
||||
height={variant.height}
|
||||
preventAccidentalClose={false}
|
||||
onOpenAutoFocus={(e) => e.preventDefault()}
|
||||
>
|
||||
<Modal.Header
|
||||
title={fileName || "Document"}
|
||||
description={variant.headerDescription(ctx)}
|
||||
onClose={onClose}
|
||||
/>
|
||||
|
||||
{/* Body + floating footer wrapper */}
|
||||
<Modal.Body padding={0} gap={0}>
|
||||
<Section padding={0} gap={0}>
|
||||
{isLoading ? (
|
||||
<Section>
|
||||
<SimpleLoader className="h-8 w-8" />
|
||||
</Section>
|
||||
) : loadError ? (
|
||||
<Section padding={1}>
|
||||
<Text text03 mainUiBody>
|
||||
{loadError}
|
||||
</Text>
|
||||
</Section>
|
||||
) : (
|
||||
variant.renderContent(ctx)
|
||||
)}
|
||||
</Section>
|
||||
</Modal.Body>
|
||||
|
||||
{/* Floating footer */}
|
||||
{!isLoading && !loadError && (
|
||||
<div
|
||||
className={cn(
|
||||
"absolute bottom-0 left-0 right-0",
|
||||
"flex items-center justify-between",
|
||||
"p-4 pointer-events-none w-full"
|
||||
)}
|
||||
style={{
|
||||
background:
|
||||
"linear-gradient(to top, var(--background-tint-01) 40%, transparent)",
|
||||
}}
|
||||
>
|
||||
{/* Left slot */}
|
||||
<div className="pointer-events-auto z-10">
|
||||
{variant.renderFooterLeft(ctx)}
|
||||
</div>
|
||||
|
||||
{/* Right slot */}
|
||||
<div className="pointer-events-auto z-10 rounded-12 bg-background-tint-00 p-1 shadow-lg">
|
||||
{variant.renderFooterRight(ctx)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</Modal.Content>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -1,398 +0,0 @@
|
||||
import React from "react";
|
||||
import {
|
||||
Table,
|
||||
TableBody,
|
||||
TableCell,
|
||||
TableHead,
|
||||
TableHeader,
|
||||
TableRow,
|
||||
} from "@/components/ui/table";
|
||||
import MinimalMarkdown from "@/components/chat/MinimalMarkdown";
|
||||
import { Button } from "@opal/components";
|
||||
import Text from "@/refresh-components/texts/Text";
|
||||
import { SvgDownload, SvgZoomIn, SvgZoomOut } from "@opal/icons";
|
||||
import ScrollIndicatorDiv from "@/refresh-components/ScrollIndicatorDiv";
|
||||
import CopyIconButton from "@/refresh-components/buttons/CopyIconButton";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { Section } from "@/layouts/general-layouts";
|
||||
import { getCodeLanguage, isMarkdownFile } from "@/lib/languages";
|
||||
import { CodeBlock } from "@/app/app/message/CodeBlock";
|
||||
import { extractCodeText } from "@/app/app/message/codeUtils";
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// PreviewContext — shared data bag passed into every variant
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
export interface PreviewContext {
|
||||
fileContent: string;
|
||||
fileUrl: string;
|
||||
fileName: string;
|
||||
language: string;
|
||||
lineCount: number;
|
||||
fileSize: string;
|
||||
zoom: number;
|
||||
onZoomIn: () => void;
|
||||
onZoomOut: () => void;
|
||||
onDownload: () => void;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// PreviewVariant — self-contained definition for a file-type view
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
export interface PreviewVariant {
|
||||
/** Return true if this variant should handle the given file. */
|
||||
matches: (semanticIdentifier: string | null, mimeType: string) => boolean;
|
||||
/** Modal width. */
|
||||
width: "lg" | "md" | "md-sm" | "sm";
|
||||
/** Modal height. */
|
||||
height: "fit" | "sm" | "lg" | "full";
|
||||
/** Whether the fetcher should read the blob as text. */
|
||||
needsTextContent: boolean;
|
||||
/** String shown below the title in the modal header. */
|
||||
headerDescription: (ctx: PreviewContext) => string;
|
||||
/** Body content. */
|
||||
renderContent: (ctx: PreviewContext) => React.ReactNode;
|
||||
/** Left side of the floating footer (e.g. line count text, zoom controls). Return null for nothing. */
|
||||
renderFooterLeft: (ctx: PreviewContext) => React.ReactNode;
|
||||
/** Right side of the floating footer (e.g. copy + download buttons). */
|
||||
renderFooterRight: (ctx: PreviewContext) => React.ReactNode;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Shared footer building blocks
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
function DownloadButton({ onDownload }: { onDownload: () => void }) {
|
||||
return (
|
||||
<Button
|
||||
prominence="tertiary"
|
||||
size="sm"
|
||||
icon={SvgDownload}
|
||||
onClick={onDownload}
|
||||
tooltip="Download"
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function CopyButton({ getText }: { getText: () => string }) {
|
||||
return (
|
||||
<CopyIconButton getCopyText={getText} tooltip="Copy content" size="sm" />
|
||||
);
|
||||
}
|
||||
|
||||
function ZoomControls({
|
||||
zoom,
|
||||
onZoomIn,
|
||||
onZoomOut,
|
||||
}: {
|
||||
zoom: number;
|
||||
onZoomIn: () => void;
|
||||
onZoomOut: () => void;
|
||||
}) {
|
||||
return (
|
||||
<div className="rounded-12 bg-background-tint-00 p-1 shadow-lg">
|
||||
<Section flexDirection="row" width="fit">
|
||||
<Button
|
||||
prominence="tertiary"
|
||||
size="sm"
|
||||
icon={SvgZoomOut}
|
||||
onClick={onZoomOut}
|
||||
tooltip="Zoom Out"
|
||||
/>
|
||||
<Text mainUiMono text03>
|
||||
{zoom}%
|
||||
</Text>
|
||||
<Button
|
||||
prominence="tertiary"
|
||||
size="sm"
|
||||
icon={SvgZoomIn}
|
||||
onClick={onZoomIn}
|
||||
tooltip="Zoom In"
|
||||
/>
|
||||
</Section>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Variants
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
const MARKDOWN_MIMES = [
|
||||
"text/markdown",
|
||||
"text/x-markdown",
|
||||
"text/plain",
|
||||
"text/x-rst",
|
||||
"text/x-org",
|
||||
];
|
||||
|
||||
const codeVariant: PreviewVariant = {
|
||||
matches: (name) => !!getCodeLanguage(name || ""),
|
||||
width: "md",
|
||||
height: "lg",
|
||||
needsTextContent: true,
|
||||
|
||||
headerDescription: (ctx) =>
|
||||
ctx.fileContent
|
||||
? `${ctx.language} - ${ctx.lineCount} ${
|
||||
ctx.lineCount === 1 ? "line" : "lines"
|
||||
} · ${ctx.fileSize}`
|
||||
: "",
|
||||
|
||||
renderContent: (ctx) => (
|
||||
<MinimalMarkdown
|
||||
content={`\`\`\`${ctx.language}${ctx.fileContent}\n\n\`\`\``}
|
||||
className="w-full break-words h-full"
|
||||
components={{
|
||||
code: ({ node, children }: any) => {
|
||||
const codeText = extractCodeText(node, ctx.fileContent, children);
|
||||
return (
|
||||
<CodeBlock className="" codeText={codeText}>
|
||||
{children}
|
||||
</CodeBlock>
|
||||
);
|
||||
},
|
||||
}}
|
||||
/>
|
||||
),
|
||||
|
||||
renderFooterLeft: (ctx) => (
|
||||
<Text text03 mainUiBody className="select-none">
|
||||
{ctx.lineCount} {ctx.lineCount === 1 ? "line" : "lines"}
|
||||
</Text>
|
||||
),
|
||||
|
||||
renderFooterRight: (ctx) => (
|
||||
<Section flexDirection="row" width="fit">
|
||||
<CopyButton getText={() => ctx.fileContent} />
|
||||
<DownloadButton onDownload={ctx.onDownload} />
|
||||
</Section>
|
||||
),
|
||||
};
|
||||
|
||||
const imageVariant: PreviewVariant = {
|
||||
matches: (_name, mime) => mime.startsWith("image/"),
|
||||
width: "lg",
|
||||
height: "full",
|
||||
needsTextContent: false,
|
||||
headerDescription: () => "",
|
||||
|
||||
renderContent: (ctx) => (
|
||||
<div
|
||||
className="flex flex-1 min-h-0 items-center justify-center p-4 transition-transform duration-300 ease-in-out"
|
||||
style={{
|
||||
transform: `scale(${ctx.zoom / 100})`,
|
||||
transformOrigin: "center",
|
||||
}}
|
||||
>
|
||||
<img
|
||||
src={ctx.fileUrl}
|
||||
alt={ctx.fileName}
|
||||
className="max-w-full max-h-full object-contain"
|
||||
/>
|
||||
</div>
|
||||
),
|
||||
|
||||
renderFooterLeft: (ctx) => (
|
||||
<ZoomControls
|
||||
zoom={ctx.zoom}
|
||||
onZoomIn={ctx.onZoomIn}
|
||||
onZoomOut={ctx.onZoomOut}
|
||||
/>
|
||||
),
|
||||
|
||||
renderFooterRight: (ctx) => (
|
||||
<Section flexDirection="row" width="fit">
|
||||
<CopyButton getText={() => ctx.fileContent} />
|
||||
<DownloadButton onDownload={ctx.onDownload} />
|
||||
</Section>
|
||||
),
|
||||
};
|
||||
|
||||
const pdfVariant: PreviewVariant = {
|
||||
matches: (_name, mime) => mime === "application/pdf",
|
||||
width: "lg",
|
||||
height: "full",
|
||||
needsTextContent: false,
|
||||
headerDescription: () => "",
|
||||
|
||||
renderContent: (ctx) => (
|
||||
<iframe
|
||||
src={`${ctx.fileUrl}#toolbar=0`}
|
||||
className="w-full h-full flex-1 min-h-0 border-none"
|
||||
title="PDF Viewer"
|
||||
/>
|
||||
),
|
||||
|
||||
renderFooterLeft: (ctx) => (
|
||||
<ZoomControls
|
||||
zoom={ctx.zoom}
|
||||
onZoomIn={ctx.onZoomIn}
|
||||
onZoomOut={ctx.onZoomOut}
|
||||
/>
|
||||
),
|
||||
renderFooterRight: (ctx) => (
|
||||
<Section flexDirection="row" width="fit">
|
||||
<CopyButton getText={() => ctx.fileContent} />
|
||||
<DownloadButton onDownload={ctx.onDownload} />
|
||||
</Section>
|
||||
),
|
||||
};
|
||||
|
||||
interface CsvData {
|
||||
headers: string[];
|
||||
rows: string[][];
|
||||
}
|
||||
|
||||
function parseCsv(content: string): CsvData {
|
||||
const lines = content.split(/\r?\n/).filter((l) => l.length > 0);
|
||||
const headers = lines.length > 0 ? lines[0]?.split(",") ?? [] : [];
|
||||
const rows = lines.slice(1).map((line) => line.split(","));
|
||||
return { headers, rows };
|
||||
}
|
||||
|
||||
const csvVariant: PreviewVariant = {
|
||||
matches: (name, mime) =>
|
||||
mime.startsWith("text/csv") || (name || "").toLowerCase().endsWith(".csv"),
|
||||
width: "lg",
|
||||
height: "full",
|
||||
needsTextContent: true,
|
||||
headerDescription: (ctx) => {
|
||||
if (!ctx.fileContent) return "";
|
||||
const { rows } = parseCsv(ctx.fileContent);
|
||||
return `CSV - ${rows.length} rows · ${ctx.fileSize}`;
|
||||
},
|
||||
|
||||
renderContent: (ctx) => {
|
||||
if (!ctx.fileContent) return null;
|
||||
const { headers, rows } = parseCsv(ctx.fileContent);
|
||||
return (
|
||||
<Section justifyContent="start" alignItems="start" padding={1}>
|
||||
<Table>
|
||||
<TableHeader className="sticky top-0 z-sticky">
|
||||
<TableRow className="bg-background-tint-02">
|
||||
{headers.map((h: string, i: number) => (
|
||||
<TableHead key={i}>
|
||||
<Text
|
||||
as="p"
|
||||
className="line-clamp-2 font-medium"
|
||||
text03
|
||||
mainUiBody
|
||||
>
|
||||
{h}
|
||||
</Text>
|
||||
</TableHead>
|
||||
))}
|
||||
</TableRow>
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
{rows.map((row: string[], rIdx: number) => (
|
||||
<TableRow key={rIdx}>
|
||||
{headers.map((_: string, cIdx: number) => (
|
||||
<TableCell
|
||||
key={cIdx}
|
||||
className={cn(
|
||||
cIdx === 0 && "sticky left-0 bg-background-tint-01",
|
||||
"py-0 px-4 whitespace-normal break-words"
|
||||
)}
|
||||
>
|
||||
{row?.[cIdx] ?? ""}
|
||||
</TableCell>
|
||||
))}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</Section>
|
||||
);
|
||||
},
|
||||
|
||||
renderFooterLeft: (ctx) => {
|
||||
if (!ctx.fileContent) return null;
|
||||
const { headers, rows } = parseCsv(ctx.fileContent);
|
||||
return (
|
||||
<Text text03 mainUiBody className="select-none">
|
||||
{headers.length} {headers.length === 1 ? "column" : "columns"} ·{" "}
|
||||
{rows.length} {rows.length === 1 ? "row" : "rows"}
|
||||
</Text>
|
||||
);
|
||||
},
|
||||
renderFooterRight: (ctx) => (
|
||||
<Section flexDirection="row" width="fit">
|
||||
<CopyButton getText={() => ctx.fileContent} />
|
||||
<DownloadButton onDownload={ctx.onDownload} />
|
||||
</Section>
|
||||
),
|
||||
};
|
||||
|
||||
const markdownVariant: PreviewVariant = {
|
||||
matches: (name, mime) => {
|
||||
if (MARKDOWN_MIMES.some((m) => mime.startsWith(m))) return true;
|
||||
return isMarkdownFile(name || "");
|
||||
},
|
||||
width: "lg",
|
||||
height: "full",
|
||||
needsTextContent: true,
|
||||
headerDescription: () => "",
|
||||
|
||||
renderContent: (ctx) => (
|
||||
<ScrollIndicatorDiv className="flex-1 min-h-0 p-4" variant="shadow">
|
||||
<MinimalMarkdown
|
||||
content={ctx.fileContent}
|
||||
className="w-full pb-4 h-full text-lg break-words"
|
||||
/>
|
||||
</ScrollIndicatorDiv>
|
||||
),
|
||||
|
||||
renderFooterLeft: () => null,
|
||||
|
||||
renderFooterRight: (ctx) => (
|
||||
<Section flexDirection="row" width="fit">
|
||||
<CopyButton getText={() => ctx.fileContent} />
|
||||
<DownloadButton onDownload={ctx.onDownload} />
|
||||
</Section>
|
||||
),
|
||||
};
|
||||
|
||||
const unsupportedVariant: PreviewVariant = {
|
||||
matches: () => true,
|
||||
width: "lg",
|
||||
height: "full",
|
||||
needsTextContent: false,
|
||||
headerDescription: () => "",
|
||||
|
||||
renderContent: (ctx) => (
|
||||
<div className="flex flex-col items-center justify-center flex-1 min-h-0 gap-4 p-6">
|
||||
<Text as="p" text03 mainUiBody>
|
||||
This file format is not supported for preview.
|
||||
</Text>
|
||||
<Button onClick={ctx.onDownload}>Download File</Button>
|
||||
</div>
|
||||
),
|
||||
|
||||
renderFooterLeft: () => null,
|
||||
renderFooterRight: (ctx) => <DownloadButton onDownload={ctx.onDownload} />,
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Variant registry — first match wins
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
const PREVIEW_VARIANTS: PreviewVariant[] = [
|
||||
codeVariant,
|
||||
imageVariant,
|
||||
pdfVariant,
|
||||
csvVariant,
|
||||
markdownVariant,
|
||||
];
|
||||
|
||||
export function resolveVariant(
|
||||
semanticIdentifier: string | null,
|
||||
mimeType: string
|
||||
): PreviewVariant {
|
||||
return (
|
||||
PREVIEW_VARIANTS.find((v) => v.matches(semanticIdentifier, mimeType)) ??
|
||||
unsupportedVariant
|
||||
);
|
||||
}
|
||||
@@ -150,7 +150,7 @@ test.describe("File preview modal from chat file links", () => {
|
||||
await expect(modal.getByText("Hello from the mock file!")).toBeVisible();
|
||||
});
|
||||
|
||||
test("clicking a code file link opens the PreviewModal with syntax highlighting", async ({
|
||||
test("clicking a code file link opens the CodeViewModal with syntax highlighting", async ({
|
||||
page,
|
||||
}) => {
|
||||
const mockContent = `Here is your script: [app.py](/api/chat/file/${MOCK_FILE_ID})`;
|
||||
@@ -173,7 +173,7 @@ test.describe("File preview modal from chat file links", () => {
|
||||
await expect(fileLink).toBeVisible({ timeout: 5000 });
|
||||
await fileLink.click();
|
||||
|
||||
// Verify the PreviewModal opens
|
||||
// Verify the CodeViewModal opens
|
||||
const modal = page.getByRole("dialog");
|
||||
await expect(modal).toBeVisible({ timeout: 5000 });
|
||||
|
||||
|
||||
Reference in New Issue
Block a user