Merge pull request #154 from run-llama/terry/handler_refactor

refactor workflow/handler store

Author: zhaotai

.changeset/cold-buttons-lie.md

@@ -0,0 +1,6 @@
+---
+"@llamaindex/workflow-debugger": patch
+"@llamaindex/ui": patch
+---
+
+refactor workflow/handler store

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/ui-monorepo",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "type": "module",
   "scripts": {
@@ -42,4 +42,4 @@
     "@vitejs/plugin-react-swc": "^4.1.0"
   },
   "packageManager": "pnpm@10.11.1+sha512.e519b9f7639869dc8d5c3c5dfef73b3f091094b0a006d7317353c72b124e80e1afd429732e28705ad6bfa1ee879c1fce46c128ccebd3192101f43dd67c667912"
-}
+}

packages/server-py/main.py

@@ -1,7 +1,8 @@
 import asyncio
 import logging
 from workflows.server import WorkflowServer
-from test_workflows.basic_worklfow import CalculatorWorkflow
+from test_workflows.sum import SumWorkflow
+from test_workflows.subtract import SubtractWorkflow
 
 # Configure logging to output to stdout
 logging.basicConfig(
@@ -15,7 +16,8 @@ async def main() -> None:
     server = WorkflowServer()
 
     # Register workflows
-    server.add_workflow("calculator", CalculatorWorkflow())
+    server.add_workflow("sum", SumWorkflow())
+    server.add_workflow("subtract", SubtractWorkflow())
 
     # Enable auto-reload for development
     await server.serve(

packages/server-py/pyproject.toml

@@ -6,5 +6,5 @@ readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
    "llama-index>=0.14.5",
-   "llama-index-workflows[server]>=2.8.0",
+   "llama-index-workflows[server]>=2.10.0",
 ]

packages/server-py/test_workflows/subtract.py

@@ -0,0 +1,60 @@
+import asyncio
+from workflows.context import Context
+from workflows import Workflow, step
+from workflows.events import Event, StartEvent, StopEvent
+from logging import getLogger
+
+logger = getLogger(__name__)
+
+class SubtractInput(StartEvent):
+    a: int
+    b: int
+
+class ProgressEvent(Event):
+    step: str
+    progress: int
+    message: str
+
+class CalculateRequestEvent(Event):
+    a: int
+    b: int
+
+class CalculateResponseEvent(Event):
+    result: int
+
+class SubtractOutput(StopEvent):
+    results: int
+
+class SubtractWorkflow(Workflow):
+    @step
+    async def initialize(self, ctx: Context, ev: SubtractInput) -> CalculateRequestEvent:
+        logger.info("Starting Subtract workflow")
+        ctx.write_event_to_stream(
+            ProgressEvent(
+                step="start",
+                progress=10,
+                message="Starting Subtract workflow"
+            )
+        )
+        await asyncio.sleep(1.0)
+        return CalculateRequestEvent(a=ev.a, b=ev.b)
+    
+    @step
+    async def Subtract(self, ctx: Context, ev: CalculateRequestEvent) -> CalculateResponseEvent:
+        logger.info("Calculating result")
+        await asyncio.sleep(1.0)
+        ctx.write_event_to_stream(
+            ProgressEvent(
+                step="calculate",
+                progress=50,
+                message="Calculating result"
+            )
+        )
+        result = ev.a - ev.b
+        return CalculateResponseEvent(result=result)
+
+    @step
+    async def finalize(self, ctx: Context, ev: CalculateResponseEvent) -> SubtractOutput:
+        logger.info("Finalizing result")
+        await asyncio.sleep(1.0)
+        return SubtractOutput(results=ev.result)

packages/server-py/test_workflows/basic_worklfow.py renamed to packages/server-py/test_workflows/sum.py

@@ -2,21 +2,13 @@
 from workflows.context import Context
 from workflows import Workflow, step
 from workflows.events import Event, StartEvent, StopEvent
-from enum import Enum
 from logging import getLogger
 
 logger = getLogger(__name__)
 
-class Operation(Enum):
-    SUM = "sum"
-    SUBTRACT = "subtract"
-    MULTIPLY = "multiply"
-    DIVIDE = "divide"
-
-class CalculatorInput(StartEvent):
+class SumInput(StartEvent):
     a: int
     b: int
-    operation: Operation
 
 class ProgressEvent(Event):
     step: str
@@ -26,17 +18,16 @@ class ProgressEvent(Event):
 class CalculateRequestEvent(Event):
     a: int
     b: int
-    operation: Operation
 
 class CalculateResponseEvent(Event):
     result: int
 
-class CalculatorOutput(StopEvent):
+class SumOutput(StopEvent):
     results: int
 
-class CalculatorWorkflow(Workflow):
+class SumWorkflow(Workflow):
     @step
-    async def initialize(self, ctx: Context, ev: CalculatorInput) -> CalculateRequestEvent:
+    async def initialize(self, ctx: Context, ev: SumInput) -> CalculateRequestEvent:
         logger.info("Starting sum workflow")
         ctx.write_event_to_stream(
             ProgressEvent(
@@ -46,7 +37,7 @@ async def initialize(self, ctx: Context, ev: CalculatorInput) -> CalculateReques
             )
         )
         await asyncio.sleep(1.0)
-        return CalculateRequestEvent(a=ev.a, b=ev.b, operation=ev.operation)
+        return CalculateRequestEvent(a=ev.a, b=ev.b)
 
     @step
     async def sum(self, ctx: Context, ev: CalculateRequestEvent) -> CalculateResponseEvent:
@@ -59,18 +50,11 @@ async def sum(self, ctx: Context, ev: CalculateRequestEvent) -> CalculateRespons
                 message="Calculating result"
             )
         )
