Restore Branch History and Integrate Latest Fixes #459
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,6 +47,7 @@ async function submit(formData?: FormData, skip?: boolean) { | |
| const action = formData?.get('action') as string; | ||
| if (action === 'resolution_search') { | ||
| const file = formData?.get('file') as File; | ||
| const timezone = (formData?.get('timezone') as string) || 'UTC'; | ||
| if (!file) { | ||
| throw new Error('No file provided for resolution search.'); | ||
| } | ||
|
|
@@ -60,7 +61,8 @@ async function submit(formData?: FormData, skip?: boolean) { | |
| message.role !== 'tool' && | ||
| message.type !== 'followup' && | ||
| message.type !== 'related' && | ||
| message.type !== 'end' && | ||
| message.type !== 'resolution_search_result' | ||
| ); | ||
|
|
||
| // The user's prompt for this action is static. | ||
|
|
@@ -82,74 +84,97 @@ async function submit(formData?: FormData, skip?: boolean) { | |
| }); | ||
| messages.push({ role: 'user', content }); | ||
|
|
||
| // Create a streamable value for the summary. | ||
| const summaryStream = createStreamableValue<string>(''); | ||
|
|
||
| async function processResolutionSearch() { | ||
| try { | ||
| // Call the simplified agent, which now returns a stream result. | ||
| const streamResult = await resolutionSearch(messages, timezone); | ||
|
|
||
| for await (const partialObject of streamResult.partialObjectStream) { | ||
| if (partialObject.summary) { | ||
| summaryStream.update(partialObject.summary); | ||
| } | ||
| } | ||
|
|
||
| const analysisResult = await streamResult.object; | ||
|
|
||
| // Mark the summary stream as done with the result. | ||
| summaryStream.done(analysisResult.summary || 'Analysis complete.'); | ||
|
|
||
| messages.push({ role: 'assistant', content: analysisResult.summary || 'Analysis complete.' }); | ||
|
|
||
| const sanitizedMessages: CoreMessage[] = messages.map(m => { | ||
| if (Array.isArray(m.content)) { | ||
| return { | ||
| ...m, | ||
| content: m.content.filter(part => part.type !== 'image') | ||
| } as CoreMessage | ||
| } | ||
| return m | ||
| }) | ||
|
|
||
| const relatedQueries = await querySuggestor(uiStream, sanitizedMessages); | ||
| uiStream.append( | ||
| <Section title="Follow-up"> | ||
| <FollowupPanel /> | ||
| </Section> | ||
| ); | ||
|
|
||
| await new Promise(resolve => setTimeout(resolve, 500)); | ||
|
|
||
| const groupeId = nanoid(); | ||
|
|
||
| aiState.done({ | ||
| ...aiState.get(), | ||
| messages: [ | ||
| ...aiState.get().messages, | ||
| { | ||
| id: groupeId, | ||
| role: 'assistant', | ||
| content: analysisResult.summary || 'Analysis complete.', | ||
| type: 'response' | ||
| }, | ||
| { | ||
| id: groupeId, | ||
| role: 'assistant', | ||
| content: JSON.stringify(analysisResult), | ||
| type: 'resolution_search_result' | ||
| }, | ||
| { | ||
| id: groupeId, | ||
| role: 'assistant', | ||
| content: JSON.stringify(relatedQueries), | ||
| type: 'related' | ||
| }, | ||
| { | ||
| id: groupeId, | ||
| role: 'assistant', | ||
| content: 'followup', | ||
| type: 'followup' | ||
| } | ||
| ] | ||
| }); | ||
| } catch (error) { | ||
| console.error('Error in resolution search:', error); | ||
| summaryStream.error(error); | ||
| } finally { | ||
| isGenerating.done(false); | ||
| uiStream.done(); | ||
| } | ||
| } | ||
|
|
||
| // Start the background process without awaiting it. | ||
| processResolutionSearch(); | ||
|
|
||
| // Immediately update the UI stream with the BotMessage component. | ||
| uiStream.update( | ||
| <Section title="response"> | ||
| <BotMessage content={summaryStream.value} /> | ||
| </Section> | ||
| ); | ||
|
Comment on lines
90
to
176
There was a problem hiding this comment.
This pattern is only safe if the runtime guarantees the process will continue after the action returns (or if you explicitly use a background/work queue mechanism). SuggestionMake the lifecycle explicit. Options:
uiStream.update(...);
await processResolutionSearch();
Reply with "@CharlieHelps yes please" if you'd like me to add a commit that awaits processing and keeps the streaming UI behavior. |
||
|
|
||
| return { | ||
| id: nanoid(), | ||
| isGenerating: isGenerating.value, | ||
|
|
@@ -163,7 +188,8 @@ async function submit(formData?: FormData, skip?: boolean) { | |
| message.role !== 'tool' && | ||
| message.type !== 'followup' && | ||
| message.type !== 'related' && | ||
| message.type !== 'end' && | ||
| message.type !== 'resolution_search_result' | ||
| ) | ||
|
|
||
| const groupeId = nanoid() | ||
|
|
@@ -295,7 +321,7 @@ async function submit(formData?: FormData, skip?: boolean) { | |
| const hasImage = messageParts.some(part => part.type === 'image') | ||
| // Properly type the content based on whether it contains images | ||
| const content: CoreMessage['content'] = hasImage | ||
| ? (messageParts as CoreMessage['content']) | ||
| : messageParts.map(part => part.text).join('\n') | ||
|
|
||
| const type = skip | ||
|
|
@@ -340,7 +366,7 @@ async function submit(formData?: FormData, skip?: boolean) { | |
| const mapProvider = formData?.get('mapProvider') as 'mapbox' | 'google' | ||
|
|
||
| async function processEvents() { | ||
| let action: { object: { next: string } } = { object: { next: 'proceed' } } | ||
| if (!skip) { | ||
| const taskManagerResult = await taskManager(messages) | ||
| if (taskManagerResult) { | ||
|
|
@@ -371,7 +397,7 @@ async function submit(formData?: FormData, skip?: boolean) { | |
| let answer = '' | ||
| let toolOutputs: ToolResultPart[] = [] | ||
| let errorOccurred = false | ||
| const streamText = createStreamableValue<string>('') | ||
| uiStream.update(<Spinner />) | ||
|
|
||
| while ( | ||
|
|
@@ -646,7 +672,9 @@ export const getUIStateFromAIState = (aiState: Chat) => { | |
| ) | ||
| } | ||
| case 'related': | ||
| const relatedQueries = createStreamableValue<RelatedQueries>({ | ||
| items: [] | ||
| }) | ||
| relatedQueries.done(JSON.parse(content as string)) | ||
| return { | ||
| id, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
summaryStream.error(error)is called with anunknown/non-Errorpossible value. Depending on the stream implementation, this can result in a useless[object Object]message or even a runtime error if it expects anError.Also,
console.erroris fine, but user-visible output should be a safe string/message.Suggestion
Normalize the error before passing it to the stream and provide a user-safe message:
Reply with "@CharlieHelps yes please" if you'd like me to add a commit with this change.