markdown-flow 0.2.81__tar.gz → 0.2.82__tar.gz

{markdown_flow-0.2.81 → markdown_flow-0.2.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.2.81
+Version: 0.2.82
 Summary: An agent library designed to parse and process MarkdownFlow documents
 Project-URL: Homepage, https://github.com/ai-shifu/markdown-flow-agent-py
 Project-URL: Bug Tracker, https://github.com/ai-shifu/markdown-flow-agent-py/issues

{markdown_flow-0.2.81 → markdown_flow-0.2.82}/markdown_flow/__init__.py

@@ -88,4 +88,4 @@ __all__ = [
     "replace_variables_in_text",
 ]
 
-__version__ = "0.2.81"
+__version__ = "0.2.82"

{markdown_flow-0.2.81 → markdown_flow-0.2.82}/markdown_flow/constants.py

@@ -237,3 +237,16 @@ CONTEXT_CONVERSATION_TEMPLATE = f"{CONTEXT_CONVERSATION_MARKER}\n{{content}}"
 CONTEXT_BUTTON_OPTIONS_TEMPLATE = (
     f"{CONTEXT_BUTTON_OPTIONS_MARKER}\n可选的预定义选项包括：{{button_options}}\n注意：用户如果选择了这些选项，都应该接受；如果输入了自定义内容，只要是对问题的合理回答即可接受。"
 )
+
+# Next interaction context prompt templates
+NEXT_INTERACTION_CONTEXT_INTRO = (
+    "The next interaction will appear immediately after this content. When generating the current content, connect to it naturally. "
+    "You may briefly restate, explain, or set up the available choices so the user understands what they will decide next, but do not output the interaction syntax or answer on the user's behalf."
+)
+NEXT_INTERACTION_TEXT_INPUT_TEMPLATE = "The next interaction asks the user to answer in text: {question}"
+NEXT_INTERACTION_SINGLE_CHOICE_TEMPLATE = "The next interaction is a single-choice question. The user will choose one option from: {options}"
+NEXT_INTERACTION_MULTIPLE_CHOICE_TEMPLATE = "The next interaction is a multiple-choice question. The user can choose one or more options from: {options}"
+NEXT_INTERACTION_SINGLE_CHOICE_WITH_TEXT_INTRO = "The next interaction is a single-choice question with an optional custom text answer."
+NEXT_INTERACTION_MULTIPLE_CHOICE_WITH_TEXT_INTRO = "The next interaction is a multiple-choice question with an optional custom text answer."
+NEXT_INTERACTION_PREDEFINED_OPTIONS_TEMPLATE = "The predefined options are: {options}."
+NEXT_INTERACTION_CUSTOM_TEXT_PROMPT_TEMPLATE = "The custom text prompt is: {question}"

{markdown_flow-0.2.81 → markdown_flow-0.2.82}/markdown_flow/core.py

@@ -25,6 +25,14 @@ from .constants import (
     INTERACTION_PROMPT_BASE,
     INTERACTION_PROMPT_WITH_TRANSLATION,
     LLM_PROVIDER_REQUIRED_ERROR,
+    NEXT_INTERACTION_CONTEXT_INTRO,
+    NEXT_INTERACTION_CUSTOM_TEXT_PROMPT_TEMPLATE,
+    NEXT_INTERACTION_MULTIPLE_CHOICE_TEMPLATE,
+    NEXT_INTERACTION_MULTIPLE_CHOICE_WITH_TEXT_INTRO,
+    NEXT_INTERACTION_PREDEFINED_OPTIONS_TEMPLATE,
+    NEXT_INTERACTION_SINGLE_CHOICE_TEMPLATE,
+    NEXT_INTERACTION_SINGLE_CHOICE_WITH_TEXT_INTRO,
+    NEXT_INTERACTION_TEXT_INPUT_TEMPLATE,
     OUTPUT_LANGUAGE_INSTRUCTION_BOTTOM,
     OUTPUT_LANGUAGE_INSTRUCTION_TOP,
     UNSUPPORTED_PROMPT_TYPE_ERROR,
@@ -1286,11 +1294,88 @@ class MarkdownFlow:
         if self._output_language:
             user_content = f"<output_language_instruction>\n🚨 OUTPUT: 100% {self._output_language} - Translate ALL non-{self._output_language} words/phrases to {self._output_language} 🚨\n</output_language_instruction>\n\n{user_content}"
 
+        next_interaction_context = self._build_next_interaction_context_prompt(block_index, variables)
+        if next_interaction_context:
+            user_content = f"{user_content}\n\n{next_interaction_context}"
+
         # Add processed content as user message (as instruction to LLM)
         messages.append({"role": "user", "content": user_content})
 
         return messages
 
+    def _build_next_interaction_context_prompt(
+        self,
+        block_index: int,
+        variables: dict[str, str | list[str]] | None,
+    ) -> str:
+        """Build natural prompt context from the immediately following interaction block."""
+        blocks = self.get_all_blocks()
+        next_index = block_index + 1
+        if next_index >= len(blocks):
+            return ""
+
+        next_block = blocks[next_index]
+        if next_block.block_type != BlockType.INTERACTION:
+            return ""
+
+        interaction_content = replace_variables_in_text(next_block.content, variables or {})
+        parse_result = InteractionParser().parse(interaction_content)
+        if parse_result.get("error"):
+            return ""
+
+        question = parse_result.get("question", "").strip()
+        buttons = parse_result.get("buttons") or []
+        option_displays = [button.get("display", "").strip() for button in buttons if button.get("display", "").strip()]
+
+        detail = self._format_next_interaction_detail(parse_result.get("type"), question, option_displays)
+        if not detail:
+            return ""
+
+        return f"{NEXT_INTERACTION_CONTEXT_INTRO}\n{detail}"
+
+    def _format_next_interaction_detail(
+        self,
+        interaction_type: InteractionType | None,
+        question: str,
+        option_displays: list[str],
+    ) -> str:
+        """Format the type-specific part of the next interaction prompt."""
+        options = json.dumps(option_displays, ensure_ascii=False) if option_displays else ""
+        question_text = json.dumps(question, ensure_ascii=False) if question else ""
+
+        if interaction_type == InteractionType.TEXT_ONLY:
+            if not question:
+                return ""
+            return NEXT_INTERACTION_TEXT_INPUT_TEMPLATE.format(question=question_text)
+
+        if interaction_type in [InteractionType.BUTTONS_ONLY, InteractionType.NON_ASSIGNMENT_BUTTON]:
+            if not options:
+                return ""
+            return NEXT_INTERACTION_SINGLE_CHOICE_TEMPLATE.format(options=options)
+
+        if interaction_type == InteractionType.BUTTONS_MULTI_SELECT:
+            if not options:
+                return ""
+            return NEXT_INTERACTION_MULTIPLE_CHOICE_TEMPLATE.format(options=options)
+
+        if interaction_type == InteractionType.BUTTONS_WITH_TEXT:
+            detail_parts = [NEXT_INTERACTION_SINGLE_CHOICE_WITH_TEXT_INTRO]
+            if options:
+                detail_parts.append(NEXT_INTERACTION_PREDEFINED_OPTIONS_TEMPLATE.format(options=options))
+            if question:
+                detail_parts.append(NEXT_INTERACTION_CUSTOM_TEXT_PROMPT_TEMPLATE.format(question=question_text))
+            return " ".join(detail_parts)
+
+        if interaction_type == InteractionType.BUTTONS_MULTI_WITH_TEXT:
+            detail_parts = [NEXT_INTERACTION_MULTIPLE_CHOICE_WITH_TEXT_INTRO]
+            if options:
+                detail_parts.append(NEXT_INTERACTION_PREDEFINED_OPTIONS_TEMPLATE.format(options=options))
+            if question:
+                detail_parts.append(NEXT_INTERACTION_CUSTOM_TEXT_PROMPT_TEMPLATE.format(question=question_text))
+            return " ".join(detail_parts)
+
+        return ""
+
     def _extract_translatable_content(self, interaction_content: str) -> tuple[str, dict[str, Any] | None]:
         """Extract translatable parts from interaction content as JSON format
 
@@ -1550,12 +1635,12 @@ Original Error: {error_message}
         messages.append({"role": "system", "content": render_prompt})
 
         # Add conversation history context if provided.
-        # Transform interaction syntax in the context the same way the content
-        # path does, so raw ?[...] blocks are expanded to {user}/{assistant}
-        # pairs instead of leaking into this auxiliary LLM call.
-        truncated_context = self._truncate_context(context)
-        if truncated_context:
-            transformed_context = self._transform_context_messages(truncated_context, variables)
+        # Context is already truncated by the caller (_render_error), so reuse it
+        # directly here. Transform interaction syntax in the context the same way
+        # the content path does, so raw ?[...] blocks are expanded to
+        # {user}/{assistant} pairs instead of leaking into this auxiliary LLM call.
+        if context:
+            transformed_context = self._transform_context_messages(context, variables)
             if transformed_context:
                 messages.extend(transformed_context)
 

{markdown_flow-0.2.81 → markdown_flow-0.2.82}/markdown_flow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.2.81
+Version: 0.2.82
 Summary: An agent library designed to parse and process MarkdownFlow documents
 Project-URL: Homepage, https://github.com/ai-shifu/markdown-flow-agent-py
 Project-URL: Bug Tracker, https://github.com/ai-shifu/markdown-flow-agent-py/issues

{markdown_flow-0.2.81 → markdown_flow-0.2.82}/markdown_flow.egg-info/SOURCES.txt

@@ -35,7 +35,6 @@ markdown_flow/providers/__init__.py
 markdown_flow/providers/config.py
 markdown_flow/providers/openai.py
 tests/test_dynamic_interaction.py
-tests/test_error_render_context.py
 tests/test_formatter.py
 tests/test_formatter_stream.py
 tests/test_html_comment_utils.py

markdown_flow-0.2.81/tests/test_error_render_context.py

@@ -1,58 +0,0 @@
-"""
-Unit tests for context transformation in the error-render path.
-
-The error-render path is an auxiliary LLM call triggered when interaction
-input validation fails. It must transform interaction syntax in the provided
-context the same way the content path does, so raw ?[...] blocks are expanded
-into {user}/{assistant} pairs instead of leaking into the prompt.
-"""
-
-from markdown_flow import MarkdownFlow
-
-
-def _build_messages(context, variables):
-    mf = MarkdownFlow("Doc", llm_provider=None)
-    truncated = mf._truncate_context(context)
-    return mf._build_error_render_messages("some error", truncated, variables)
-
-
-def test_error_render_expands_interaction_with_variable():
-    """An interaction with a resolvable variable becomes user(value)+assistant(ok)."""
-    context = [
-        {"role": "user", "content": "What is your name?"},
-        {"role": "assistant", "content": "?[%{{nickname}} ...What is your nickname?]"},
-    ]
-    variables = {"nickname": "Alice"}
-
-    messages = _build_messages(context, variables)
-
-    # Raw interaction syntax must not leak into the prompt.
-    assert all("?[" not in m["content"] for m in messages)
-    # The interaction is expanded to a clean user/assistant pair.
-    assert {"role": "user", "content": "Alice"} in messages
-    expanded = [m for m in messages if m["role"] == "assistant" and m["content"] == "ok"]
-    assert expanded, "expected an assistant 'ok' acknowledgement"
-
-
-def test_error_render_skips_interaction_without_value():
-    """A variable interaction with no resolvable value is dropped, not leaked."""
-    context = [
-        {"role": "assistant", "content": "?[%{{nickname}} ...What is your nickname?]"},
-    ]
-
-    messages = _build_messages(context, variables={})
-
-    assert all("?[" not in m["content"] for m in messages)
-    assert all(m["content"] != "Alice" for m in messages)
-
-
-def test_error_render_no_variable_interaction_becomes_ok():
-    """A button-only interaction (no variable) becomes ok/ok."""
-    context = [
-        {"role": "assistant", "content": "?[Continue|Cancel]"},
-    ]
-
-    messages = _build_messages(context, variables=None)
-
-    assert all("?[" not in m["content"] for m in messages)
-    assert {"role": "user", "content": "ok"} in messages