rubber-ducky 1.5.2__py3-none-any.whl → 1.6.0__py3-none-any.whl

ducky/ducky.py

@@ -348,9 +348,12 @@ class RubberDuck:
         if host:
             os.environ["OLLAMA_HOST"] = host
             self.client = AsyncClient(host)
+            if "ollama.com" in host:
+                console.print("[dim]Note: Cloud models require authentication[/dim]", style="yellow")
         elif "-cloud" in model_name:
             os.environ["OLLAMA_HOST"] = "https://ollama.com"
             self.client = AsyncClient("https://ollama.com")
+            console.print("[dim]Note: Cloud models require authentication[/dim]", style="yellow")
         else:
             os.environ["OLLAMA_HOST"] = "http://localhost:11434"
             self.client = AsyncClient()
@@ -549,7 +552,10 @@ class InlineInterface:
         # Check if first word is a crumb name
         first_word = stripped.split()[0].lower()
         if self.crumb_manager.has_crumb(first_word):
-            await self._use_crumb(first_word)
+            # Extract additional arguments after the crumb name
+            parts = stripped.split()
+            args = parts[1:] if len(parts) > 1 else None
+            await self._use_crumb(first_word, args)
             return
 
         if stripped.lower() in {":run", "/run"}:
@@ -634,13 +640,16 @@ class InlineInterface:
         console.print()
 
         commands = [
-            ("[bold]/help[/bold]", "Show this help message"),
+            ("[bold]Crumbs:[/bold]", ""),
+            ("[bold]/crumb help[/bold]", "Show detailed crumb commands help"),
             ("[bold]/crumbs[/bold]", "List all saved crumb shortcuts"),
             ("[bold]/crumb <name>[/bold]", "Save last result as a crumb"),
             ("[bold]/crumb add <name> <cmd>[/bold]", "Manually add a crumb"),
             ("[bold]/crumb del <name>[/bold]", "Delete a crumb"),
             ("[bold]<name>[/bold]", "Invoke a saved crumb"),
-            ("[bold]/expand[/bold]", "Show full output of last shell command"),
+            ("", ""),
+            ("[bold]General:[/bold]", ""),
+            ("[bold]/help[/bold]", "Show this help message"),
             ("[bold]/model[/bold]", "Select a model interactively (local or cloud)"),
             (
                 "[bold]/local[/bold]",
@@ -651,10 +660,8 @@ class InlineInterface:
                 "[bold]/clear[/bold] or [bold]/reset[/bold]",
                 "Clear conversation history",
             ),
-            (
-                "[bold]/run[/bold]",
-                "Re-run the last suggested command",
-            ),
+            ("[bold]/expand[/bold]", "Show full output of last shell command"),
+            ("[bold]/run[/bold]", "Re-run the last suggested command"),
             (
                 "[bold]Empty Enter[/bold]",
                 "Re-run suggested command or explain last output",
@@ -666,7 +673,13 @@ class InlineInterface:
         ]
 
         for command, description in commands:
-            console.print(f"{command:<45} {description}")
+            if command:
+                console.print(f"{command:<45} {description}")
+            else:
+                console.print()
+
+        console.print()
+        console.print("[dim]Use /crumb help for detailed crumb command documentation[/dim]")
 
         console.print()
 
@@ -706,9 +719,15 @@ class InlineInterface:
     async def _handle_crumb_command(self, command: str) -> None:
         """Handle /crumb commands."""
         parts = command.split()
+
         if len(parts) == 1:
-            # Just "/crumbs" - show list
-            await self._show_crumbs()
+            # Just "/crumb" - show help
+            await self._show_crumb_help()
+            return
+
+        # Check for help flag or argument
+        if parts[1] in {"help", "--help", "-h"}:
+            await self._show_crumb_help()
             return
 
         if len(parts) == 2:
@@ -721,6 +740,7 @@ class InlineInterface:
             # "/crumb add <name> <...command>"
             if len(parts) < 4:
                 console.print("Usage: /crumb add <name> <command>", style="yellow")
+                console.print("Example: /crumb add deploy docker build -t app:latest", style="dim")
                 return
             name = parts[2]
             cmd = " ".join(parts[3:])
@@ -734,10 +754,50 @@ class InlineInterface:
             return
 
         console.print(
-            "Usage: /crumb <name> | /crumb add <name> <cmd> | /crumb del <name>",
+            "Unknown crumb command. Use /crumb help for usage information.",
             style="yellow",
         )
 
+    async def _show_crumb_help(self) -> None:
+        """Display detailed help for crumb commands."""
+        console.print("\n[bold blue]Crumbs Help[/bold blue]")
+        console.print("=" * 40)
+        console.print()
+
+        console.print("[bold cyan]Commands:[/bold cyan]")
+        console.print()
+
+        commands = [
+            ("[bold]/crumbs[/bold]", "List all saved crumb shortcuts"),
+            ("[bold]/crumb help[/bold]", "Show this help message"),
+            ("[bold]/crumb <name>[/bold]", "Save the last AI-suggested command as a crumb"),
+            ("[bold]/crumb add <name> <cmd>[/bold]", "Manually add a crumb with a specific command"),
+            ("[bold]/crumb del <name>[/bold]", "Delete a saved crumb"),
+            ("[bold]<name>[/bold]", "Invoke a saved crumb by name"),
+        ]
+
+        for command, description in commands:
+            console.print(f"{command:<45} {description}")
+
+        console.print()
+        console.print("[bold cyan]Examples:[/bold cyan]")
+        console.print()
+        console.print("  [dim]# List all crumbs[/dim]")
+        console.print("  >> /crumbs")
+        console.print()
+        console.print("  [dim]# Save last command as 'deploy'[/dim]")
+        console.print("  >> /crumb deploy")
+        console.print()
+        console.print("  [dim]# Manually add a crumb[/dim]")
+        console.print("  >> /crumb add test-run pytest tests/ -v")
+        console.print()
+        console.print("  [dim]# Delete a crumb[/dim]")
+        console.print("  >> /crumb del deploy")
+        console.print()
+        console.print("  [dim]# Run a saved crumb[/dim]")
+        console.print("  >> test-run")
+        console.print()
+
     async def _save_crumb(self, name: str) -> None:
         """Save the last result as a crumb."""
         if not self.assistant.last_result:
@@ -819,8 +879,13 @@ class InlineInterface:
         else:
             console.print(f"Crumb '{name}' not found.", style="yellow")
 
-    async def _use_crumb(self, name: str) -> None:
-        """Recall and execute a saved crumb."""
+    async def _use_crumb(self, name: str, args: list[str] | None = None) -> None:
+        """Recall and execute a saved crumb.
+
+        Args:
+            name: Name of the crumb to execute
+            args: Optional list of arguments to replace ${VAR} placeholders in the command
+        """
         crumb = self.crumb_manager.get_crumb(name)
         if not crumb:
             console.print(f"Crumb '{name}' not found.", style="yellow")
@@ -829,9 +894,13 @@ class InlineInterface:
         explanation = crumb.get("explanation", "") or "No explanation"
         command = crumb.get("command", "") or "No command"
 
+        # Substitute placeholders with provided arguments
+        if args and command != "No command":
+            command = substitute_placeholders(command, args)
+
         console.print(f"\n[bold cyan]Crumb: {name}[/bold cyan]")
         console.print(f"Explanation: {explanation}", style="green")
-        console.print(f"Command: ", style="cyan", end="")
+        console.print("Command: ", style="cyan", end="")
         console.print(command, highlight=False)
 
         if command and command != "No command":
@@ -975,7 +1044,33 @@ async def run_single_prompt(
 ) -> AssistantResult:
     if logger:
         logger.log_user(prompt)
-    result = await rubber_ducky.send_prompt(prompt=prompt, code=code)
+    try:
+        result = await rubber_ducky.send_prompt(prompt=prompt, code=code)
+    except Exception as e:
+        error_msg = str(e)
+        if "unauthorized" in error_msg.lower() or "401" in error_msg:
+            console.print("\n[red]Authentication Error (401)[/red]")
+            console.print("You're trying to use a cloud model but don't have valid credentials.", style="yellow")
+
+            # Check if API key is set
+            api_key = os.environ.get("OLLAMA_API_KEY")
+            if api_key:
+                console.print("\nAn OLLAMA_API_KEY is set, but it appears invalid.", style="yellow")
+            else:
+                console.print("\n[bold]OLLAMA_API_KEY environment variable is not set.[/bold]", style="yellow")
+
+            console.print("\nOptions:", style="bold")
+            console.print("  1. Use --local flag to access local models:", style="dim")
+            console.print("     ducky --local", style="cyan")
+            console.print("  2. Select a local model with /local command", style="dim")
+            console.print("  3. Set up Ollama cloud API credentials:", style="dim")
+            console.print("     export OLLAMA_API_KEY='your-api-key-here'", style="cyan")
+            console.print("\nGet your API key from: https://ollama.com/account/api-keys", style="dim")
+            console.print()
+            raise
+        else:
+            raise
+
     content = result.content or "(No content returned.)"
     console.print(content, style="green", highlight=False)
     if logger:
@@ -1029,9 +1124,15 @@ async def ducky() -> None:
         action="store_true",
         help="Run DuckY offline using a local Ollama instance on localhost:11434",
     )
