better codegen_py UX

Author: MS-32154

json_explorer/codegen/interactive.py

@@ -16,10 +16,6 @@
 from rich.table import Table
 from rich import box
 
-from prompt_toolkit import prompt
-from prompt_toolkit.history import FileHistory
-from prompt_toolkit.completion import PathCompleter, WordCompleter, FuzzyCompleter
-
 from . import (
     GeneratorError,
     generate_from_analysis,
@@ -29,6 +25,7 @@
     load_config,
 )
 from json_explorer.analyzer import analyze_json
+from json_explorer.utils import prompt_input, prompt_input_path
 
 logger = logging.getLogger(__name__)
 
@@ -131,87 +128,15 @@ def run_interactive(self) -> bool:
     # ========================================================================
 
     def _input(self, message: str, default: str | None = None, **kwargs) -> str:
-        """
-        User friendly input with optional choices and autocompletion.
-        Falls back to Prompt.ask if prompt_toolkit is unavailable.
-
-        Args:
-            message: Prompt message.
-            default: Default value if user enters nothing.
-            kwargs: May include 'choices' (list of strings) for tab completion.
-
-        Returns:
-            User input as string (or default if empty).
-        """
-        choices = kwargs.get("choices")
-        try:
-
-            history = FileHistory(".json_explorer_input_history")
-
-            if choices:
-                str_choices = [str(c) for c in choices]
-                completer = FuzzyCompleter(WordCompleter(str_choices, ignore_case=True))
-                # Only show options in prompt, not above it
-                display_message = f"{message} ({'/'.join(str_choices)})"
-
-                while True:
-                    text = prompt(
-                        f"{display_message} > ",
-                        default=default or "",
-                        history=history,
-                        completer=completer,
-                        complete_while_typing=True,
-                    ).strip()
-
-                    if not text and default is not None:
-                        return default
-
-                    # Exact or case-insensitive match
-                    if text in str_choices:
-                        return text
-                    lowered = text.lower()
-                    ci_matches = [c for c in str_choices if c.lower() == lowered]
-                    if ci_matches:
-                        return ci_matches[0]
-
-                    # Prefix match
-                    prefix_matches = [
-                        c for c in str_choices if c.lower().startswith(lowered)
-                    ]
-                    if len(prefix_matches) == 1:
-                        return prefix_matches[0]
-
-                    self.console.print(f"[red]Invalid choice: {text}[/red]")
-
-            # Free text input
-            return prompt(
-                f"{message} > ", default=default or "", history=history
-            ).strip() or (default or "")
-
-        except Exception:
-            return self._input(message, default=default, **kwargs)
-
-    def _input_path(self, message: str, **kwargs) -> str:
-        """
-        Input for file paths with autocompletion.
-        Falls back to Prompt.ask if prompt_toolkit is unavailable.
-        """
-        default = kwargs.get("default")
-        try:
-
-            history = FileHistory(".json_explorer_path_history")
-            completer = PathCompleter(expanduser=True)
-
-            return prompt(
-                f"{message} > ",
-                default=default,
-                history=history,
-                completer=completer,
-                complete_while_typing=True,
-            ).strip()
+        return prompt_input(
+            message,
+            default=default,
+            choices=kwargs.get("choices"),
+            console=self.console,
+        )
 
-        except Exception:
-            return self._input(message)
+    def _input_path(self, message: str, default: str = "") -> str:
+        return prompt_input_path(message, default=default)
 
     # ========================================================================
     # Main Menu

json_explorer/codegen/languages/go/interactive.py

@@ -10,12 +10,9 @@
 
 from rich.console import Console
 from rich.panel import Panel
-from rich.prompt import Prompt, Confirm
-
-from prompt_toolkit import prompt
-from prompt_toolkit.history import FileHistory
-from prompt_toolkit.completion import WordCompleter, FuzzyCompleter
+from rich.prompt import Confirm
 
