Merge remote-tracking branch 'origin/main' into feat/v1.5-upgrade

Author: MikeRyanDev

apps/dojo/src/components/sidebar/sidebar.tsx

@@ -3,7 +3,7 @@
 import React, { useState, useEffect } from "react";
 import { EyeIcon as Eye, CodeIcon as Code, BookOpenTextIcon as Book } from "@phosphor-icons/react";
 import { cn } from "@/lib/utils";
-import { useRouter, usePathname } from "next/navigation";
+import { useRouter, usePathname, useSearchParams } from "next/navigation";
 import { DemoList } from "@/components/demo-list/demo-list";
 import { ThemeToggle } from "@/components/ui/theme-toggle";
 import { ChevronDown } from "lucide-react";
@@ -31,6 +31,7 @@ interface SidebarProps {
 export function Sidebar({ isMobile, onMobileClose }: SidebarProps) {
   const router = useRouter();
   const pathname = usePathname();
+  const searchParams = useSearchParams();
   const { theme, setTheme } = useTheme();
   const isDarkTheme = theme === "dark"
   const { view, frameworkPickerHidden, viewPickerHidden, featurePickerHidden, setView} = useURLParams();
@@ -56,7 +57,10 @@ export function Sidebar({ isMobile, onMobileClose }: SidebarProps) {
   // Handle selecting a demo
   const handleDemoSelect = (demoId: string) => {
     if (currentIntegration) {
-      router.push(`/${currentIntegration.id}/feature/${demoId}`);
+      const queryString = searchParams.toString();
+      const newPath = `/${currentIntegration.id}/feature/${demoId}`;
+      const url = queryString ? `${newPath}?${queryString}` : newPath;
+      router.push(url);
       // Close mobile sidebar when demo is selected
       if (isMobile && onMobileClose) {
         onMobileClose();
@@ -66,7 +70,10 @@ export function Sidebar({ isMobile, onMobileClose }: SidebarProps) {
 
   // Handle integration selection
   const handleIntegrationSelect = (integrationId: string) => {
-    router.push(`/${integrationId}`);
+    const queryString = searchParams.toString();
+    const newPath = `/${integrationId}`;
+    const url = queryString ? `${newPath}?${queryString}` : newPath;
+    router.push(url);
   };
 
   const tabClass = `cursor-pointer flex-1 h-8 px-2 text-sm text-primary shadow-none bg-none border-none font-medium gap-1 rounded-lg data-[state=active]:bg-white data-[state=active]:text-primary data-[state=active]:shadow-none`

integrations/langgraph/python/ag_ui_langgraph/agent.py

@@ -235,7 +235,7 @@ async def _handle_stream_events(self, input: RunAgentInput) -> AsyncGenerator[st
                 CustomEvent(
                     type=EventType.CUSTOM,
                     name=LangGraphEventTypes.OnInterrupt.value,
-                    value=json.dumps(interrupt.value, default=json_safe_stringify) if not isinstance(interrupt.value, str) else interrupt.value,
+                    value=dump_json_safe(interrupt.value),
                     raw_event=interrupt,
                 )
             )
@@ -311,7 +311,7 @@ async def prepare_stream(self, input: RunAgentInput, agent_state: State, config:
                     CustomEvent(
                         type=EventType.CUSTOM,
                         name=LangGraphEventTypes.OnInterrupt.value,
-                        value=json.dumps(interrupt.value) if not isinstance(interrupt.value, str) else interrupt.value,
+                        value=dump_json_safe(interrupt.value),
                         raw_event=interrupt,
                     )
                 )
@@ -696,7 +696,7 @@ async def _handle_single_event(self, event: Any, state: State) -> AsyncGenerator
                     ToolCallArgsEvent(
                         type=EventType.TOOL_CALL_ARGS,
                         tool_call_id=tool_call_output.tool_call_id,
-                        delta=json.dumps(event["data"]["input"]),
+                        delta=dump_json_safe(event["data"]["input"]),
                         raw_event=event
                     )
                 )
@@ -713,7 +713,7 @@ async def _handle_single_event(self, event: Any, state: State) -> AsyncGenerator
                     type=EventType.TOOL_CALL_RESULT,
                     tool_call_id=tool_call_output.tool_call_id,
                     message_id=str(uuid.uuid4()),
-                    content=tool_call_output.content,
+                    content=dump_json_safe(tool_call_output.content),
                     role="tool"
                 )
             )
@@ -872,3 +872,7 @@ def get_stream_kwargs(
             kwargs.update(fork)
 
         return kwargs
+
+
+def dump_json_safe(value):
+    return json.dumps(value, default=json_safe_stringify) if not isinstance(value, str) else value

integrations/langgraph/python/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ag-ui-langgraph"
-version = "0.0.17"
+version = "0.0.19"
 description = "Implementation of the AG-UI protocol for LangGraph."
 authors = ["Ran Shem Tov <[email protected]>"]
 readme = "README.md"