Remove file upload functionality and related components

The `FileUploadStore` and all file upload features were removed, simplifying the chat interface. This change eliminates unused code, including file handling logic, attachment management, and UI elements, streamlining the application.
This commit is contained in:
geoffsee
2025-05-27 14:15:12 -04:00
committed by Geoff Seemueller
parent c04e19611e
commit 47272ba350
13 changed files with 105 additions and 302 deletions

View File

@@ -28,15 +28,6 @@ export function createRouter() {
},
)
.get(
"/api/streams/webhook/:streamId",
withParams,
async ({ streamId }, env, ctx) => {
const { chatService } = createServerContext(env, ctx);
return chatService.proxyWebhookStream(streamId); // Handles SSE for streamId
},
)
.post("/api/feedback", async (r, e, c) => {
const { feedbackService } = createServerContext(e, c);
return feedbackService.handleFeedback(r);

View File

@@ -6,13 +6,11 @@ export class AssistantSdk {
maxTokens?: number;
userTimezone?: string;
userLocation?: string;
tools?: string[];
}): string {
const {
maxTokens,
userTimezone = "UTC",
userLocation = "",
tools = [],
} = params;
const selectedFewshots = Sdk.selectEquitably?.(few_shots) || few_shots;
const sdkDate =
@@ -23,17 +21,6 @@ export class AssistantSdk {
const now = new Date();
const formattedMinutes = String(now.getMinutes()).padStart(2, "0");
const currentTime = `${now.getHours()}:${formattedMinutes} ${now.getSeconds()}s`;
// const toolsInfo =
// tools
// .map((tool) => {
// switch (tool) {
// // case "user-attachments": return "### Attachments\nUser supplied attachments are normalized to text and will have this header (# Attachment:...) in the message.";
// // case "web-search": return "### Web Search\nResults are optionally available in 'Live Search'.";
// default:
// return `- ${tool}`;
// }
// })
// .join("\n\n") || "- No additional tools selected.";
return `# Assistant Knowledge
## Current Context

View File

@@ -5,219 +5,129 @@ import {IMessage} from "../../../src/stores/ClientChatStore";
import {getModelFamily} from "../../../src/components/chat/SupportedModels";
export class ChatSdk {
static async preprocess({
messages,
}) {
// a custom implementation for preprocessing would go here
return Message.create({
role: "assistant",
content: "",
});
}
static async handleChatRequest(
request: Request,
ctx: {
openai: OpenAI;
systemPrompt: any;
maxTokens: any;
env: Env;
},
) {
const streamId = crypto.randomUUID();
const { messages, model, conversationId, attachments, tools } =
await request.json();
if (!messages?.length) {
return new Response("No messages provided", { status: 400 });
static async preprocess({
messages,
}) {
// run processing on messages to generate events/context
// removed in this fork due to expenses
return Message.create({
role: "assistant",
content: "",
});
}
const preprocessedContext = await ChatSdk.preprocess({
messages,
});
const objectId = ctx.env.SITE_COORDINATOR.idFromName("stream-index");
const durableObject = ctx.env.SITE_COORDINATOR.get(objectId);
const webhooks =
JSON.parse(await durableObject.getStreamData(streamId)) ?? {};
await durableObject.saveStreamData(
streamId,
JSON.stringify({
messages,
model,
conversationId,
timestamp: Date.now(),
attachments,
tools,
systemPrompt: ctx.systemPrompt,
preprocessedContext,
...webhooks,
}),
);
return new Response(
JSON.stringify({
streamUrl: `/api/streams/${streamId}`,
}),
{
headers: {
"Content-Type": "application/json",
static async handleChatRequest(
request: Request,
ctx: {
openai: OpenAI;
systemPrompt: any;
maxTokens: any;
env: Env;
},
},
);
}
) {
const streamId = crypto.randomUUID();
const {messages, model, conversationId} =
await request.json();
static async calculateMaxTokens(
messages: any[],
ctx: Record<string, any> & {
env: Env;
maxTokens: number;
},
) {
const objectId = ctx.env.SITE_COORDINATOR.idFromName(
"dynamic-token-counter",
);
const durableObject = ctx.env.SITE_COORDINATOR.get(objectId);
return durableObject.dynamicMaxTokens(messages, ctx.maxTokens);
}
if (!messages?.length) {
return new Response("No messages provided", {status: 400});
}
static buildAssistantPrompt({ maxTokens, tools }) {
return AssistantSdk.getAssistantPrompt({
maxTokens,
userTimezone: "UTC",
userLocation: "USA/unknown",
tools,
});
}
const preprocessedContext = await ChatSdk.preprocess({
messages,
});
static buildMessageChain(
messages: any[],
opts: {
systemPrompt: any;
assistantPrompt: string;
attachments: any[];
toolResults: IMessage;
model: any;
},
) {
const modelFamily = getModelFamily(opts.model);
const objectId = ctx.env.SITE_COORDINATOR.idFromName("stream-index");
const durableObject = ctx.env.SITE_COORDINATOR.get(objectId);
const messagesToSend = [];
messagesToSend.push(
Message.create({
role:
opts.model.includes("o1") ||
opts.model.includes("gemma") ||
modelFamily === "claude" ||
modelFamily === "google"
? "assistant"
: "system",
content: opts.systemPrompt.trim(),
}),
);
await durableObject.saveStreamData(
streamId,
JSON.stringify({
messages,
model,
conversationId,
timestamp: Date.now(),
systemPrompt: ctx.systemPrompt,
preprocessedContext
}),
);
messagesToSend.push(
Message.create({
role: "assistant",
content: opts.assistantPrompt.trim(),
}),
);
const attachmentMessages = (opts.attachments || []).map((attachment) =>
Message.create({
role: "user",
content: `Attachment: ${attachment.content}`,
}),
);
if (attachmentMessages.length > 0) {
messagesToSend.push(...attachmentMessages);
return new Response(
JSON.stringify({
streamUrl: `/api/streams/${streamId}`,
}),
{
headers: {
"Content-Type": "application/json",
},
},
);
}
messagesToSend.push(
...messages
.filter((message: any) => message.content?.trim())
.map((message: any) => Message.create(message)),
);
static async calculateMaxTokens(
messages: any[],
ctx: Record<string, any> & {
env: Env;
maxTokens: number;
},
) {
const objectId = ctx.env.SITE_COORDINATOR.idFromName(
"dynamic-token-counter",
);
const durableObject = ctx.env.SITE_COORDINATOR.get(objectId);
return durableObject.dynamicMaxTokens(messages, ctx.maxTokens);
}
return messagesToSend;
}
static buildAssistantPrompt({maxTokens}) {
return AssistantSdk.getAssistantPrompt({
maxTokens,
userTimezone: "UTC",
userLocation: "USA/unknown",
});
}
static async handleAgentStream(
eventSource: EventSource,
dataCallback: any,
): Promise<void> {
// console.log("sdk::handleWebhookStream::start");
let done = false;
return new Promise((resolve, reject) => {
if (!done) {
// console.log("sdk::handleWebhookStream::promise::created");
eventSource.onopen = () => {
// console.log("sdk::handleWebhookStream::eventSource::open");
console.log("Connected to agent");
};
static buildMessageChain(
messages: any[],
opts: {
systemPrompt: any;
assistantPrompt: string;
toolResults: IMessage;
model: any;
},
) {
const modelFamily = getModelFamily(opts.model);
const parseEvent = (data) => {
try {
return JSON.parse(data);
} catch (_) {
return data;
}
};
eventSource.onmessage = (event) => {
try {
if (event.data === "[DONE]") {
done = true;
console.log("Stream completed");
const messagesToSend = [];
eventSource.close();
return resolve();
}
messagesToSend.push(
Message.create({
role:
opts.model.includes("o1") ||
opts.model.includes("gemma") ||
modelFamily === "claude" ||
modelFamily === "google"
? "assistant"
: "system",
content: opts.systemPrompt.trim(),
}),
);
dataCallback({ type: "web-search", data: parseEvent(event.data) });
} catch (error) {
console.log("sdk::handleWebhookStream::eventSource::error");
console.error("Error parsing webhook data:", error);
dataCallback({ error: "Invalid data format from webhook" });
}
};
messagesToSend.push(
Message.create({
role: "assistant",
content: opts.assistantPrompt.trim(),
}),
);
eventSource.onerror = (error: any) => {
console.error("Webhook stream error:", error);
messagesToSend.push(
...messages
.filter((message: any) => message.content?.trim())
.map((message: any) => Message.create(message)),
);
if (
error.error &&
error.error.message === "The server disconnected."
) {
return resolve();
}
reject(new Error("Failed to stream from webhook"));
};
}
});
}
static sendDoubleNewline(controller, encoder) {
const data = {
type: "chat",
data: {
choices: [
{
index: 0,
delta: { content: "\n\n" },
logprobs: null,
finish_reason: null,
},
],
},
};
controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`));
}
return messagesToSend;
}
}
export default ChatSdk;