+    parser.add_argument(
+        "--yolo",
+        "-y",
+        action="store_true",
+        help=" Automatically run the suggested command without confirmation",
+    )
     parser.add_argument(
         "single_prompt",
-        nargs="?",
+        nargs="*",
         help="Run a single prompt and copy the suggested command to clipboard",
         default=None,
     )
@@ -1090,40 +1191,85 @@ async def ducky() -> None:
 
     # Handle crumb invocation mode
     crumb_manager = CrumbManager()
-    if args.single_prompt and crumb_manager.has_crumb(args.single_prompt):
-        crumb = crumb_manager.get_crumb(args.single_prompt)
-        if crumb:
-            explanation = crumb.get("explanation", "") or "No explanation"
-            command = crumb.get("command", "") or "No command"
-
-            console.print(f"\n[bold cyan]Crumb: {args.single_prompt}[/bold cyan]")
-            console.print(f"Explanation: {explanation}", style="green")
-            console.print(f"Command: ", style="cyan", end="")
-            console.print(command, highlight=False)
-
-            if command and command != "No command":
-                # Execute the command
-                await run_shell_and_print(
-                    rubber_ducky,
-                    command,
-                    logger=logger,
-                    history=rubber_ducky.messages,
-                )
-        return
+    if args.single_prompt:
+        first_arg = args.single_prompt[0]
+        if crumb_manager.has_crumb(first_arg):
+            # Extract crumb arguments (everything after the crumb name)
+            crumb_args = args.single_prompt[1:] if len(args.single_prompt) > 1 else None
+
+            crumb = crumb_manager.get_crumb(first_arg)
+            if crumb:
+                explanation = crumb.get("explanation", "") or "No explanation"
+                command = crumb.get("command", "") or "No command"
+
+                # Substitute placeholders with provided arguments
+                if crumb_args and command != "No command":
+                    command = substitute_placeholders(command, crumb_args)
+
+                console.print(f"\n[bold cyan]Crumb: {first_arg}[/bold cyan]")
+                console.print(f"Explanation: {explanation}", style="green")
+                console.print("Command: ", style="cyan", end="")
+                console.print(command, highlight=False)
+
+                if command and command != "No command":
+                    # Execute the command
+                    await run_shell_and_print(
+                        rubber_ducky,
+                        command,
+                        logger=logger,
+                        history=rubber_ducky.messages,
+                    )
+            return
 
     # Handle single prompt mode
     if args.single_prompt:
