markdown-flow 0.2.8__tar.gz → 0.2.10__tar.gz

{markdown_flow-0.2.8 → markdown_flow-0.2.10}/PKG-INFO

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

@@ -83,4 +83,4 @@ __all__ = [
     "replace_variables_in_text",
 ]
 
-__version__ = "0.2.8"
+__version__ = "0.2.10"

{markdown_flow-0.2.8 → markdown_flow-0.2.10}/markdown_flow/core.py

@@ -478,7 +478,7 @@ class MarkdownFlow:
             error_msg = f"Please select from: {', '.join(button_displays)}"
             return self._render_error(error_msg, mode)
 
-        # Validate input values against available buttons
+        # First, check if user input matches available buttons
         valid_values = []
         invalid_values = []
 
@@ -491,19 +491,30 @@ class MarkdownFlow:
                     break
 
             if not matched:
-                if allow_text_input:
-                    # Allow custom text in buttons+text mode
-                    valid_values.append(value)
-                else:
-                    invalid_values.append(value)
-
-        # Check for validation errors
-        if invalid_values and not allow_text_input:
+                invalid_values.append(value)
+
+        # If there are invalid values and this interaction allows text input, use LLM validation
+        if invalid_values and allow_text_input:
+            # Use LLM validation for text input interactions
+            button_displays = [btn["display"] for btn in buttons]
+            question = parse_result.get("question", "")
+
+            return self._process_llm_validation_with_options(
+                block_index=0,  # Not used in the method
+                user_input={target_variable: target_values},
+                target_variable=target_variable,
+                options=button_displays,
+                question=question,
+                mode=mode
+            )
+
+        # Check for validation errors in pure button mode or when text input not allowed
+        if invalid_values:
             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)
 
-        # Success: return validated values
+        # Success: return validated button values
         return LLMResult(
             content="",
             variables={target_variable: valid_values},
@@ -513,6 +524,7 @@ class MarkdownFlow:
                 "valid_values": valid_values,
                 "invalid_values": invalid_values,
                 "total_input_count": len(target_values),
+                "llm_validated": False,
             },
         )
 
@@ -1132,7 +1144,7 @@ Analyze the content and provide the structured interaction data.""")
             )
 
             # Merge with existing variables for dynamic interactions
-            if hasattr(button_result, 'variables') and variables:
+            if hasattr(button_result, 'variables') and button_result.variables is not None and variables:
                 merged_variables = dict(variables)
                 merged_variables.update(button_result.variables)
                 return LLMResult(

{markdown_flow-0.2.8 → markdown_flow-0.2.10}/markdown_flow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.2.8
+Version: 0.2.10
 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.8 → markdown_flow-0.2.10}/tests/test_dynamic_interaction.py

@@ -77,36 +77,30 @@ def test_chinese_restaurant_scenario():
 
             # 第三步：测试无效选择
             print("\n--- 测试无效选择 ---")
-            try:
-                invalid_choices = ["意大利面", "汉堡包"]  # 不在选项中的选择
-                result3 = mf.process(
-                    block_index=0,
-                    mode=ProcessMode.COMPLETE,
-                    user_input={"菜品选择": invalid_choices},
-                    dynamic_interaction_format=result1.content
-                )
-                if hasattr(result3, 'content') and result3.content and "Invalid" in result3.content:
-                    print("✅ 正确处理无效选择")
-                else:
-                    print("⚠️ 可能允许了无效选择")
-            except Exception as e:
-                print(f"✅ 正确拒绝无效选择: {str(e)[:50]}...")
+            invalid_choices = ["意大利面", "汉堡包"]  # 不在选项中的选择
+            result3 = mf.process(
+                block_index=0,
+                mode=ProcessMode.COMPLETE,
+                user_input={"菜品选择": invalid_choices},
+                dynamic_interaction_format=result1.content
+            )
+            print(f"无效选择输入: {invalid_choices}")
+            print(f"LLM完整响应: {result3.content}")
+            print(f"返回变量: {result3.variables}")
+            print(f"元数据: {result3.metadata}")
 
             # 第四步：测试空输入
             print("\n--- 测试空输入 ---")
-            try:
-                result4 = mf.process(
-                    block_index=0,
-                    mode=ProcessMode.COMPLETE,
-                    user_input={"菜品选择": []},
-                    dynamic_interaction_format=result1.content
-                )
-                if hasattr(result4, 'content') and result4.content:
-                    print("⚠️ 空输入可能被接受（取决于交互类型）")
-                else:
-                    print("✅ 正确处理空输入")
-            except Exception as e:
-                print(f"✅ 正确处理空输入错误: {str(e)[:50]}...")
+            result4 = mf.process(
+                block_index=0,
+                mode=ProcessMode.COMPLETE,
+                user_input={"菜品选择": []},
+                dynamic_interaction_format=result1.content
+            )
+            print(f"空输入: []")
+            print(f"LLM完整响应: {result4.content}")
+            print(f"返回变量: {result4.variables}")
+            print(f"元数据: {result4.metadata}")
 
             print("✅ 中文餐厅场景完整验证通过")
 
@@ -176,18 +170,17 @@ Format: Provide specific educational options"""
 
             # 第三步：测试部分匹配选择
             print("\n--- Test Partial Match ---")
