UniqAI/bolt.diy
1
0
Fork 0
mirror of https://github.com/stackblitz-labs/bolt.diy synced 2025-06-26 18:26:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: api-key manager cleanup and log error on llm call (#1077)

Browse Source 
* fix: api-key manager cleanup and log error on llm call

* log improved
This commit is contained in:
Anirban Kar 2025-01-13 04:21:29 +05:30 committed by GitHub
parent 3a298f1586
commit fad41973e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 65 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/components/chat/APIKeyManager.tsx
View File

@ -2,7 +2,6 @@ import React, { useState, useEffect, useCallback } from 'react';
import { IconButton } from '~/components/ui/IconButton';
import type { ProviderInfo } from '~/types/model';
import Cookies from 'js-cookie';
import { providerBaseUrlEnvKeys } from '~/utils/constants';
interface APIKeyManagerProps {
provider: ProviderInfo;
@ -93,18 +92,16 @@ export const APIKeyManager: React.FC<APIKeyManagerProps> = ({ provider, apiKey,
<span className="text-sm font-medium text-bolt-elements-textSecondary">{provider?.name} API Key:</span>
{!isEditing && (
<div className="flex items-center gap-2">
{isEnvKeySet ? (
<>
<div className="i-ph:check-circle-fill text-green-500 w-4 h-4" />
<span className="text-xs text-green-500">
Set via {providerBaseUrlEnvKeys[provider.name].apiTokenKey} environment variable
</span>
</>
) : apiKey ? (
{apiKey ? (
<>
<div className="i-ph:check-circle-fill text-green-500 w-4 h-4" />
<span className="text-xs text-green-500">Set via UI</span>
</>
) : isEnvKeySet ? (
<>
<div className="i-ph:check-circle-fill text-green-500 w-4 h-4" />
<span className="text-xs text-green-500">Set via environment variable</span>
</>
) : (
<>
<div className="i-ph:x-circle-fill text-red-500 w-4 h-4" />
@ -117,7 +114,7 @@ export const APIKeyManager: React.FC<APIKeyManagerProps> = ({ provider, apiKey,
</div>
<div className="flex items-center gap-2 shrink-0">
{isEditing && !isEnvKeySet ? (
{isEditing ? (
<div className="flex items-center gap-2">
<input
type="password"
@ -145,7 +142,7 @@ export const APIKeyManager: React.FC<APIKeyManagerProps> = ({ provider, apiKey,
</div>
) : (
<>
{!isEnvKeySet && (
{
<IconButton
onClick={() => setIsEditing(true)}
title="Edit API Key"
@ -153,8 +150,8 @@ export const APIKeyManager: React.FC<APIKeyManagerProps> = ({ provider, apiKey,
>
<div className="i-ph:pencil-simple w-4 h-4" />
</IconButton>
)}
{provider?.getApiKeyLink && !isEnvKeySet && (
}
{provider?.getApiKeyLink && !apiKey && (
<IconButton
onClick={() => window.open(provider?.getApiKeyLink)}
title="Get API Key"

13
app/components/chat/Chat.client.tsx
View File

@ -137,7 +137,8 @@ export const ChatImpl = memo(
const [apiKeys, setApiKeys] = useState<Record<string, string>>({});
const { messages, isLoading, input, handleInputChange, setInput, stop, append, setMessages, reload } = useChat({
const { messages, isLoading, input, handleInputChange, setInput, stop, append, setMessages, reload, error } =
useChat({
api: '/api/chat',
body: {
apiKeys,
@ -146,10 +147,10 @@ export const ChatImpl = memo(
contextOptimization: contextOptimizationEnabled,
},
sendExtraMessageFields: true,
onError: (error) => {
logger.error('Request failed\n\n', error);
onError: (e) => {
logger.error('Request failed\n\n', e, error);
toast.error(
'There was an error processing your request: ' + (error.message ? error.message : 'No details were returned'),
'There was an error processing your request: ' + (e.message ? e.message : 'No details were returned'),
);
},
onFinish: (message, response) => {
@ -263,6 +264,10 @@ export const ChatImpl = memo(
*/
await workbenchStore.saveAllFiles();
if (error != null) {
setMessages(messages.slice(0, -1));
}
const fileModifications = workbenchStore.getFileModifcations();
chatStore.setKey('aborted', false);

2
app/lib/.server/llm/stream-text.ts
View File

@ -226,7 +226,7 @@ export async function streamText(props: {
logger.info(`Sending llm call to ${provider.name} with model ${modelDetails.name}`);
return _streamText({
return await _streamText({
model: provider.getModelInstance({
model: currentModel,
serverEnv,

20
app/routes/api.chat.ts
View File

@ -122,6 +122,8 @@ async function chatAction({ context, request }: ActionFunctionArgs) {
return;
},
};
const totalMessageContent = messages.reduce((acc, message) => acc + message.content, '');
logger.debug(`Total message length: ${totalMessageContent.split(' ').length}, words`);
const result = await streamText({
messages,
@ -134,13 +136,27 @@ async function chatAction({ context, request }: ActionFunctionArgs) {
contextOptimization,
});
(async () => {
for await (const part of result.fullStream) {
if (part.type === 'error') {
const error: any = part.error;
logger.error(`${error}`);
return;
}
}
})();
stream.switchSource(result.toDataStream());
// return createrespo
return new Response(stream.readable, {
status: 200,
headers: {
contentType: 'text/event-stream',
connection: 'keep-alive',
'Content-Type': 'text/event-stream; charset=utf-8',
Connection: 'keep-alive',
'Cache-Control': 'no-cache',
'Text-Encoding': 'chunked',
},
});
} catch (error: any) {

2
app/routes/api.check-env-key.ts
View File

@ -1,4 +1,4 @@
import type { LoaderFunction } from '@remix-run/node';
import type { LoaderFunction } from '@remix-run/cloudflare';
import { providerBaseUrlEnvKeys } from '~/utils/constants';
export const loader: LoaderFunction = async ({ context, request }) => {

5
app/routes/api.enhancer.ts
View File

@ -107,7 +107,10 @@ async function enhancerAction({ context, request }: ActionFunctionArgs) {
return new Response(result.textStream, {
status: 200,
headers: {
'Content-Type': 'text/plain; charset=utf-8',
'Content-Type': 'text/event-stream',
Connection: 'keep-alive',
'Cache-Control': 'no-cache',
'Text-Encoding': 'chunked',
},
});
} catch (error: unknown) {