-        if ev.operation == Operation.SUM:
-            result = ev.a + ev.b
-        elif ev.operation == Operation.SUBTRACT:
-            result = ev.a - ev.b
-        elif ev.operation == Operation.MULTIPLY:
-            result = ev.a * ev.b
-        elif ev.operation == Operation.DIVIDE:
-            result = ev.a / ev.b
+        result = ev.a + ev.b
         return CalculateResponseEvent(result=result)
 
     @step
-    async def finalize(self, ctx: Context, ev: CalculateResponseEvent) -> CalculatorOutput:
+    async def finalize(self, ctx: Context, ev: CalculateResponseEvent) -> SumOutput:
         logger.info("Finalizing result")
         await asyncio.sleep(1.0)
-        return CalculatorOutput(results=ev.result)
+        return SumOutput(results=ev.result)

packages/server-py/uv.lock

@@ -32,6 +32,7 @@ const languageOptions = {
     ecmaVersion: 2017,
     sourceType: "module",
     projectService: true,
+    tsconfigRootDir: import.meta.dirname,
   },
 };
 

packages/ui/eslint.config.mjs

@@ -338,15 +338,16 @@
     "sonner": "^2.0.5",
     "tailwind-merge": "^3.3.1",
     "uuid": "^13.0.0",
+    "valtio": "^2.1.8",
     "vaul": "^1.1.2",
     "zod": "^3.25.76",
     "zustand": "^5.0.6"
   },
   "peerDependencies": {
     "@llamaindex/workflows-client": "^1.2.0",
     "llama-cloud-services": "^0.3.6",
-    "react": ">=18 <20",
-    "react-dom": ">=18 <20"
+    "react": "catalog:",
+    "react-dom": "catalog:"
   },
   "devDependencies": {
     "@chromatic-com/storybook": "^4.0.1",
@@ -364,8 +365,8 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/glob": "^9.0.0",
     "@types/node": "^20.0.0",
-    "@types/react": "19.2.2",
-    "@types/react-dom": "18.3.7",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
     "@vitejs/plugin-react-swc": "^4.1.0",
     "@vitest/browser": "^3.2.4",
     "@vitest/coverage-v8": "^3.2.3",
@@ -379,8 +380,8 @@
     "msw-storybook-addon": "^2.0.5",
     "playwright": "^1.56.1",
     "postcss-cli": "^11.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "react": "catalog:",
+    "react-dom": "catalog:",
     "storybook": "^9.1.3",
     "tailwind-classname-prefix-loader": "^1.0.6",
     "tailwindcss": "^4",

packages/ui/package.json

@@ -12,6 +12,7 @@ export interface StreamSubscriber<TEvent> {
   onStart?: () => void;
   onData?: (event: TEvent) => void;
   onError?: (error: Error) => void;
+  onCancel?: () => void;
   onSuccess?: (allEvents: TEvent[]) => void;
   onComplete?: () => void; // Called when stream ends (success or error)
 }