View File

@@ -21,12 +21,10 @@ export class CerebrasSdk {
}>,
_NotCustomized
>;
attachments: any;
maxTokens: unknown | number | undefined;
messages: any;
model: string;
env: Env;
tools: any;
},
dataCallback: (data) => void,
) {
@@ -35,15 +33,12 @@ export class CerebrasSdk {
messages,
env,
maxTokens,
tools,
systemPrompt,
model,
attachments,
} = param;
const assistantPrompt = ChatSdk.buildAssistantPrompt({
maxTokens: maxTokens,
tools: tools,
});
const safeMessages = ChatSdk.buildMessageChain(messages, {
@@ -51,7 +46,6 @@ export class CerebrasSdk {
model,
assistantPrompt,
toolResults: preprocessedContext,
attachments: attachments,
});
const openai = new OpenAI({

View File

@@ -49,7 +49,6 @@ export class ClaudeChatSdk {
param: {
openai: OpenAI;
systemPrompt: any;
disableWebhookGeneration: boolean;
preprocessedContext: ModelSnapshotType2<
ModelPropertiesDeclarationToProperties<{
role: ISimpleType<UnionStringArray<string[]>>;
@@ -57,12 +56,10 @@ export class ClaudeChatSdk {
}>,
_NotCustomized
>;
attachments: any;
maxTokens: unknown | number | undefined;
messages: any;
model: string;
env: Env;
tools: any;
},
dataCallback: (data) => void,
) {
@@ -71,15 +68,12 @@ export class ClaudeChatSdk {
messages,
env,
maxTokens,
tools,
systemPrompt,
model,
attachments,
} = param;
const assistantPrompt = ChatSdk.buildAssistantPrompt({
maxTokens: maxTokens,
tools: tools,
});
const safeMessages = ChatSdk.buildMessageChain(messages, {
@@ -87,7 +81,6 @@ export class ClaudeChatSdk {
model,
assistantPrompt,
toolResults: preprocessedContext,
attachments: attachments,
});
const anthropic = new Anthropic({

View File

@@ -13,7 +13,6 @@ export class CloudflareAISdk {
param: {
openai: OpenAI;
systemPrompt: any;
disableWebhookGeneration: boolean;
preprocessedContext: ModelSnapshotType2<
ModelPropertiesDeclarationToProperties<{
role: ISimpleType<UnionStringArray<string[]>>;
@@ -21,12 +20,10 @@ export class CloudflareAISdk {
}>,
_NotCustomized
>;
attachments: any;
maxTokens: unknown | number | undefined;
messages: any;
model: string;
env: Env;
tools: any;
},
dataCallback: (data) => void,
) {
@@ -35,22 +32,18 @@ export class CloudflareAISdk {
messages,
env,
maxTokens,
tools,
systemPrompt,
model,
attachments,
} = param;
const assistantPrompt = ChatSdk.buildAssistantPrompt({
maxTokens: maxTokens,
tools: tools,
});
const safeMessages = ChatSdk.buildMessageChain(messages, {
systemPrompt: systemPrompt,
model,
assistantPrompt,
toolResults: preprocessedContext,
attachments: attachments,
});
const cfAiURL = `https://api.cloudflare.com/client/v4/accounts/${env.CLOUDFLARE_ACCOUNT_ID}/ai/v1`;

View File

@@ -42,7 +42,6 @@ export class FireworksAiChatSdk {
param: {
openai: OpenAI;
systemPrompt: any;
disableWebhookGeneration: boolean;
preprocessedContext: ModelSnapshotType2<
ModelPropertiesDeclarationToProperties<{
role: ISimpleType<UnionStringArray<string[]>>;
@@ -50,12 +49,10 @@ export class FireworksAiChatSdk {
}>,
_NotCustomized
>;
attachments: any;
maxTokens: number;
messages: any;
model: any;
env: Env;
tools: any;
},
dataCallback: (data) => void,
) {
@@ -64,15 +61,12 @@ export class FireworksAiChatSdk {
messages,
env,
maxTokens,
tools,
systemPrompt,
model,
attachments,
} = param;
const assistantPrompt = ChatSdk.buildAssistantPrompt({
maxTokens: maxTokens,
tools: tools,
});
const safeMessages = ChatSdk.buildMessageChain(messages, {
@@ -80,7 +74,6 @@ export class FireworksAiChatSdk {
model,
assistantPrompt,
toolResults: preprocessedContext,
attachments: attachments,
});
const fireworksOpenAIClient = new OpenAI({

View File

@@ -12,15 +12,12 @@ export class GoogleChatSdk {
messages,
env,
maxTokens,
tools,
systemPrompt,
model,
attachments,
} = param;
const assistantPrompt = ChatSdk.buildAssistantPrompt({
maxTokens: maxTokens,
tools: tools,
});
const safeMessages = ChatSdk.buildMessageChain(messages, {
@@ -28,7 +25,6 @@ export class GoogleChatSdk {
model,
assistantPrompt,
toolResults: preprocessedContext,
attachments: attachments,
});
const openai = new OpenAI({

View File

@@ -13,7 +13,6 @@ export class GroqChatSdk {
param: {
openai: OpenAI;
systemPrompt: any;
disableWebhookGeneration: boolean;
preprocessedContext: ModelSnapshotType2<
ModelPropertiesDeclarationToProperties<{
role: ISimpleType<UnionStringArray<string[]>>;
@@ -21,12 +20,10 @@ export class GroqChatSdk {
}>,
_NotCustomized
>;
attachments: any;
maxTokens: unknown | number | undefined;
messages: any;
model: string;
env: Env;
tools: any;
},
dataCallback: (data) => void,
) {
@@ -35,22 +32,18 @@ export class GroqChatSdk {
messages,
env,
maxTokens,
tools,
systemPrompt,
model,
attachments,
} = param;
const assistantPrompt = ChatSdk.buildAssistantPrompt({
maxTokens: maxTokens,
tools: tools,
});
const safeMessages = ChatSdk.buildMessageChain(messages, {
systemPrompt: systemPrompt,
model,
assistantPrompt,
toolResults: preprocessedContext,
attachments: attachments,
});
const openai = new OpenAI({

View File

@@ -7,12 +7,9 @@ export class OpenAiChatSdk {
openai: OpenAI;
systemPrompt: any;
preprocessedContext: any;
attachments: any;
maxTokens: unknown | number | undefined;
messages: any;
disableWebhookGeneration: boolean;
model: any;
tools: any;
},
dataCallback: (data: any) => any,
) {
@@ -20,9 +17,7 @@ export class OpenAiChatSdk {
openai,
systemPrompt,
maxTokens,
tools,
messages,
attachments,
model,
preprocessedContext,
} = ctx;
@@ -33,14 +28,12 @@ export class OpenAiChatSdk {
const assistantPrompt = ChatSdk.buildAssistantPrompt({
maxTokens: maxTokens,
tools: tools,
});
const safeMessages = ChatSdk.buildMessageChain(messages, {
systemPrompt: systemPrompt,
model,
assistantPrompt,
toolResults: preprocessedContext,
attachments: attachments,
});
return OpenAiChatSdk.streamOpenAiResponse(

View File

@@ -7,13 +7,11 @@ export class XaiChatSdk {
openai: OpenAI;
systemPrompt: any;
preprocessedContext: any;
attachments: any;
maxTokens: unknown | number | undefined;
messages: any;
disableWebhookGeneration: boolean;
model: any;
env: Env;
tools: any;
},
dataCallback: (data: any) => any,
) {
@@ -21,7 +19,6 @@ export class XaiChatSdk {
openai,
systemPrompt,
maxTokens,
tools,
messages,
attachments,
env,
@@ -49,7 +46,6 @@ export class XaiChatSdk {
const assistantPrompt = ChatSdk.buildAssistantPrompt({
maxTokens: maxTokens,
tools: tools,
});
const safeMessages = ChatSdk.buildMessageChain(messages, {
@@ -57,7 +53,6 @@ export class XaiChatSdk {
model,
assistantPrompt,
toolResults: preprocessedContext,
attachments: attachments,
});
const xAiClient = new OpenAI({