Renaming internal function to not be confused with dunder methods

Author: axelsrz

libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py

@@ -174,14 +174,14 @@ async def on_event(context: TurnContext, state: TurnState):
         - `type`: The type of the activity
         """
 
-        def __selector__(context: TurnContext):
+        def __selector(context: TurnContext):
             return type == context.activity.type
 
-        def __call__(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
-            self._routes.append(Route[StateT](__selector__, func))
+        def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
+            self._routes.append(Route[StateT](__selector, func))
             return func
 
-        return __call__
+        return __call
 
     def message(
         self, select: Union[str, Pattern[str], List[Union[str, Pattern[str]]]]
@@ -201,7 +201,7 @@ async def on_hi_message(context: TurnContext, state: TurnState):
         - `select`: a string or regex pattern
         """
 
-        def __selector__(context: TurnContext):
+        def __selector(context: TurnContext):
             if context.activity.type != ActivityTypes.message:
                 return False
 
@@ -212,11 +212,11 @@ def __selector__(context: TurnContext):
 
             return text == select
 
-        def __call__(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
-            self._routes.append(Route[StateT](__selector__, func))
+        def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
+            self._routes.append(Route[StateT](__selector, func))
             return func
 
-        return __call__
+        return __call
 
     def conversation_update(
         self, type: ConversationUpdateTypes
@@ -238,7 +238,7 @@ async def on_channel_created(context: TurnContext, state: TurnState):
         - `type`: a string or regex pattern
         """
 
-        def __selector__(context: TurnContext):
+        def __selector(context: TurnContext):
             if context.activity.type != ActivityTypes.conversation_update:
                 return False
 
@@ -258,11 +258,11 @@ def __selector__(context: TurnContext):
 
             return False
 
-        def __call__(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
-            self._routes.append(Route[StateT](__selector__, func))
+        def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
+            self._routes.append(Route[StateT](__selector, func))
             return func
 
-        return __call__
+        return __call
 
     def message_reaction(
         self, type: MessageReactionTypes
@@ -283,7 +283,7 @@ async def on_reactions_added(context: TurnContext, state: TurnState):
         - `type`: a string or regex pattern
         """
 
-        def __selector__(context: TurnContext):
+        def __selector(context: TurnContext):
             if context.activity.type != ActivityTypes.message_reaction:
                 return False
 
@@ -299,11 +299,11 @@ def __selector__(context: TurnContext):
 
             return False
 
-        def __call__(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
-            self._routes.append(Route[StateT](__selector__, func))
+        def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
+            self._routes.append(Route[StateT](__selector, func))
             return func
 
-        return __call__
+        return __call
 
     def message_update(
         self, type: MessageUpdateTypes
@@ -324,7 +324,7 @@ async def on_edit_message(context: TurnContext, state: TurnState):
         - `type`: a string or regex pattern
         """
 
-        def __selector__(context: TurnContext):
+        def __selector(context: TurnContext):
             if type == "editMessage":
                 if (
                     context.activity.type == ActivityTypes.message_update
@@ -353,11 +353,11 @@ def __selector__(context: TurnContext):
                 return False
             return False
 
-        def __call__(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
-            self._routes.append(Route[StateT](__selector__, func))
+        def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
+            self._routes.append(Route[StateT](__selector, func))
             return func
 
-        return __call__
+        return __call
 
     def handoff(
         self,
@@ -377,13 +377,13 @@ async def on_handoff(
         ```
         """
 
-        def __selector__(context: TurnContext) -> bool:
+        def __selector(context: TurnContext) -> bool:
             return (
                 context.activity.type == ActivityTypes.invoke
                 and context.activity.name == "handoff/action"
             )
 
-        def __call__(
+        def __call(
             func: Callable[[TurnContext, StateT, str], Awaitable[None]],
         ) -> Callable[[TurnContext, StateT, str], Awaitable[None]]:
             async def __handler__(context: TurnContext, state: StateT):
@@ -398,10 +398,10 @@ async def __handler__(context: TurnContext, state: StateT):
                 )
                 return True
 
-            self._routes.append(Route[StateT](__selector__, __handler__, True))
+            self._routes.append(Route[StateT](__selector, __handler__, True))
             return func
 
-        return __call__
+        return __call
 
     def before_turn(self, func: RouteHandler[StateT]) -> RouteHandler[StateT]:
         """

test_samples/app_style_emtpy/emtpy_agent.py

@@ -78,7 +78,7 @@ async def on_members_added(context: TurnContext, _state: TurnState):
 
 @AGENT_APP.message(re.compile(r"^hello$"))
 async def on_hello(context: TurnContext, _state: TurnState):
-    await context.send_activity("Hello! How can I assist you today?")
+    await context.send_activity("Hello!")
 
 
 @AGENT_APP.activity("message")