-            try:
-                partial_choices = ["Computer"]  # 只选择一个词
-                result3 = mf.process(
-                    block_index=0,
-                    mode=ProcessMode.COMPLETE,
-                    user_input={"learning_choice": partial_choices},
-                    dynamic_interaction_format=result1.content
-                )
-                print(f"Partial selection: {partial_choices}")
-                print(f"Result: {result3.variables}")
-            except Exception as e:
-                print(f"Partial selection handling: {str(e)[:50]}...")
+            partial_choices = ["Computer"]  # 只选择一个词
+            result3 = mf.process(
+                block_index=0,
+                mode=ProcessMode.COMPLETE,
+                user_input={"learning_choice": partial_choices},
+                dynamic_interaction_format=result1.content
+            )
+            print(f"部分匹配输入: {partial_choices}")
+            print(f"LLM完整响应: {result3.content}")
+            print(f"返回变量: {result3.variables}")
+            print(f"元数据: {result3.metadata}")
 
             # 第四步：测试单个选择
             print("\n--- Test Single Selection ---")
@@ -414,20 +407,18 @@ def test_complex_job_consultation_scenario():
 
             # 测试无效职位选择
             print("\n--- 测试无效职位选择 ---")
-            try:
-                invalid_job = ["厨师", "司机"]  # 不属于科技行业的职位
-                result_invalid = mf.process(
-                    block_index=1,
-                    mode=ProcessMode.COMPLETE,
-                    variables=result1.variables,
-                    user_input={"职位选择": invalid_job},
-                    dynamic_interaction_format=result2.content
-                )
-                print("⚠️ 无效职位选择可能被接受")
-                # 避免未使用变量警告
-                _ = result_invalid
-            except Exception as e:
-                print(f"✅ 正确拒绝无效职位选择: {str(e)[:50]}...")
+            invalid_job = ["厨师", "司机"]  # 不属于科技行业的职位
+            result_invalid = mf.process(
+                block_index=1,
+                mode=ProcessMode.COMPLETE,
+                variables=result1.variables,
+                user_input={"职位选择": invalid_job},
+                dynamic_interaction_format=result2.content
+            )
+            print(f"无效职位输入: {invalid_job}")
+            print(f"LLM完整响应: {result_invalid.content}")
+            print(f"返回变量: {result_invalid.variables}")
+            print(f"元数据: {result_invalid.metadata}")
 
             # 第四步：生成薪资选项
             print("\n--- 步骤4: 生成薪资选项 ---")
@@ -567,16 +558,16 @@ def test_text_input_scenario():
 
             # 测试空输入（对于支持文本输入的交互，可能允许空输入）
             print("\n--- 测试空输入处理 ---")
-            try:
-                result5 = mf.process(
-                    block_index=0,
-                    mode=ProcessMode.COMPLETE,
-                    user_input={"自定义需求": []},
-                    dynamic_interaction_format=result1.content
-                )
-                print("✅ 空输入被接受（支持文本输入的交互可能允许空输入）")
-            except Exception as e:
-                print(f"空输入被拒绝: {str(e)[:50]}...")
+            result5 = mf.process(
+                block_index=0,
+                mode=ProcessMode.COMPLETE,
+                user_input={"自定义需求": []},
+                dynamic_interaction_format=result1.content
+            )
+            print(f"空输入: []")
+            print(f"LLM完整响应: {result5.content}")
+            print(f"返回变量: {result5.variables}")
+            print(f"元数据: {result5.metadata}")
 
             print("✅ 文本输入场景完整验证通过")
 
@@ -701,20 +692,18 @@ def test_variable_context_cuisine_scenario():
 
             # 测试无效菜品选择
             print("\n--- 测试无效菜品选择 ---")
