mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
c341ee7ed2
* Python: DevUI - Internal Refactor, Conversations API support, and performance improvements Comprehensive refactor of DevUI package including samples relocation, frontend reorganization, OpenAI Conversations API support, and critical performance and code quality improvements. Key Changes: Architecture & Organization - Moved DevUI samples to python/samples/getting_started/devui/ - Consolidated with other framework samples for better discoverability - Added .env.example files and comprehensive README - Restructured frontend components into feature-based folders (agent, workflow, gallery, layout) - Created new OpenAI-compliant message renderers (devui should render oai responses types primarily) New Features - Added _conversations.py (467 lines) - Full conversation storage abstraction, replaces the /threads endpoint to better match oai conversations api - Implements OpenAI Conversations API for thread management, Supports in-memory and extensible storage backends API Simplification - Use 'model' field as entity_id (agent/workflow name) instead of extra_body - Use standard OpenAI 'conversation' field for conversation context. Performance & Quality Improvements - Improved context management in MessageMapper with bounded memory (~500KB max) - Implemented hybrid LRU + cleanup approach to prevent unbounded memory growth - General QOL improvement - Eliminated ~150 lines of dead/duplicate code, Consolidated helper functions into _utils.py, Extracted magic numbers to module-level constants, Optimized conversation item lookups with index-based approach Testing - Added test_conversations.py (13 tests) - Added test_performance_fixes.py (9 tests) - Updated existing tests for code consolidation - 53 tests passing Impact: 76 files changed: +4,106 insertions, -2,373 deletions All linting and formatting checks passing. No breaking changes - backward compatible. Migration: Samples moved to python/samples/getting_started/devui/ * readme lint fixes * initial support for function approval and minor ui fixes
140 lines
4.0 KiB
TypeScript
140 lines
4.0 KiB
TypeScript
import type { Node, Edge } from "@xyflow/react";
|
|
import type { ExecutorNodeData } from "@/components/features/workflow/executor-node";
|
|
|
|
/**
|
|
* Lightweight auto-layout algorithm to replace dagre
|
|
* Handles fan-out nodes properly by spacing siblings
|
|
*/
|
|
export function applySimpleLayout(
|
|
nodes: Node<ExecutorNodeData>[],
|
|
edges: Edge[],
|
|
direction: "TB" | "LR" = "LR"
|
|
): Node<ExecutorNodeData>[] {
|
|
if (nodes.length === 0) return nodes;
|
|
if (nodes.length === 1) {
|
|
return nodes.map((node) => ({
|
|
...node,
|
|
position: { x: 0, y: 0 },
|
|
}));
|
|
}
|
|
|
|
// Create adjacency maps
|
|
const outgoingEdges = new Map<string, string[]>();
|
|
const incomingEdges = new Map<string, string[]>();
|
|
|
|
nodes.forEach((node) => {
|
|
outgoingEdges.set(node.id, []);
|
|
incomingEdges.set(node.id, []);
|
|
});
|
|
|
|
edges.forEach((edge) => {
|
|
outgoingEdges.get(edge.source)?.push(edge.target);
|
|
incomingEdges.get(edge.target)?.push(edge.source);
|
|
});
|
|
|
|
// Find root nodes (nodes with no incoming edges)
|
|
const rootNodes = nodes.filter(
|
|
(node) => (incomingEdges.get(node.id) || []).length === 0
|
|
);
|
|
|
|
if (rootNodes.length === 0) {
|
|
// Fallback: use first node as root if no clear root
|
|
rootNodes.push(nodes[0]);
|
|
}
|
|
|
|
// Constants for spacing
|
|
const NODE_WIDTH = 220;
|
|
const NODE_HEIGHT = 120;
|
|
const HORIZONTAL_SPACING = direction === "LR" ? 350 : 280;
|
|
const VERTICAL_SPACING = direction === "TB" ? 250 : 180;
|
|
|
|
// Track positioned nodes and level information
|
|
const positioned = new Map<string, { x: number; y: number; level: number }>();
|
|
const levelGroups = new Map<number, string[]>();
|
|
|
|
// Build level groups using BFS
|
|
const queue: Array<{ nodeId: string; level: number }> = [];
|
|
const visited = new Set<string>();
|
|
|
|
// Start with root nodes at level 0
|
|
rootNodes.forEach((node) => {
|
|
queue.push({ nodeId: node.id, level: 0 });
|
|
});
|
|
|
|
// BFS to assign levels
|
|
while (queue.length > 0) {
|
|
const { nodeId, level } = queue.shift()!;
|
|
|
|
if (visited.has(nodeId)) continue;
|
|
visited.add(nodeId);
|
|
|
|
// Add to level group
|
|
if (!levelGroups.has(level)) {
|
|
levelGroups.set(level, []);
|
|
}
|
|
levelGroups.get(level)!.push(nodeId);
|
|
|
|
// Add children to next level
|
|
const children = outgoingEdges.get(nodeId) || [];
|
|
children.forEach((childId) => {
|
|
if (!visited.has(childId)) {
|
|
queue.push({ nodeId: childId, level: level + 1 });
|
|
}
|
|
});
|
|
}
|
|
|
|
// Handle orphaned nodes (not connected to root)
|
|
nodes.forEach((node) => {
|
|
if (!visited.has(node.id)) {
|
|
const maxLevel = Math.max(...Array.from(levelGroups.keys()), -1);
|
|
const orphanLevel = maxLevel + 1;
|
|
|
|
if (!levelGroups.has(orphanLevel)) {
|
|
levelGroups.set(orphanLevel, []);
|
|
}
|
|
levelGroups.get(orphanLevel)!.push(node.id);
|
|
}
|
|
});
|
|
|
|
// Position nodes level by level
|
|
levelGroups.forEach((nodeIds, level) => {
|
|
const nodeCount = nodeIds.length;
|
|
|
|
nodeIds.forEach((nodeId, index) => {
|
|
let x: number, y: number;
|
|
|
|
if (direction === "LR") {
|
|
// Horizontal layout: X increases with level, Y centers siblings
|
|
x = level * HORIZONTAL_SPACING;
|
|
|
|
// Center siblings vertically
|
|
const totalHeight = (nodeCount - 1) * VERTICAL_SPACING;
|
|
const startY = -totalHeight / 2;
|
|
y = startY + index * VERTICAL_SPACING;
|
|
} else {
|
|
// Vertical layout: Y increases with level, X centers siblings
|
|
y = level * VERTICAL_SPACING;
|
|
|
|
// Center siblings horizontally
|
|
const totalWidth = (nodeCount - 1) * HORIZONTAL_SPACING;
|
|
const startX = -totalWidth / 2;
|
|
x = startX + index * HORIZONTAL_SPACING;
|
|
}
|
|
|
|
positioned.set(nodeId, { x, y, level });
|
|
});
|
|
});
|
|
|
|
// Apply positions to nodes (centering them on their calculated positions)
|
|
return nodes.map((node) => {
|
|
const pos = positioned.get(node.id) || { x: 0, y: 0 };
|
|
return {
|
|
...node,
|
|
position: {
|
|
x: pos.x - NODE_WIDTH / 2, // Center the node
|
|
y: pos.y - NODE_HEIGHT / 2,
|
|
},
|
|
};
|
|
});
|
|
}
|