+        prompt = " ".join(args.single_prompt)
         result = await run_single_prompt(
-            rubber_ducky, args.single_prompt, code=code, logger=logger
+            rubber_ducky, prompt, code=code, logger=logger
         )
         if result.command:
-            if copy_to_clipboard(result.command):
+            if args.yolo:
+                await run_shell_and_print(
+                    rubber_ducky,
+                    result.command,
+                    logger=logger,
+                    history=rubber_ducky.messages,
+                )
+            elif copy_to_clipboard(result.command):
                 console.print("\n[green]✓[/green] Command copied to clipboard")
         return
 
     await interactive_session(rubber_ducky, logger=logger, code=code)
 
 
+def substitute_placeholders(command: str, args: list[str]) -> str:
+    """Replace ${VAR} placeholders in command with provided arguments.
+
+    Args:
+        command: The command string with placeholders
+        args: List of arguments to substitute (first arg replaces first placeholder, etc.)
+
+    Returns:
+        Command with placeholders replaced, falling back to env vars for unreplaced placeholders
+    """
+    result = command
+    arg_index = 0
+    placeholder_pattern = re.compile(r'\$\{([^}]+)\}')
+
+    def replace_placeholder(match: re.Match) -> str:
+        nonlocal arg_index
+        if arg_index < len(args):
+            value = args[arg_index]
+            arg_index += 1
+            return value
+        # Fallback to environment variable
+        var_name = match.group(1)
+        return os.environ.get(var_name, match.group(0))
+
+    result = placeholder_pattern.sub(replace_placeholder, result)
+    return result
+
+
 def main() -> None:
     asyncio.run(ducky())
 