-            try:
-                invalid_dishes = ["北京烤鸭", "小笼包"]  # 非川菜选项
-                result_invalid = mf.process(
-                    block_index=1,
-                    mode=ProcessMode.COMPLETE,
-                    variables=result1.variables,
-                    user_input={"菜品": invalid_dishes},
-                    dynamic_interaction_format=result2.content
-                )
-                print("⚠️ 无效菜品选择可能被接受")
-                # 避免未使用变量警告
-                _ = result_invalid
-            except Exception as e:
-                print(f"✅ 正确拒绝无效菜品选择: {str(e)[:50]}...")
+            invalid_dishes = ["北京烤鸭", "小笼包"]  # 非川菜选项
+            result_invalid = mf.process(
+                block_index=1,
+                mode=ProcessMode.COMPLETE,
+                variables=result1.variables,
+                user_input={"菜品": invalid_dishes},
+                dynamic_interaction_format=result2.content
+            )
+            print(f"无效菜品输入: {invalid_dishes}")
+            print(f"LLM完整响应: {result_invalid.content}")
+            print(f"返回变量: {result_invalid.variables}")
+            print(f"元数据: {result_invalid.metadata}")
 
             print("✅ 变量上下文场景完整验证通过")
 
@@ -823,6 +812,89 @@ Format: Provide specific project options based on the selected programming langu
         print(f"❌ Test failed: {e}")
 
 
+def test_user_question_text_input():
+    """测试用户疑问式文本输入场景"""
+    print("\n=== 用户疑问文本输入测试 ===")
+
+    document = """询问用户的故事风格偏好，并记录到变量{{风格选择}}"""
+
+    document_prompt = """你是故事创作助手。为用户提供故事风格选项：
+- 常见风格：幽默、搞笑、悬疑、浪漫、文言文
+- 同时允许用户输入其他风格偏好
+
+语言：中文
+格式：提供常见风格选项 + 允许自定义文本输入（使用...前缀）"""
+
+    try:
+        llm_provider = create_llm_provider()
+        mf = MarkdownFlow(
+            document=document,
+            llm_provider=llm_provider,
+            document_prompt=document_prompt
+        )
+
+        # 生成动态交互
+        print("--- 生成故事风格选项 ---")
+        result1 = mf.process(
+            block_index=0,
+            mode=ProcessMode.COMPLETE
+        )
+
+        print(f"转换为交互块: {result1.transformed_to_interaction}")
+        print(f"生成的交互: {result1.content}")
+
+        if result1.transformed_to_interaction:
+            # 验证是否包含文本输入选项
+            has_text_input = "..." in result1.content
+            if has_text_input:
+                print("✅ 包含文本输入选项")
+
+            # 测试用户疑问式输入
+            print("\n--- 测试疑问式文本输入 ---")
+            question_input = ["这里必须要选择么?"]
+
+            result2 = mf.process(
+                block_index=0,
+                mode=ProcessMode.COMPLETE,
+                user_input={"风格选择": question_input},
+                dynamic_interaction_format=result1.content
+            )
+
+            print(f"用户疑问输入: {question_input}")
+            print(f"验证结果: {result2.variables}")
+
+            # 显示疑问输入的完整处理结果
+            print(f"疑问输入: {question_input}")
+            print(f"LLM完整响应: {result2.content}")
+            print(f"返回变量: {result2.variables}")
+            print(f"元数据: {result2.metadata}")
+
+            # 测试其他类型的自定义输入
+            print("\n--- 测试其他自定义输入 ---")
+            custom_inputs = [
+                ["我想要科幻加悬疑的混合风格"],
+                ["可以不选择吗"],
+                ["这些选项都不适合我"]
+            ]
+
+            for custom_input in custom_inputs:
+                result_custom = mf.process(
+                    block_index=0,
+                    mode=ProcessMode.COMPLETE,
+                    user_input={"风格选择": custom_input},
+                    dynamic_interaction_format=result1.content
+                )
+                print(f"\n自定义输入: {custom_input}")
+                print(f"LLM完整响应: {result_custom.content}")
+                print(f"返回变量: {result_custom.variables}")
+                print(f"元数据: {result_custom.metadata}")
+
+            print("✅ 用户疑问文本输入场景测试完成")
+
+    except Exception as e:
+        print(f"❌ 测试失败: {e}")
+
+
 def run_all_tests():
     """运行所有 document_prompt 测试"""
     print("🧪 开始 document_prompt 动态交互测试")
@@ -836,7 +908,8 @@ def run_all_tests():
         test_complex_job_consultation_scenario,
         test_text_input_scenario,
         test_variable_context_cuisine_scenario,
-        test_variable_context_skill_project_scenario
+        test_variable_context_skill_project_scenario,
+        test_user_question_text_input
     ]
 
     for test_func in tests: