Skip to content

Commit d385ea3

Browse files
committed
gemini pr
1 parent 63860ef commit d385ea3

File tree

6 files changed

+34
-25
lines changed

6 files changed

+34
-25
lines changed

dist/components/Bot.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/components/bubbles/BotBubble.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web.umd.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/Bot.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,7 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
940940
};
941941

942942
const handleRegenerateResponse = async (messageIndex: number) => {
943-
if (loading()) return;
944-
if (previews().length) return;
945-
if (startInputType() === 'formInput') return;
943+
if (previews().length || startInputType() === 'formInput' || !canRegenerateResponse(messageIndex)) return;
946944

947945
const currentMessages = messages();
948946
const targetMessage = currentMessages[messageIndex];
@@ -1597,11 +1595,15 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
15971595
dateTime: message.dateTime,
15981596
};
15991597
if (message.responseVersionIndex !== undefined) chatHistory.responseVersionIndex = message.responseVersionIndex;
1600-
if ((message as any).responseVersions) {
1601-
const responseVersions =
1602-
typeof (message as any).responseVersions === 'string'
1603-
? JSON.parse((message as any).responseVersions)
1604-
: (message as any).responseVersions;
1598+
if (message.responseVersions) {
1599+
let responseVersions = message.responseVersions;
1600+
if (typeof responseVersions === 'string') {
1601+
try {
1602+
responseVersions = JSON.parse(responseVersions);
1603+
} catch (e) {
1604+
responseVersions = [];
1605+
}
1606+
}
16051607
if (Array.isArray(responseVersions)) chatHistory.responseVersions = responseVersions;
16061608
}
16071609
if (message.sourceDocuments) chatHistory.sourceDocuments = message.sourceDocuments;

src/components/bubbles/BotBubble.tsx

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,11 @@ export const BotBubble = (props: Props) => {
9595
return active.rating ?? '';
9696
};
9797

98-
const thumbsUpColor = () => currentRating() === 'THUMBS_UP' ? '#006400' : (props.feedbackColor ?? defaultFeedbackColor);
99-
const thumbsDownColor = () => currentRating() === 'THUMBS_DOWN' ? '#8B0000' : (props.feedbackColor ?? defaultFeedbackColor);
98+
const thumbsUpColor = () => (currentRating() === 'THUMBS_UP' ? '#006400' : props.feedbackColor ?? defaultFeedbackColor);
99+
const thumbsDownColor = () => (currentRating() === 'THUMBS_DOWN' ? '#8B0000' : props.feedbackColor ?? defaultFeedbackColor);
100100

101-
const setBotMessageRef = (el: HTMLSpanElement) => {
102-
if (el) {
103-
setBotMessageElement(el);
104-
}
101+
const setBotMessageRef = (el: HTMLSpanElement | null) => {
102+
setBotMessageElement(el);
105103
};
106104

107105
createEffect(() => {
@@ -656,11 +654,13 @@ export const BotBubble = (props: Props) => {
656654
</Show>
657655
{props.chatFeedbackStatus && activeMessage().messageId && (
658656
<>
659-
<RegenerateResponseButton
660-
class="regenerate-response-button"
661-
feedbackColor={props.feedbackColor}
662-
onClick={() => props.onRegenerateResponse?.()}
663-
/>
657+
<Show when={props.showRegenerateResponseButton}>
658+
<RegenerateResponseButton
659+
class="regenerate-response-button"
660+
feedbackColor={props.feedbackColor}
661+
onClick={() => props.onRegenerateResponse?.()}
662+
/>
663+
</Show>
664664
<Show when={hasMultipleResponseVersions()}>
665665
<div class="text-sm text-gray-500 mr-2 flex items-center">
666666
<button
@@ -673,7 +673,9 @@ export const BotBubble = (props: Props) => {
673673
>
674674
{'<'}
675675
</button>
676-
<span style={{ color: props.feedbackColor ?? defaultFeedbackColor }}>{`${responseVersionIndex() + 1}/${totalResponseVersions()}`}</span>
676+
<span style={{ color: props.feedbackColor ?? defaultFeedbackColor }}>{`${
677+
responseVersionIndex() + 1
678+
}/${totalResponseVersions()}`}</span>
677679
<button
678680
type="button"
679681
class="px-1"
@@ -693,7 +695,12 @@ export const BotBubble = (props: Props) => {
693695
</div>
694696
</Show>
695697
{currentRating() === '' || currentRating() === 'THUMBS_UP' ? (
696-
<ThumbsUpButton feedbackColor={thumbsUpColor()} isDisabled={currentRating() === 'THUMBS_UP'} rating={currentRating()} onClick={onThumbsUpClick} />
698+
<ThumbsUpButton
699+
feedbackColor={thumbsUpColor()}
700+
isDisabled={currentRating() === 'THUMBS_UP'}
701+
rating={currentRating()}
702+
onClick={onThumbsUpClick}
703+
/>
697704
) : null}
698705
{currentRating() === '' || currentRating() === 'THUMBS_DOWN' ? (
699706
<ThumbsDownButton

0 commit comments

Comments
 (0)