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

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

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

@@ -88,5 +88,4 @@ __all__ = [
     "replace_variables_in_text",
 ]
 
-__version__ = "0.2.79"
-# __version__ = "0.2.45-alpha-1"
+__version__ = "0.2.81"

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

@@ -666,43 +666,45 @@ class MarkdownFlow:
 
         # Extract translatable content (JSON format)
         translatable_json, interaction_info = self._extract_translatable_content(processed_block.content)
-        if not interaction_info:
-            # Parse failed, return original content
-            return LLMResult(
+
+        def _render_as_is(*, translation_skipped: bool = False):
+            """Return the interaction content unchanged, honoring the mode.
+
+            STREAM mode must return a generator yielding LLMResult (callers
+            iterate the result); COMPLETE returns the LLMResult directly.
+            """
+            metadata = {
+                "block_type": "interaction",
+                "block_index": block_index,
+            }
+            if translation_skipped:
+                metadata["translation_skipped"] = True
+            result = LLMResult(
                 content=processed_block.content,
                 type=ElementType.INTERACTION,
                 number=block_index,
-                metadata={
-                    "block_type": "interaction",
-                    "block_index": block_index,
-                },
+                metadata=metadata,
             )
+            if mode == ProcessMode.STREAM:
+
+                def stream_generator():
+                    yield result
+
+                return stream_generator()
+            return result
+
+        if not interaction_info:
+            # Parse failed, return original content
+            return _render_as_is()
 
         # If no translatable content, return directly
         if not translatable_json or translatable_json == "{}":
-            return LLMResult(
-                content=processed_block.content,
-                type=ElementType.INTERACTION,
-                number=block_index,
-                metadata={
-                    "block_type": "interaction",
-                    "block_index": block_index,
-                },
-            )
+            return _render_as_is()
 
         # If no output language is configured, skip translation entirely:
         # return the interaction content as-is without any LLM call.
         if not self._output_language:
-            return LLMResult(
-                content=processed_block.content,
-                type=ElementType.INTERACTION,
-                number=block_index,
-                metadata={
-                    "block_type": "interaction",
-                    "block_index": block_index,
-                    "translation_skipped": True,
-                },
-            )
+            return _render_as_is(translation_skipped=True)
 
         # Build translation messages
         messages = self._build_translation_messages(translatable_json)
@@ -801,7 +803,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, [])
@@ -815,7 +817,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")
 
@@ -940,6 +942,7 @@ class MarkdownFlow:
                 mode,
                 interaction_type,
                 context,
+                variables,
             )
 
         if interaction_type == InteractionType.NON_ASSIGNMENT_BUTTON:
@@ -993,7 +996,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,
@@ -1036,6 +1039,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.
@@ -1080,7 +1084,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 = []
@@ -1105,7 +1109,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(
@@ -1178,13 +1182,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:
@@ -1529,6 +1534,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}
@@ -1543,10 +1549,15 @@ Original Error: {error_message}
 
         messages.append({"role": "system", "content": render_prompt})
 
-        # Add conversation history context if provided
+        # 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:
-            messages.extend(truncated_context)
+            transformed_context = self._transform_context_messages(truncated_context, variables)
+            if transformed_context:
+                messages.extend(transformed_context)
 
         messages.append({"role": "user", "content": error_message})
 

{markdown_flow-0.2.79 → markdown_flow-0.2.81}/markdown_flow/system_prompt.md

@@ -9,7 +9,7 @@
 
 # 二、html展示内容生成规则
 
-仅当用户要求生成视觉内容（PPT/页面/HTML/图表）时启用。如果用户要求只生成内容,则不启用该规则。
+仅当用户要求生成视觉内容（PPT/页面/HTML/图表/图片）时启用。如果用户要求只生成内容,则不启用该规则。
 
 ## 1. 渲染机制
 
@@ -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.79 → markdown_flow-0.2.81}/markdown_flow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.2.79
+Version: 0.2.81
 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.79 → markdown_flow-0.2.81}/markdown_flow.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ 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

@@ -0,0 +1,58 @@
+"""
+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