markdown-flow 0.2.9__py3-none-any.whl → 0.2.11__py3-none-any.whl

markdown_flow/__init__.py

@@ -83,4 +83,4 @@ __all__ = [
     "replace_variables_in_text",
 ]
 
-__version__ = "0.2.9"
+__version__ = "0.2.11"

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 - same as normal interactions
-                    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,
             },
         )
 
@@ -815,7 +827,14 @@ Original Error: {error_message}
         if match:
             prefix = match.group(1)
             suffix = match.group(2)
-            return f"{prefix}{cleaned_question}{suffix}"
+            # Extract only the closing bracket from suffix, remove original question
+            # suffix format is "original_question]", we only want "]"
+            if suffix.endswith("]"):
+                clean_suffix = "]"
+            else:
+                clean_suffix = suffix
+
+            return f"{prefix}{cleaned_question}{clean_suffix}"
         return original_content  # type: ignore[unreachable]
 
     # Dynamic Interaction Methods
@@ -1111,9 +1130,8 @@ Analyze the content and provide the structured interaction data.""")
                         "empty_input": True,
                     },
                 )
-            else:
-                error_msg = f"No input provided for variable '{variable_name}'"
-                return self._render_error(error_msg, mode)
+            error_msg = f"No input provided for variable '{variable_name}'"
+            return self._render_error(error_msg, mode)
 
         # Use the same validation logic as normal interactions
         if interaction_type in [
@@ -1132,7 +1150,7 @@ Analyze the content and provide the structured interaction data.""")
             )
 
             # Merge with existing variables for dynamic interactions
-            if hasattr(button_result, 'variables') and button_result.variables is not None 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(
@@ -1142,7 +1160,7 @@ Analyze the content and provide the structured interaction data.""")
                 )
             return button_result
 
-        elif interaction_type == InteractionType.NON_ASSIGNMENT_BUTTON:
+        if interaction_type == InteractionType.NON_ASSIGNMENT_BUTTON:
             # Non-assignment buttons: don't set variables, keep existing ones
             return LLMResult(
                 content="",
@@ -1152,16 +1170,15 @@ Analyze the content and provide the structured interaction data.""")
                     "user_input": user_input,
                 },
             )
-        else:
-            # Text-only input type - merge with existing variables
-            merged_variables = dict(variables or {})
-            merged_variables[variable_name] = target_values
-            return LLMResult(
-                content="",
-                variables=merged_variables,
-                metadata={
-                    "interaction_type": "text_only",
-                    "target_variable": variable_name,
-                    "values": target_values,
-                },
-            )
+        # Text-only input type - merge with existing variables
+        merged_variables = dict(variables or {})
+        merged_variables[variable_name] = target_values
+        return LLMResult(
+            content="",
+            variables=merged_variables,
+            metadata={
+                "interaction_type": "text_only",
+                "target_variable": variable_name,
+                "values": target_values,
+            },
+        )

markdown_flow/llm.py

@@ -5,7 +5,7 @@ Provides LLM provider interfaces and related data models, supporting multiple pr
 """
 
 from abc import ABC, abstractmethod
-from collections.abc import AsyncGenerator, Generator
+from collections.abc import Generator
 from dataclasses import dataclass
 from enum import Enum
 from typing import Any

{markdown_flow-0.2.9.dist-info → markdown_flow-0.2.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.2.9
+Version: 0.2.11
 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.11.dist-info/RECORD

@@ -0,0 +1,13 @@
+markdown_flow/__init__.py,sha256=xKyJPYz2k6AvfCx8QuffJe8WIS9PPMgXkpR7n-1s0Cc,2875
+markdown_flow/constants.py,sha256=pd_KCpTEVlz_IXYekrByqb9VWCQR_XHXoGsFYdLW1Eg,8006
+markdown_flow/core.py,sha256=xeE35QzNRURw6nIongn5tW5Z7u4xP_CkNFrBiLrfpmY,49371
+markdown_flow/enums.py,sha256=Wr41zt0Ce5b3fyLtOTE2erEVp1n92g9OVaBF_BZg_l8,820
+markdown_flow/exceptions.py,sha256=9sUZ-Jd3CPLdSRqG8Pw7eMm7cv_S3VZM6jmjUU8OhIc,976
+markdown_flow/llm.py,sha256=MhllCwqzrN_RtIG-whfdkNk6e0WQ2H6RJVCRv3lNM_0,2531
+markdown_flow/models.py,sha256=ENcvXMVXwpFN-RzbeVHhXTjBN0bbmRpJ96K-XS2rizI,2893
+markdown_flow/utils.py,sha256=cVi0zDRK_rCMAr3EDhgITmx6Po5fSvYjqrprYaitYE0,28450
+markdown_flow-0.2.11.dist-info/licenses/LICENSE,sha256=qz3BziejhHPd1xa5eVtYEU5Qp6L2pn4otuj194uGxmc,1069
+markdown_flow-0.2.11.dist-info/METADATA,sha256=DMbPePTA9ZK5wOgrm7X9tjyGAiXbVB2v3rqGM9EzbHg,24287
+markdown_flow-0.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+markdown_flow-0.2.11.dist-info/top_level.txt,sha256=DpigGvQuIt2L0TTLnDU5sylhiTGiZS7MmAMa2hi-AJs,14
+markdown_flow-0.2.11.dist-info/RECORD,,

markdown_flow-0.2.9.dist-info/RECORD

@@ -1,13 +0,0 @@
-markdown_flow/__init__.py,sha256=zeJ4ycW4uPIIRp3sFbh_FPn-jUXSuZk6wUqnrls_6r0,2874
-markdown_flow/constants.py,sha256=pd_KCpTEVlz_IXYekrByqb9VWCQR_XHXoGsFYdLW1Eg,8006
-markdown_flow/core.py,sha256=-cJBzyeL5dWs-iI_-7vnBstIt0GEhkmiyve0wXunedg,48618
-markdown_flow/enums.py,sha256=Wr41zt0Ce5b3fyLtOTE2erEVp1n92g9OVaBF_BZg_l8,820
-markdown_flow/exceptions.py,sha256=9sUZ-Jd3CPLdSRqG8Pw7eMm7cv_S3VZM6jmjUU8OhIc,976
-markdown_flow/llm.py,sha256=7DjOL2h2N1g0L4NF9kn0M5mR45ZL0vPsW3TzuOGy1bw,2547
-markdown_flow/models.py,sha256=ENcvXMVXwpFN-RzbeVHhXTjBN0bbmRpJ96K-XS2rizI,2893
-markdown_flow/utils.py,sha256=cVi0zDRK_rCMAr3EDhgITmx6Po5fSvYjqrprYaitYE0,28450
-markdown_flow-0.2.9.dist-info/licenses/LICENSE,sha256=qz3BziejhHPd1xa5eVtYEU5Qp6L2pn4otuj194uGxmc,1069
-markdown_flow-0.2.9.dist-info/METADATA,sha256=T4V_MG3pWdsXOcHkk5jDPcPQCwMSRn_GKkkfso4wh-U,24286
-markdown_flow-0.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-markdown_flow-0.2.9.dist-info/top_level.txt,sha256=DpigGvQuIt2L0TTLnDU5sylhiTGiZS7MmAMa2hi-AJs,14
-markdown_flow-0.2.9.dist-info/RECORD,,