-
-
Notifications
You must be signed in to change notification settings - Fork 24.2k
fix(agentflow): fix variable resolution, credential sync, and add E2E example #6245
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jocelynlin-wd
wants to merge
3
commits into
main
Choose a base branch
from
fix/agentflow-variable-resolution-e2e
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
ab1f027
fix(agentflow): fix variable resolution, credential sync, and add E2E…
jocelynlin-wd eb38916
fix(agentflow): add user-facing error feedback for save failures in E…
jocelynlin-wd 2624526
fix(agentflow): fix variable chip display and revert Start node conte…
jocelynlin-wd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /** | ||
| * SaveToDbDialog | ||
| * | ||
| * Shown when the user clicks Save and no VITE_FLOW_ID is configured. | ||
| * Creates a new agentflow via POST /api/v1/chatflows and reports the new ID. | ||
| */ | ||
|
|
||
| import { useState } from 'react' | ||
|
|
||
| import type { FlowData } from '@flowiseai/agentflow' | ||
|
|
||
| import { apiBaseUrl, token } from './config' | ||
|
|
||
| interface SaveToDbDialogProps { | ||
| flow: FlowData | ||
| flowName: string | ||
| onSaved: (agentflowId: string) => void | ||
| onCancel: () => void | ||
| } | ||
|
|
||
| export function SaveToDbDialog({ flow, flowName, onSaved, onCancel }: SaveToDbDialogProps) { | ||
| const [saving, setSaving] = useState(false) | ||
| const [error, setError] = useState<string | null>(null) | ||
|
|
||
| const authHeaders: Record<string, string> = { 'Content-Type': 'application/json' } | ||
| if (token) authHeaders['Authorization'] = `Bearer ${token}` | ||
|
|
||
| const handleConfirm = async () => { | ||
| setSaving(true) | ||
| setError(null) | ||
| try { | ||
| const body = { | ||
| name: flowName, | ||
| type: 'AGENTFLOW', | ||
| flowData: JSON.stringify({ nodes: flow.nodes, edges: flow.edges, viewport: flow.viewport }) | ||
| } | ||
| const res = await fetch(`${apiBaseUrl}/api/v1/chatflows`, { | ||
| method: 'POST', | ||
| headers: authHeaders, | ||
| credentials: token ? 'omit' : 'include', | ||
| body: JSON.stringify(body) | ||
| }) | ||
| if (!res.ok) throw new Error(`HTTP ${res.status}`) | ||
| const created = await res.json() | ||
| onSaved(created.id) | ||
| } catch (e) { | ||
| setError(e instanceof Error ? e.message : 'Save failed') | ||
| setSaving(false) | ||
| } | ||
| } | ||
|
|
||
| return ( | ||
| <div | ||
| style={{ | ||
| position: 'fixed', | ||
| inset: 0, | ||
| background: 'rgba(0,0,0,0.55)', | ||
| zIndex: 1000, | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| justifyContent: 'center' | ||
| }} | ||
| > | ||
| <div | ||
| style={{ | ||
| background: '#1e1e2e', | ||
| border: '1px solid #313244', | ||
| borderRadius: '8px', | ||
| padding: '24px 28px', | ||
| maxWidth: '400px', | ||
| width: '90%', | ||
| fontFamily: 'monospace', | ||
| color: '#cdd6f4' | ||
| }} | ||
| > | ||
| <div style={{ fontWeight: 700, fontSize: '14px', marginBottom: '12px', color: '#f9e2af' }}>Save flow to database?</div> | ||
| <div style={{ fontSize: '13px', color: '#a6adc8', marginBottom: '20px', lineHeight: 1.6 }}> | ||
| No <span style={{ color: '#f9e2af' }}>VITE_FLOW_ID</span> is configured. The current flow will be saved to the database | ||
| as a new agentflow. | ||
| </div> | ||
| {error && <div style={{ color: '#f38ba8', fontSize: '12px', marginBottom: '12px' }}>Error: {error}</div>} | ||
| <div style={{ display: 'flex', gap: '10px', justifyContent: 'flex-end' }}> | ||
| <button | ||
| onClick={onCancel} | ||
| disabled={saving} | ||
| style={{ | ||
| padding: '6px 16px', | ||
| background: '#45475a', | ||
| color: '#cdd6f4', | ||
| border: 'none', | ||
| borderRadius: '4px', | ||
| cursor: saving ? 'not-allowed' : 'pointer', | ||
| fontFamily: 'monospace', | ||
| fontSize: '12px', | ||
| opacity: saving ? 0.5 : 1 | ||
| }} | ||
| > | ||
| Cancel | ||
| </button> | ||
| <button | ||
| onClick={handleConfirm} | ||
| disabled={saving} | ||
| style={{ | ||
| padding: '6px 16px', | ||
| background: '#a6e3a1', | ||
| color: '#1e1e2e', | ||
| border: 'none', | ||
| borderRadius: '4px', | ||
| cursor: saving ? 'not-allowed' : 'pointer', | ||
| fontFamily: 'monospace', | ||
| fontSize: '12px', | ||
| fontWeight: 700, | ||
| opacity: saving ? 0.7 : 1 | ||
| }} | ||
| > | ||
| {saving ? 'Saving…' : 'Save to DB'} | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| /** | ||
| * TestRunDialog | ||
| * | ||
| * Sends a test question to POST /api/v1/internal-prediction/{agentflowId} | ||
| * and displays the response, letting users verify the flow runs correctly. | ||
| */ | ||
|
|
||
| import { useState } from 'react' | ||
|
|
||
| import MarkdownIt from 'markdown-it' | ||
|
|
||
| import { apiBaseUrl, token } from './config' | ||
|
|
||
| const md = new MarkdownIt({ linkify: true, breaks: true }) | ||
|
|
||
| interface TestRunDialogProps { | ||
| agentflowId: string | ||
| onClose: () => void | ||
| } | ||
|
|
||
| export function TestRunDialog({ agentflowId, onClose }: TestRunDialogProps) { | ||
| const [question, setQuestion] = useState('') | ||
| const [running, setRunning] = useState(false) | ||
| const [result, setResult] = useState<string | null>(null) | ||
| const [error, setError] = useState<string | null>(null) | ||
|
|
||
| const authHeaders: Record<string, string> = { 'Content-Type': 'application/json' } | ||
| if (token) authHeaders['Authorization'] = `Bearer ${token}` | ||
|
|
||
| const handleRun = async () => { | ||
| if (!question.trim()) return | ||
| setRunning(true) | ||
| setResult(null) | ||
| setError(null) | ||
| try { | ||
| const res = await fetch(`${apiBaseUrl}/api/v1/internal-prediction/${agentflowId}`, { | ||
| method: 'POST', | ||
| headers: authHeaders, | ||
| credentials: token ? 'omit' : 'include', | ||
| body: JSON.stringify({ question: question.trim(), streaming: false }) | ||
| }) | ||
| if (!res.ok) throw new Error(`HTTP ${res.status}`) | ||
| const data = await res.json() | ||
| // Response shape: { text, question, chatId, ... } | ||
| setResult(typeof data.text === 'string' ? data.text : JSON.stringify(data, null, 2)) | ||
| } catch (e) { | ||
| setError(e instanceof Error ? e.message : 'Request failed') | ||
| } finally { | ||
| setRunning(false) | ||
| } | ||
| } | ||
|
|
||
| return ( | ||
| <div | ||
| style={{ | ||
| position: 'fixed', | ||
| inset: 0, | ||
| background: 'rgba(0,0,0,0.45)', | ||
| zIndex: 1000, | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| justifyContent: 'center' | ||
| }} | ||
| role='presentation' | ||
| onClick={(e) => { | ||
| if (e.target === e.currentTarget) onClose() | ||
| }} | ||
| onKeyDown={(e) => { | ||
| if (e.key === 'Escape') onClose() | ||
| }} | ||
| > | ||
| <div | ||
| style={{ | ||
| background: '#fff', | ||
| borderRadius: '8px', | ||
| boxShadow: '0 8px 32px rgba(0,0,0,0.18)', | ||
| width: '520px', | ||
| maxWidth: '95vw', | ||
| maxHeight: '85vh', | ||
| display: 'flex', | ||
| flexDirection: 'column', | ||
| overflow: 'hidden' | ||
| }} | ||
| > | ||
| <div style={{ padding: '24px 28px', display: 'flex', flexDirection: 'column', gap: '14px', overflowY: 'auto' }}> | ||
| <div style={{ display: 'flex', alignItems: 'center' }}> | ||
| <span style={{ fontWeight: 700, fontSize: '15px', flex: 1 }}>Test Run</span> | ||
| <button | ||
| onClick={onClose} | ||
| style={{ background: 'none', border: 'none', fontSize: '18px', cursor: 'pointer', color: '#666' }} | ||
| > | ||
| ✕ | ||
| </button> | ||
| </div> | ||
|
|
||
| <div style={{ fontSize: '12px', color: '#888', fontFamily: 'monospace' }}> | ||
| POST /api/v1/internal-prediction/<span style={{ color: '#1976d2' }}>{agentflowId}</span> | ||
| </div> | ||
|
|
||
| <textarea | ||
| value={question} | ||
| onChange={(e) => setQuestion(e.target.value)} | ||
| onKeyDown={(e) => { | ||
| if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) handleRun() | ||
| }} | ||
| placeholder='Enter a question to send to the flow… (⌘+Enter to run)' | ||
| rows={3} | ||
| style={{ | ||
| width: '100%', | ||
| padding: '10px', | ||
| fontSize: '13px', | ||
| border: '1px solid #ddd', | ||
| borderRadius: '6px', | ||
| resize: 'vertical', | ||
| fontFamily: 'inherit', | ||
| boxSizing: 'border-box' | ||
| }} | ||
| /> | ||
|
|
||
| <div style={{ display: 'flex', justifyContent: 'flex-end' }}> | ||
| <button | ||
| onClick={handleRun} | ||
| disabled={running || !question.trim()} | ||
| style={{ | ||
| padding: '7px 20px', | ||
| background: running || !question.trim() ? '#ccc' : '#1976d2', | ||
| color: '#fff', | ||
| border: 'none', | ||
| borderRadius: '5px', | ||
| cursor: running || !question.trim() ? 'not-allowed' : 'pointer', | ||
| fontWeight: 600, | ||
| fontSize: '13px' | ||
| }} | ||
| > | ||
| {running ? 'Running…' : 'Run'} | ||
| </button> | ||
| </div> | ||
|
|
||
| {error && ( | ||
| <div | ||
| style={{ | ||
| background: '#fff3f3', | ||
| border: '1px solid #f5c2c7', | ||
| borderRadius: '6px', | ||
| padding: '10px 14px', | ||
| color: '#d32f2f', | ||
| fontSize: '13px' | ||
| }} | ||
| > | ||
| {error} | ||
| </div> | ||
| )} | ||
|
|
||
| {result !== null && ( | ||
| <div style={{ background: '#f6f8fa', border: '1px solid #e0e0e0', borderRadius: '6px', padding: '12px 14px' }}> | ||
| <div style={{ fontSize: '11px', color: '#888', marginBottom: '6px', fontWeight: 600 }}>RESPONSE</div> | ||
| <div style={{ fontSize: '13px', lineHeight: 1.6 }} dangerouslySetInnerHTML={{ __html: md.render(result) }} /> | ||
| </div> | ||
| )} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
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.
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.
Uh oh!
There was an error while loading. Please reload this page.