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

markdown_flow/__init__.py

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

markdown_flow/core.py

@@ -492,7 +492,7 @@ class MarkdownFlow:
 
             if not matched:
                 if allow_text_input:
-                    # Allow custom text in buttons+text mode
+                    # Allow custom text in buttons+text mode - same as normal interactions
                     valid_values.append(value)
                 else:
                     invalid_values.append(value)
@@ -1066,47 +1066,102 @@ Analyze the content and provide the structured interaction data.""")
         context: list[dict[str, str]] | None,
         variables: dict[str, str | list[str]] | None,
     ) -> LLMResult:
-        """Validate user input for dynamically generated interaction blocks."""
+        """Validate user input for dynamically generated interaction blocks using same logic as normal interactions."""
         _ = block_index  # Mark as intentionally unused
-        _ = mode  # Mark as intentionally unused
         _ = context  # Mark as intentionally unused
 
         from .utils import InteractionParser
 
-        # Parse the interaction format
+        # Parse the interaction format using the same parser as normal interactions
         parser = InteractionParser()
-        interaction = parser.parse(interaction_format)
+        parse_result = parser.parse(interaction_format)
 
-        if interaction is None:
-            raise ValueError(f"Invalid interaction format: {interaction_format}")
+        if "error" in parse_result:
+            error_msg = f"Invalid interaction format: {parse_result['error']}"
+            return self._render_error(error_msg, mode)
 
-        # Extract variable name from the interaction format
-        # This is a simplified extraction - in real implementation you'd use the parser result
-        import re
+        # Extract variable name and interaction type
+        variable_name = parse_result.get("variable")
+        interaction_type = parse_result.get("type")
 
-        var_match = re.search(r"%\{\{([^}]+)\}\}", interaction_format)
-        if not var_match:
-            raise ValueError(f"No variable found in interaction format: {interaction_format}")
+        if not variable_name:
+            error_msg = f"No variable found in interaction format: {interaction_format}"
+            return self._render_error(error_msg, mode)
 
-        variable_name = var_match.group(1)
+        # Get user input for the target variable
+        target_values = user_input.get(variable_name, [])
 
-        # Validate the user input
-        user_values = user_input.get(variable_name, [])
-        if not user_values:
-            raise ValueError(f"No input provided for variable: {variable_name}")
+        # Basic validation - check if input is provided when required
+        if not target_values:
+            # Check if this is a text input or allows empty input
+            allow_text_input = interaction_type in [
+                InteractionType.BUTTONS_WITH_TEXT,
+                InteractionType.BUTTONS_MULTI_WITH_TEXT,
+            ]
 
-        # Process the validation result
-        updated_variables = dict(variables or {})
+            if allow_text_input:
+                # Allow empty input for buttons+text mode - merge with existing variables
+                merged_variables = dict(variables or {})
+                merged_variables[variable_name] = []
+                return LLMResult(
+                    content="",
+                    variables=merged_variables,
+                    metadata={
+                        "interaction_type": "dynamic_interaction",
+                        "empty_input": True,
+                    },
+                )
+            else:
+                error_msg = f"No input provided for variable '{variable_name}'"
+                return self._render_error(error_msg, mode)
 
-        # Handle single vs multiple values
-        if len(user_values) == 1:
-            updated_variables[variable_name] = user_values[0]
-        else:
-            updated_variables[variable_name] = user_values
+        # Use the same validation logic as normal interactions
+        if interaction_type in [
+            InteractionType.BUTTONS_ONLY,
+            InteractionType.BUTTONS_WITH_TEXT,
+            InteractionType.BUTTONS_MULTI_SELECT,
+            InteractionType.BUTTONS_MULTI_WITH_TEXT,
+        ]:
+            # Button validation - reuse the existing button validation logic
+            button_result = self._process_button_validation(
+                parse_result,
+                target_values,
+                variable_name,
+                mode,
+                interaction_type,
+            )
 
-        # Return successful validation result
-        return LLMResult(
-            content=f"Successfully collected {variable_name}: {user_values}",
-            variables=updated_variables,
-            metadata={"validation_success": True, "variable_collected": variable_name, "values_collected": user_values},
-        )
+            # Merge with existing variables for dynamic interactions
+            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(
+                    content=button_result.content,
+                    variables=merged_variables,
+                    metadata=button_result.metadata,
+                )
+            return button_result
+
+        elif interaction_type == InteractionType.NON_ASSIGNMENT_BUTTON:
+            # Non-assignment buttons: don't set variables, keep existing ones
+            return LLMResult(
+                content="",
+                variables=dict(variables or {}),
+                metadata={
+                    "interaction_type": "non_assignment_button",
+                    "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,
+                },
+            )

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

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

@@ -1,13 +1,13 @@
-markdown_flow/__init__.py,sha256=Hjw_rL6xGuaa7GOGHssudao_hjFxcmUim-wCjP5Wvvk,2874
+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=d_TB8zr3BMa2MZLRmssAfTmPTVeih6EVeGtF482QLfM,46194
+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.7.dist-info/licenses/LICENSE,sha256=qz3BziejhHPd1xa5eVtYEU5Qp6L2pn4otuj194uGxmc,1069
-markdown_flow-0.2.7.dist-info/METADATA,sha256=KAw54NcboJAAqdeK3WIqebcdIkDwo2y4dgya4CHXMQI,24286
-markdown_flow-0.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-markdown_flow-0.2.7.dist-info/top_level.txt,sha256=DpigGvQuIt2L0TTLnDU5sylhiTGiZS7MmAMa2hi-AJs,14
-markdown_flow-0.2.7.dist-info/RECORD,,
+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,,