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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.2.80
+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.80 → markdown_flow-0.2.82}/markdown_flow/__init__.py

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

{markdown_flow-0.2.80 → 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.80 → 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,
@@ -803,7 +811,7 @@ class MarkdownFlow:
         # Basic validation
         if not user_input or not any(values for values in user_input.values()):
             error_msg = INPUT_EMPTY_ERROR
-            return self._render_error(error_msg, mode, context)
+            return self._render_error(error_msg, mode, context, variables)
 
         # Get the target variable value from user_input
         target_values = user_input.get(target_variable, [])
@@ -817,7 +825,7 @@ class MarkdownFlow:
 
         if "error" in parse_result:
             error_msg = INTERACTION_PARSE_ERROR.format(error=parse_result["error"])
-            return self._render_error(error_msg, mode, context)
+            return self._render_error(error_msg, mode, context, variables)
 
         interaction_type = parse_result.get("type")
 
@@ -942,6 +950,7 @@ class MarkdownFlow:
                 mode,
                 interaction_type,
                 context,
+                variables,
             )
 
         if interaction_type == InteractionType.NON_ASSIGNMENT_BUTTON:
@@ -995,7 +1004,7 @@ class MarkdownFlow:
                 context=context,
             )
         error_msg = f"No input provided for variable '{target_variable}'"
-        return self._render_error(error_msg, mode, context)
+        return self._render_error(error_msg, mode, context, variables)
 
     def _match_button_values(
         self,
@@ -1038,6 +1047,7 @@ class MarkdownFlow:
         mode: ProcessMode,
         interaction_type: InteractionType,
         context: list[dict[str, str]] | None = None,
+        variables: dict[str, str | list[str]] | None = None,
     ) -> LLMResult | Generator[LLMResult, None, None]:
         """
         Simplified button validation with new input format.
@@ -1082,7 +1092,7 @@ class MarkdownFlow:
             # Pure button mode requires input
             button_displays = [btn["display"] for btn in buttons]
             error_msg = f"Please select from: {', '.join(button_displays)}"
-            return self._render_error(error_msg, mode, context)
+            return self._render_error(error_msg, mode, context, variables)
 
         # Validate input values against available buttons
         valid_values = []
@@ -1107,7 +1117,7 @@ class MarkdownFlow:
         if invalid_values and not allow_text_input:
             button_displays = [btn["display"] for btn in buttons]
             error_msg = f"Invalid options: {', '.join(invalid_values)}. Please select from: {', '.join(button_displays)}"
-            return self._render_error(error_msg, mode, context)
+            return self._render_error(error_msg, mode, context, variables)
 
         # Success: return validated values
         result = LLMResult(
@@ -1180,13 +1190,14 @@ class MarkdownFlow:
         error_message: str,
         mode: ProcessMode,
         context: list[dict[str, str]] | None = None,
+        variables: dict[str, str | list[str]] | None = None,
     ) -> LLMResult | Generator[LLMResult, None, None]:
         """Render user-friendly error message."""
         # Truncate context to configured maximum length
         truncated_context = self._truncate_context(context)
 
         # Build error messages with context
-        messages = self._build_error_render_messages(error_message, truncated_context)
+        messages = self._build_error_render_messages(error_message, truncated_context, variables)
 
         if mode == ProcessMode.COMPLETE:
             if not self._llm_provider:
@@ -1283,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
 
@@ -1531,6 +1619,7 @@ class MarkdownFlow:
         self,
         error_message: str,
         context: list[dict[str, str]] | None = None,
+        variables: dict[str, str | list[str]] | None = None,
     ) -> list[dict[str, str]]:
         """Build error rendering messages."""
         render_prompt = f"""{self._interaction_error_prompt}
@@ -1545,10 +1634,15 @@ Original Error: {error_message}
 
         messages.append({"role": "system", "content": render_prompt})
 
-        # Add conversation history context if provided
-        truncated_context = self._truncate_context(context)
-        if truncated_context:
-            messages.extend(truncated_context)
+        # Add conversation history context if provided.
+        # 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)
 
         messages.append({"role": "user", "content": error_message})
 

{markdown_flow-0.2.80 → markdown_flow-0.2.82}/markdown_flow/system_prompt.md

@@ -26,7 +26,7 @@
 
 每屏 = 一个铺满视口的固定容器，不可滚动。外层容器写法：
 
-```
+```text
 <div style="width:100%; min-height:100vh; overflow-x:hidden; overflow-y:auto; display:flex; flex-direction:column; align-items:center; padding:1em; font-size:clamp(12px,calc(100vw/48),3vh)">
   <!-- 内容 -->
 </div>
@@ -34,7 +34,7 @@
 
 每屏 HTML 后必须紧跟：
 
-```
+```text
 <style>
 *,*::before,*::after{box-sizing:border-box;overflow-wrap:break-word;word-wrap:break-word}
 </style>

{markdown_flow-0.2.80 → 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.80
+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