Merge pull request #425 from NVIDIA/feature/colang-meta-decorator

Feature/colang meta decorator
NVIDIA · Mar 25, 2024 · fa63bfd · fa63bfd
2 parents 6c4fc87 + 44afb59
commit fa63bfd
Show file tree

Hide file tree

Showing 14 changed files with 222 additions and 139 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,36 +11,13 @@
                 "PYTHONPATH": "${workspaceFolder}${pathSeparator}${env:PYTHONPATH}"
             }
         },
-        {
-            "name": "Debug story very verbose (current directory)",
-            "type": "debugpy",
-            "request": "launch",
-            "console": "integratedTerminal",
-            "module": "nemoguardrails",
-            "args": [
-                "chat",
-                "--config=${fileDirname}",
-                "--verbose",
-                "--debug-level=DEBUG"
-            ],
-            "justMyCode": true,
-            "env": {
-                "PYTHONPATH": "${workspaceFolder}${pathSeparator}${env:PYTHONPATH}"
-            }
-        },
         {
             "name": "Debug story verbose (current directory)",
             "type": "debugpy",
             "request": "launch",
             "console": "integratedTerminal",
             "module": "nemoguardrails",
-            "args": [
-                "chat",
-                "--config=${fileDirname}",
-                "--verbose",
-                "--verbose-llm-calls",
-                "--debug-level=INFO"
-            ],
+            "args": ["chat", "--config=${fileDirname}", "--debug-level=DEBUG"],
             "justMyCode": true,
             "env": {
                 "PYTHONPATH": "${workspaceFolder}${pathSeparator}${env:PYTHONPATH}"
@@ -52,7 +29,7 @@
             "request": "launch",
             "console": "integratedTerminal",
             "module": "nemoguardrails",
-            "args": ["chat", "--config=${fileDirname}", "--verbose"],
+            "args": ["chat", "--config=${fileDirname}", "--debug-level=INFO"],
             "justMyCode": true,
             "env": {
                 "PYTHONPATH": "${workspaceFolder}${pathSeparator}${env:PYTHONPATH}"
@@ -64,7 +41,7 @@
             "request": "launch",
             "console": "integratedTerminal",
             "module": "nemoguardrails",
-            "args": ["chat", "--config=${fileDirname}", "--verbose-llm-calls"],
+            "args": ["chat", "--config=${fileDirname}", "--verbose"],
             "justMyCode": true,
             "env": {
                 "PYTHONPATH": "${workspaceFolder}${pathSeparator}${env:PYTHONPATH}"

diff --git a/nemoguardrails/actions/llm/utils.py b/nemoguardrails/actions/llm/utils.py
@@ -173,8 +173,19 @@ def get_colang_history(
         action_group: List[InternalEvent] = []
         current_intent: Optional[str] = None
 
+        previous_event = None
         for event in events:
             if not isinstance(event, InternalEvent):
+                # Skip non-internal events
+                continue
+
+            if (
+                event.name == InternalEvents.USER_ACTION_LOG
+                and previous_event
+                and events_to_dialog_history([previous_event])
+                == events_to_dialog_history([event])
+            ):
+                # Remove duplicated user action log events that stem from the same user event as the previous event
                 continue
 
             if (
@@ -191,6 +202,8 @@ def get_colang_history(
 
                 action_group.append(event)
                 current_intent = event.arguments["intent_flow_id"]
+
+                previous_event = event
             elif (
                 event.name == InternalEvents.BOT_INTENT_LOG
                 or event.name == InternalEvents.USER_INTENT_LOG
@@ -215,6 +228,8 @@ def get_colang_history(
                 action_group.clear()
                 current_intent = None
 
+                previous_event = event
+
         if action_group:
             new_history.append(events_to_dialog_history(action_group))
 

diff --git a/nemoguardrails/actions/v2_x/generation.py b/nemoguardrails/actions/v2_x/generation.py
@@ -114,15 +114,9 @@ async def _init_flows_index(self) -> None:
             if colang_flow:
                 assert isinstance(flow, Flow)
                 # Check if we need to exclude this flow.
-                # TODO: deprecate the use of the "# meta: " comment in favor of
-                #   @meta(llm_exclude=True)
-                if "# meta: exclude from llm" in colang_flow or (
-                    "exclude_from_llm" not in flow.file_info
-                    or flow.file_info["exclude_from_llm"]
-                    or (
-                        "meta" in flow.decorators
-                        and flow.decorators["meta"].parameters.get("llm_exclude")
-                    )
+                if flow.file_info.get("exclude_from_llm") or (
+                    "meta" in flow.decorators
+                    and flow.decorators["meta"].parameters.get("llm_exclude")
                 ):
                     continue
 
@@ -194,7 +188,7 @@ async def generate_user_intent(
                 if isinstance(flow_id, str) and (
                     flow_config is None
                     or (
-                        "# meta: user intent" in flow_config.source_code
+                        flow_config.has_meta_tag("user_intent")
                         and flow_id not in potential_user_intents
                     )
                 ):
@@ -453,8 +447,8 @@ async def generate_flow_continuation(
         return {
             "name": flow_name,
             "parameters": flow_parameters,
-            "body": f"flow {flow_name}\n"
-            + f'  # meta: bot intent = "{intent}"\n'
+            "body": f'@meta(bot_intent="{intent}")\n'
+            + f"flow {flow_name}\n"
             + "\n".join(["  " + l.strip(" ") for l in lines]),
         }
 

diff --git a/nemoguardrails/colang/v2_x/lang/transformer.py b/nemoguardrails/colang/v2_x/lang/transformer.py
@@ -209,7 +209,7 @@ def _flow_def(self, children: dict, meta: Meta) -> Flow:
         )
 
     def _remove_source_code_comments(self, source: str) -> str:
-        pattern = r"#(?! (llm:|meta:))[^\n]*"
+        pattern = r"#[^\n]*"
         return re.sub(pattern, "", source)
 
     def _spec_op(self, children: list, meta: Meta) -> SpecOp:
@@ -558,9 +558,11 @@ def __default__(self, data, children: list, meta: Meta) -> dict:
 
         # Transform tokens to dicts
         children = [
-            child
-            if not isinstance(child, Token)
-            else {"_type": child.type, "elements": [child.value]}
+            (
+                child
+                if not isinstance(child, Token)
+                else {"_type": child.type, "elements": [child.value]}
+            )
             for child in children
         ]
 

diff --git a/nemoguardrails/colang/v2_x/library/avatars.co b/nemoguardrails/colang/v2_x/library/avatars.co
@@ -1,5 +1,3 @@
-# meta: exclude from llm
-
 ################################################################
 # COLANG 2.0 AVATARS CORE LIBRARY
 # VERSION 0.2.0
@@ -35,13 +33,15 @@
 #-------
 ################################################################
 
+# meta: exclude from llm
+
 # -----------------------------------
 # User UMIM event wrapper flows
 # DON'T CHANGE! Currently, hard-wired with LLM prompt generation
 # -----------------------------------
 
+@meta(user_action='user said "{$transcript}"')
 flow user said $text -> $transcript
-  # meta: user action
   match UtteranceUserAction.Finished(final_transcript=$text) as $event
   $transcript = $event.final_transcript
 
@@ -71,8 +71,8 @@ flow user saying something -> $transcript
   #send UserActionLog(flow_id="user saying", parameter=$event.interim_transcript, intent_flow_id="user saying something")
   $transcript = $event.interim_transcript
 
+@meta(user_action='selected choice "{$choice}"')
 flow user selected choice $choice_id -> $choice
-  # meta: user action
   match VisualChoiceSceneAction.ChoiceUpdated(current_choice=[$choice_id]) as $event
   $choice = $event.current_choice
 
@@ -86,9 +86,9 @@ flow unhandled user intent -> $intent
   $intent = $event.flow_id
 
 @loop("user_was_silent")
+@meta(user_intent=True)
 flow user was silent $time_s
   """Triggers when user was silent for $time_s seconds."""
-  # meta: user intent
   while True
     start wait $time_s as $timer_ref
     when $timer_ref.Finished()
@@ -100,9 +100,9 @@ flow user was silent $time_s
       send $timer_ref.Stop()
 
 @loop("user_did_not_respond")
+@meta(user_intent=True)
 flow user didnt respond $time_s
   """Triggers when user was silent for $time_s seconds while bot was silent."""
-  # meta: user intent
   while True
     start wait $time_s as $timer_ref
     when $timer_ref.Finished()
@@ -116,9 +116,9 @@ flow user didnt respond $time_s
     orwhen UtteranceUserAction.Finished() or UtteranceBotAction.Finished()
       send $timer_ref.Stop()
 
+@meta(user_intent=True)
 flow user interrupted bot talking $sentence_length=15
   """Triggers when the user talked while bot is speaking."""
-  # meta: user intent
   global $bot_talking_state
   while True
     if $bot_talking_state
@@ -197,15 +197,15 @@ flow bot started a posture -> $posture
   match FlowStarted(flow_id="bot posture") as $event
   $posture = $event.posture
 
+@meta(bot_action=True)
 flow bot started an action -> $action
-  # meta: bot action
   match bot started saying something as $action
     or bot started a gesture as $action
     or bot started a posture as $action
 
 @loop("bot_was_silent")
+@meta(bot_intent=True)
 flow bot was silent $time_s
-  # meta: bot intent
   while True
     start wait $time_s as $timer_ref
     when $timer_ref.Finished()
@@ -225,70 +225,70 @@ flow _bot_say $text
   """It's an internal helper for higher semantic level flows"""
   await UtteranceBotAction(script=$text) as $action
 
+@meta(bot_action=True)
 flow bot gesture $gesture
-  # meta: bot action
   await GestureBotAction(gesture=$gesture) as $action
 
+@meta(bot_action=True)
 flow bot gesture with delay $gesture $delay
-  # meta: bot action
   wait $delay
   bot gesture $gesture
 
+@meta(bot_action=True)
 flow bot posture $posture
-  # meta: bot action
   await PostureBotAction(posture=$posture) as $action
 
+@meta(bot_action=True)
 flow scene show choice $prompt
-  # meta: bot action
   await VisualChoiceSceneAction(prompt=$prompt,choice_type="selection", allow_multiple_choices=False) as $action
 
+@meta(bot_action=True)
 flow scene show textual information $title $text $header_image
-  # meta: bot action
   await VisualInformationSceneAction(title=$title, support_prompts=[], content=[{"image":$header_image},{"text":$text}]) as $action
 
+@meta(bot_action=True)
 flow scene show short information $info
-  # meta: bot action
   await VisualInformationSceneAction(title=$info, support_prompts=[], content=[]) as $action
 
+@meta(bot_action=True)
 flow scene show form $prompt
-  # meta: bot action
   await VisualInformationSceneAction(prompt=$prompt) as $action
 
 # ----------------------------------
 # Bot action semantic wrapper flows
 # DON'T CHANGE! Currently, hard-wired with LLM prompt generation
 # -----------------------------------
 
+@meta(bot_action=True)
 flow bot say $text
-  # meta: bot action
   await _bot_say $text
 
 flow bot say something like $text
   $variation = i"Return a single string that is a new variation of: {$text}"
   await bot say $variation
 
+@meta(bot_action=True)
 flow bot inform $text
-  # meta: bot action
   await _bot_say $text
 
+@meta(bot_action=True)
 flow bot ask $text
-  # meta: bot action
   await _bot_say $text
 
+@meta(bot_action=True)
 flow bot express $text
-  # meta: bot action
   await _bot_say $text
 
+@meta(bot_action=True)
 flow bot respond $text
-  # meta: bot action
   await _bot_say $text
 
+@meta(bot_action=True)
 flow bot clarify $text
-  # meta: bot action
   await _bot_say $text
 
+@meta(bot_action=True)
 flow bot suggest $text
-  # meta: bot action
   await _bot_say $text
 
 # ----------------------------------
@@ -529,8 +529,8 @@ flow execute llm instruction $instructions
   match $event_ref.flow.Finished()
   await RemoveFlowsAction(flow_ids=[$flow_info.name])
 
+@meta(user_intent=True)
 flow user requested a task
-  # meta: user intent
   user said "do something"
     or user said "can you do something"
     or user said "please do"

diff --git a/nemoguardrails/colang/v2_x/library/core.co b/nemoguardrails/colang/v2_x/library/core.co
@@ -1,5 +1,5 @@
+@meta(user_action='user said "{$transcript}"')
 flow user said $text -> $transcript
-  # meta: user action
   match UtteranceUserAction.Finished(final_transcript=$text) as $event
   $transcript = $event.final_transcript
 
@@ -16,6 +16,6 @@ flow _bot_say $text
   """It's an internal helper for higher semantic level flows"""
   await UtteranceBotAction(script=$text) as $action
 
+@meta(bot_action=True)
 flow bot say $text
-  # meta: bot action
   await _bot_say $text