Chore(code) clean up deprecated code

dapr_agents/__init__.py

@@ -32,7 +32,6 @@
     "OpenAIEmbeddingClient",
     "AgentTool",
     "tool",
-    "AgenticWorkflow",
     "LLMOrchestrator",
     "RandomOrchestrator",
     "RoundRobinOrchestrator",

dapr_agents/agents/orchestrators/llm/orchestrator.py

@@ -14,7 +14,7 @@
     BroadcastMessage,
     TriggerAction,
 )
-from dapr_agents.workflow.decorators.routers import message_router
+from dapr_agents.workflow.decorators.decorators import message_router
 from dapr_agents.workflow.decorators import workflow_entry
 from dapr_agents.agents.orchestrators.llm.prompts import (
     NEXT_STEP_PROMPT,

dapr_agents/agents/orchestrators/random.py

@@ -20,7 +20,7 @@
     BroadcastMessage,
     TriggerAction,
 )
-from dapr_agents.workflow.decorators.routers import message_router
+from dapr_agents.workflow.decorators.decorators import message_router
 from dapr_agents.workflow.decorators import workflow_entry
 from dapr_agents.workflow.utils.pubsub import broadcast_message, send_message_to_agent
 

dapr_agents/agents/orchestrators/roundrobin.py

@@ -19,7 +19,7 @@
     BroadcastMessage,
     TriggerAction,
 )
-from dapr_agents.workflow.decorators.routers import message_router
+from dapr_agents.workflow.decorators.decorators import message_router
 from dapr_agents.workflow.decorators import workflow_entry
 from dapr_agents.workflow.utils.pubsub import broadcast_message, send_message_to_agent
 

dapr_agents/workflow/__init__.py

@@ -1,15 +1,11 @@
 from .decorators import (
     message_router,
     http_router,
-    llm_activity,
-    agent_activity,
     workflow_entry,
 )
 
 __all__ = [
     "message_router",
     "http_router",
-    "llm_activity",
-    "agent_activity",
     "workflow_entry",
 ]

dapr_agents/workflow/decorators/__init__.py

@@ -1,10 +1,7 @@
-from .routers import message_router, http_router
-from .activities import llm_activity, agent_activity, workflow_entry
+from .decorators import message_router, http_router, workflow_entry
 
 __all__ = [
     "message_router",
     "http_router",
-    "llm_activity",
-    "agent_activity",
     "workflow_entry",
 ]

dapr_agents/workflow/decorators/routers.py → dapr_agents/workflow/decorators/decorators.py

@@ -2,7 +2,7 @@
 
 import logging
 from copy import deepcopy
-from typing import Any, Callable, List, Literal, Optional, Type, get_type_hints
+from typing import Any, Callable, List, Literal, Optional, Type, TypeVar, get_type_hints
 
 from dapr_agents.workflow.utils.core import is_supported_model
 from dapr_agents.workflow.utils.routers import extract_message_models
@@ -11,6 +11,29 @@
 
 HttpMethod = Literal["GET", "POST", "PUT", "PATCH", "DELETE"]
 
+R = TypeVar("R")
+
+
+def workflow_entry(func: Callable[..., R]) -> Callable[..., R]:
+    """
+    Mark a method/function as the workflow entrypoint for an Agent.
+
+    This decorator does not wrap the function; it simply annotates the callable
+    with `_is_workflow_entry = True` so AgentRunner can discover it on the agent
+    instance via reflection.
+
+    Usage:
+        class MyAgent:
+            @workflow_entry
+            def my_workflow(self, ctx: DaprWorkflowContext, wf_input: dict) -> str:
+                ...
+
+    Returns:
+        The same callable (unmodified), with an identifying attribute.
+    """
+    setattr(func, "_is_workflow_entry", True)  # type: ignore[attr-defined]
+    return func
+
 
 def message_router(
     func: Optional[Callable[..., Any]] = None,

dapr_agents/workflow/runners/agent.py

@@ -608,7 +608,11 @@ def shutdown(
             # First verify we're managing it
             with self._lock:
                 if agent in self._managed_agents:
-                    agent.instrumentor.uninstrument()
+                    try:
+                        agent.instrumentor.uninstrument()
+                    except AttributeError:
+                        # this happens if the agent has no instrumentor
+                        pass
                     agent.stop()  # This is safe as they'll return None if not started
                     self._managed_agents.remove(agent)
                 if len(self._managed_agents) == 0:
@@ -624,7 +628,11 @@ def shutdown(
             with self._lock:
                 agents = list(self._managed_agents)
             for ag in agents:
-                agent.instrumentor.uninstrument()
+                try:
+                    agent.instrumentor.uninstrument()
+                except AttributeError:
+                    # this happens if the agent has no instrumentor
+                    pass
                 ag.stop()
             self._close_wf_client()
             self._close_dapr_client()

quickstarts/01-dapr-agents-fundamentals/05_agent_memory.py

@@ -21,7 +21,7 @@ async def main() -> None:
         # Configure the agent to use Dapr State Store for conversation history.
         memory=AgentMemoryConfig(
             store=ConversationDaprStateMemory(
-                store_name="conversation-statestore",
+                store_name="agent-memory",
                 session_id=Path(__file__).stem,
             )
         ),

quickstarts/01-dapr-agents-fundamentals/06_durable_agent_http.py

@@ -22,13 +22,13 @@ def main() -> None:
         # Configure the agent to use Dapr State Store for conversation history.
         memory=AgentMemoryConfig(
             store=ConversationDaprStateMemory(
-                store_name="conversation-statestore",
+                store_name="agent-memory",
                 session_id=Path(__file__).stem,
             )
         ),
         # This is where the execution state is stored
         state=AgentStateConfig(
-            store=StateStoreService(store_name="workflow-statestore"),
+            store=StateStoreService(store_name="agent-workflow"),
         ),
     )
 

quickstarts/01-dapr-agents-fundamentals/07_durable_agent_pubsub.py

@@ -28,17 +28,17 @@ async def main() -> None:
         # Configure the agent to use Dapr State Store for conversation history.
         memory=AgentMemoryConfig(
             store=ConversationDaprStateMemory(
-                store_name="conversation-statestore",
+                store_name="agent-memory",
                 session_id=Path(__file__).stem,
             )
         ),
         # This is where the execution state is stored
         state=AgentStateConfig(
-            store=StateStoreService(store_name="workflow-statestore"),
+            store=StateStoreService(store_name="agent-workflow"),
         ),
         # This is where the agent listens for incoming tasks.
         pubsub=AgentPubSubConfig(
-            pubsub_name="message-pubsub",
+            pubsub_name="agent-pubsub",
             agent_topic="weather.requests",
             broadcast_topic="agents.broadcast",
         ),