+from json_explorer.utils import prompt_input
 from ...core.config import GeneratorConfig
 from .config import get_web_api_config, get_strict_config, get_modern_config
 
@@ -144,6 +141,7 @@ def configure_language_specific(
                 "JSON tag case style",
                 choices=["original", "snake", "camel"],
                 default="original",
+                console=console,
             )
 
         # Optional fields
@@ -158,16 +156,19 @@ def configure_language_specific(
                 "Integer type",
                 choices=["int", "int32", "int64"],
                 default="int64",
+                console=console,
             )
             go_config["float_type"] = self._input(
                 "Float type",
                 choices=["float32", "float64"],
                 default="float64",
+                console=console,
             )
             go_config["unknown_type"] = self._input(
                 "Unknown type representation",
                 choices=["interface{}", "any"],
                 default="interface{}",
+                console=console,
             )
 
         # Advanced options
@@ -176,6 +177,7 @@ def configure_language_specific(
                 "Time type for timestamps",
                 choices=["time.Time", "string", "int64"],
                 default="time.Time",
+                console=console,
             )
 
         logger.info(f"Go-specific config collected: {len(go_config)} options")
@@ -284,62 +286,7 @@ def validate_config(self, config: dict[str, Any]) -> list[str]:
     # ========================================================================
 
     def _input(self, message: str, default: str | None = None, **kwargs) -> str:
-        """
-        User friendly input with optional choices and autocompletion.
-        Falls back to Prompt.ask if prompt_toolkit is unavailable.
-
-        Args:
-            message: Prompt message.
-            default: Default value if user enters nothing.
-            kwargs: May include 'choices' (list of strings) for tab completion.
-
-        Returns:
-            User input as string (or default if empty).
-        """
-        choices = kwargs.get("choices")
-        try:
-
-            history = FileHistory(".json_explorer_input_history")
-
-            if choices:
-                str_choices = [str(c) for c in choices]
-                completer = FuzzyCompleter(WordCompleter(str_choices, ignore_case=True))
-                # Only show options in prompt, not above it
-                display_message = f"{message} ({'/'.join(str_choices)})"
-
-                while True:
-                    text = prompt(
-                        f"{display_message} > ",
-                        default=default or "",
-                        history=history,
-                        completer=completer,
-                        complete_while_typing=True,
-                    ).strip()
-
-                    if not text and default is not None:
-                        return default
-
-                    # Exact or case-insensitive match
-                    if text in str_choices:
-                        return text
-                    lowered = text.lower()
-                    ci_matches = [c for c in str_choices if c.lower() == lowered]
-                    if ci_matches:
-                        return ci_matches[0]
-
-                    # Prefix match
-                    prefix_matches = [
-                        c for c in str_choices if c.lower().startswith(lowered)
-                    ]
-                    if len(prefix_matches) == 1:
-                        return prefix_matches[0]
-
-                    self.console.print(f"[red]Invalid choice: {text}[/red]")
-
-            # Free text input
-            return prompt(
-                f"{message} > ", default=default or "", history=history
-            ).strip() or (default or "")
-
-        except Exception:
-            return self._input(message, default=default, **kwargs)
+        console = kwargs.get("console") or None
+        return prompt_input(
+            message, default=default, choices=kwargs.get("choices"), console=console
+        )

json_explorer/codegen/languages/python/interactive.py

@@ -10,8 +10,9 @@
 
 from rich.console import Console
 from rich.panel import Panel
-from rich.prompt import Prompt, Confirm
+from rich.prompt import Confirm
 
