Merge pull request #408 from SylphAI-Inc/main

[release] blog section

Author: liyin2015

adalflow/adalflow/core/runner.py

@@ -256,6 +256,7 @@ def call(
 
         while step_count < self.max_steps:
             try:
+                printc(f'agent planner prompt: {self.agent.planner.get_prompt(**prompt_kwargs)}')
                 # Execute one step
                 output = self.agent.planner.call(
                     prompt_kwargs=prompt_kwargs,
@@ -313,7 +314,6 @@ def _tool_execute_sync(
         # Handle cases where result is not wrapped in FunctionOutput (e.g., in tests)
         if not isinstance(result, FunctionOutput):
             # If it's a direct result from mocks or other sources, wrap it in FunctionOutput
-            from adalflow.core.types import FunctionOutput
             if hasattr(result, 'output'):
                 # Already has output attribute, use it directly
                 wrapped_result = FunctionOutput(
@@ -367,6 +367,7 @@ async def acall(
 
         while step_count < self.max_steps:
             try:
+                printc(f'agent planner prompt: {self.agent.planner.get_prompt(**prompt_kwargs)}')
                 # Execute one step asynchronously
                 output = await self.agent.planner.acall(
                     prompt_kwargs=prompt_kwargs,
@@ -405,7 +406,7 @@ async def acall(
                         self.agent.planner.get_prompt(**prompt_kwargs)
                     )
                 )
-                printc(f'agent planner prompt: {self.agent.planner.get_prompt(**prompt_kwargs)}')
+                
 
                 step_count += 1
 
@@ -480,7 +481,8 @@ async def impl_astream(
                 if not isinstance(function_result, FunctionOutput):
                     raise ValueError(f"Result must be wrapped in FunctionOutput, got {type(function_result)}")
 
-                function_output = function_result.output 
+                function_output = function_result.output
+                # TODO: function needs a stream_events 
                 real_function_output = None
 
                 if inspect.iscoroutine(function_output):
@@ -493,6 +495,9 @@ async def impl_astream(
                         self._event_queue.put_nowait(item)
                         function_results.append(item)
                     real_function_output = function_results[-1]
+                else:
+                    real_function_output = function_output
+                    self._event_queue.put_nowait(function_output)
                     # function_results = []
                     # async for item in function_output:
                     #     function_results.append(item)

adalflow/adalflow/core/tool_manager.py

@@ -434,10 +434,9 @@ async def execute_func_async(self, func: Function) -> FunctionOutput:
                 raise ValueError(error_msg)
 
             # it can only be coroutine or function output
-            printc(f"result: {result}", color="yellow") 
             if inspect.iscoroutine(result):
-                printc(f"result is coroutine", color="yellow")
                 result = await result
+                printc(f"result after await: {result}", color="yellow")
             else:
                 printc(f"result is not coroutine", color="yellow")
 

adalflow/adalflow/core/types.py

@@ -603,6 +603,16 @@ class FunctionOutput(DataClass):
     )
 
 
+#######################################################################################
+# Data modeling for component tool
+######################################################################################
+@dataclass
+class ComponentToolOutput(DataClass):
+    output: Any = field(default=None, metadata={"description": "The output of the tool"})
+    observation: Optional[str] = field(default=None, metadata={"description": "The observation of the llm see of the output of the tool"})
+    is_streaming: Optional[bool] = field(default=False, metadata={"description": "Whether the tool output is streaming"}) 
+
+
 #######################################################################################
 # Data modeling for agent component
 ######################################################################################

docs/Makefile

@@ -58,3 +58,14 @@ update_files:
 
 html: apidoc  update_files
 	@$(SPHINXBUILD) -b html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+# Convenience target to build docs with design documents
+build-with-design: apidoc html
+	@echo "Documentation built with design documents included!"
+
+# Quick build command
+quick:
+	@$(SPHINXBUILD) -b html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+# Clean and rebuild everything
+rebuild: clean build-with-design