{rubber_ducky-1.5.2.dist-info → rubber_ducky-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rubber-ducky
-Version: 1.5.2
+Version: 1.6.0
 Summary: Quick CLI do-it-all tool. Use natural language to spit out bash commands
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{rubber_ducky-1.5.2.dist-info → rubber_ducky-1.6.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 ducky/__init__.py,sha256=2vLhJxOuJ3lnIeg5rmF6xUvybUT5Qhjej6AS0BeBASY,60
 ducky/config.py,sha256=Lh7xTUYh4i8Gxgrl0oTYadZB_72Wy2BKIqLCcDQduOA,2116
 ducky/crumb.py,sha256=7BlyjD81-cZptYxQM97y6gOGdVDBF2qzxW0xbPqbspE,2693
-ducky/ducky.py,sha256=5B_if1sI06lXvVbDOyPt4nust6DeIOa28v1MC6pjtzg,41167
+ducky/ducky.py,sha256=mPxbfk9LVPpYUz9nh6zsgCH7K2S-HV46FniIVMJbHm8,47342
 examples/POLLING_USER_GUIDE.md,sha256=rMEAczZhpgyJ9BgwHkN-SKwSdyas8nlw_CjpV7SFOLA,10685
 examples/mock-logs/info.txt,sha256=apJqEO__UM1R2_2x9MlQOA7XmxvLvbhRvOy-FAwrINo,258
 examples/mock-logs/mock-logs.sh,sha256=zM2JSaCR1eCQLlMvXDWjFnpxZTqrMpnFRa_SgNLPmBk,1132
-rubber_ducky-1.5.2.dist-info/licenses/LICENSE,sha256=gQ1rCmw18NqTk5GxG96F6vgyN70e1c4kcKUtWDwdNaE,1069
-rubber_ducky-1.5.2.dist-info/METADATA,sha256=AsaHxQ3vt2rl4dxYaZG4kIGsEwv8CB87oFFRit-WlTY,6733
-rubber_ducky-1.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubber_ducky-1.5.2.dist-info/entry_points.txt,sha256=WPnVUUNvWdMDcBlCo8JCzkLghGllMX5QVZyQghyq85Q,75
-rubber_ducky-1.5.2.dist-info/top_level.txt,sha256=hid_mDkugR6XIeravFKuzcRPpuN_ylN3ejC_06Fmnb4,15
-rubber_ducky-1.5.2.dist-info/RECORD,,
+rubber_ducky-1.6.0.dist-info/licenses/LICENSE,sha256=gQ1rCmw18NqTk5GxG96F6vgyN70e1c4kcKUtWDwdNaE,1069
+rubber_ducky-1.6.0.dist-info/METADATA,sha256=_Q7V5YvGVeDVBPPkeeKbw5hiIFM2u1R0TnQm5_9JTtU,6733
+rubber_ducky-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubber_ducky-1.6.0.dist-info/entry_points.txt,sha256=WPnVUUNvWdMDcBlCo8JCzkLghGllMX5QVZyQghyq85Q,75
+rubber_ducky-1.6.0.dist-info/top_level.txt,sha256=hid_mDkugR6XIeravFKuzcRPpuN_ylN3ejC_06Fmnb4,15
+rubber_ducky-1.6.0.dist-info/RECORD,,