+from json_explorer.utils import prompt_input
 from ...core.config import GeneratorConfig
 from .config import (
     get_dataclass_config,
@@ -136,7 +137,7 @@ def configure_language_specific(
         console.print("\n[bold]Python-Specific Options:[/bold]")
 
         # Style selection
-        style = Prompt.ask(
+        style = self._input(
             "Select Python style",
             choices=["dataclass", "pydantic", "typeddict"],
             default="dataclass",
@@ -338,3 +339,13 @@ def validate_config(self, config: dict[str, Any]) -> list[str]:
             logger.info(f"Config validation: {len(warnings)} warnings")
 
         return warnings
+
+    # ========================================================================
+    # prompt_toolkit integration
+    # ========================================================================
+
+    def _input(self, message: str, default: str | None = None, **kwargs) -> str:
+        console = kwargs.get("console") or None
+        return prompt_input(
+            message, default=default, choices=kwargs.get("choices"), console=console
+        )

json_explorer/interactive.py

@@ -9,15 +9,11 @@
 from rich.panel import Panel
 from rich.table import Table
 
-from prompt_toolkit import prompt
-from prompt_toolkit.history import FileHistory
-from prompt_toolkit.completion import PathCompleter, WordCompleter, FuzzyCompleter
-
 from .tree_view import print_json_analysis, print_compact_tree
 from .search import JsonSearcher
 from .stats import DataStatsAnalyzer
 from .visualizer import JSONVisualizer
-from .utils import load_json
+from .utils import load_json, prompt_input, prompt_input_path
 from .codegen.interactive import CodegenInteractiveHandler
 from .logging_config import get_logger
 
@@ -94,87 +90,15 @@ def run(self) -> int:
         return 0
 
     def _input(self, message: str, default: str | None = None, **kwargs) -> str:
-        """
-        User friendly input with optional choices and autocompletion.
-        Falls back to Prompt.ask if prompt_toolkit is unavailable.
-
-        Args:
-            message: Prompt message.
-            default: Default value if user enters nothing.
-            kwargs: May include 'choices' (list of strings) for tab completion.
-
-        Returns:
-            User input as string (or default if empty).
-        """
-        choices = kwargs.get("choices")
-        try:
-
-            history = FileHistory(".json_explorer_input_history")
-
-            if choices:
-                str_choices = [str(c) for c in choices]
-                completer = FuzzyCompleter(WordCompleter(str_choices, ignore_case=True))
-                # Only show options in prompt, not above it
-                display_message = f"{message} ({'/'.join(str_choices)})"
-
-                while True:
-                    text = prompt(
-                        f"{display_message} > ",
-                        default=default or "",
-                        history=history,
-                        completer=completer,
-                        complete_while_typing=True,
-                    ).strip()
-
-                    if not text and default is not None:
-                        return default
-
-                    # Exact or case-insensitive match
-                    if text in str_choices:
-                        return text
-                    lowered = text.lower()
-                    ci_matches = [c for c in str_choices if c.lower() == lowered]
-                    if ci_matches:
-                        return ci_matches[0]
-
-                    # Prefix match
-                    prefix_matches = [
-                        c for c in str_choices if c.lower().startswith(lowered)
-                    ]
-                    if len(prefix_matches) == 1:
-                        return prefix_matches[0]
-
-                    self.console.print(f"[red]Invalid choice: {text}[/red]")
-
-            # Free text input
-            return prompt(
-                f"{message} > ", default=default or "", history=history
-            ).strip() or (default or "")
-
-        except Exception:
-            return Prompt.ask(message, default=default, **kwargs)
-
-    def _input_path(self, message: str, **kwargs) -> str:
-        """
-        Input for file paths with autocompletion.
-        Falls back to Prompt.ask if prompt_toolkit is unavailable.
-        """
-        default = kwargs.get("default")
-        try:
-
-            history = FileHistory(".json_explorer_path_history")
-            completer = PathCompleter(expanduser=True)
-
-            return prompt(
-                f"{message} > ",
-                default=default,
-                history=history,
-                completer=completer,
-                complete_while_typing=True,
-            ).strip()
+        return prompt_input(
+            message,
+            default=default,
+            choices=kwargs.get("choices"),
+            console=self.console,
+        )
 
-        except Exception:
-            return self._input(message)
+    def _input_path(self, message: str, default: str = "") -> str:
+        return prompt_input_path(message, default=default)
 
     def _show_main_menu(self) -> None:
         """Display the main menu."""