rubber-ducky 1.6.4__py3-none-any.whl → 1.6.6__py3-none-any.whl

ducky/ducky.py

@@ -14,7 +14,7 @@ from pathlib import Path
 from textwrap import dedent
 from typing import Any, Dict, List
 
-__version__ = "1.6.4"
+__version__ = "1.6.5"
 
 from .config import ConfigManager
 from .crumb import CrumbManager
@@ -238,8 +238,9 @@ class RubberDuck:
 
         if effective_command_mode:
             instruction = (
-                "Return a single bash command that accomplishes the task. Unless user wants something els"
-                "Do not include explanations or formatting other than the command itself."
+                "Return a single bash command that accomplishes the task wrapped in <command></command> tags. "
+                "You can write explanatory text before or after the command tags for the user, "
+                "but the command itself must be within the <command></command> tags and nothing else."
             )
             user_content = (
                 f"{user_content}\n\n{instruction}" if user_content else instruction
@@ -288,10 +289,20 @@ class RubberDuck:
         )
 
     def _extract_command(self, content: str) -> str | None:
-        lines = content.strip().splitlines()
-        if not lines:
+        content = content.strip()
+        if not content:
             return None
 
+        # First, try to extract command from <command></command> tags
+        command_match = re.search(r"<command>(.*?)</command>", content, re.DOTALL)
+        if command_match:
+            command = command_match.group(1).strip()
+            # Strip backticks if present
+            command = self._strip_backticks(command)
+            return command or None
+
+        # Fallback to code block detection
+        lines = content.splitlines()
         command_lines: List[str] = []
         in_block = False
 
@@ -316,9 +327,20 @@ class RubberDuck:
 
         # Join all command lines with newlines for multi-line commands
         command = "\n".join(command_lines)
+        # Strip backticks if present
+        command = self._strip_backticks(command)
 
         return command or None
 
+    def _strip_backticks(self, command: str) -> str:
+        """Strip surrounding backticks from a command string."""
+        command = command.strip()
+        if command.startswith("`"):
+            command = command[1:]
+        if command.endswith("`"):
+            command = command[:-1]
+        return command.strip()
+
     async def list_models(self, host: str = "") -> list[str]:
         """List available Ollama models."""
         # Set the host temporarily for this operation
@@ -1095,11 +1117,12 @@ async def run_single_prompt(
     code: str | None = None,
     logger: ConversationLogger | None = None,
     suppress_suggestion: bool = False,
+    command_mode: bool | None = None,
 ) -> AssistantResult:
     if logger:
         logger.log_user(prompt)
     try:
-        result = await rubber_ducky.send_prompt(prompt=prompt, code=code)
+        result = await rubber_ducky.send_prompt(prompt=prompt, code=code, command_mode=command_mode)
     except Exception as e:
         error_msg = str(e)
         if "unauthorized" in error_msg.lower() or "401" in error_msg:
@@ -1126,7 +1149,9 @@ async def run_single_prompt(
             raise
 
     content = result.content or "(No content returned.)"
-    console.print(content, style="dim", highlight=False)
+    # Strip <command>...</command> tags from display output
+    display_content = re.sub(r"<command>.*?</command>", "", content, flags=re.DOTALL).strip()
+    console.print(display_content, highlight=False)
     if logger:
         logger.log_assistant(content, result.command)
     if result.command and not suppress_suggestion:
@@ -1145,6 +1170,51 @@ def copy_to_clipboard(text: str) -> bool:
         return False
 
 
+def check_for_updates() -> None:
+    """Check PyPI for updates and notify user if a new version is available.
+    
+    Checks once per day and caches the result to avoid excessive requests.
+    """
+    from datetime import datetime, timedelta
+    import urllib.request
+    import json
+    
+    cache_file = HISTORY_DIR / "version_check_cache"
+    
+    # Check if we've already checked today
+    if cache_file.exists():
+        try:
+            last_check = datetime.fromtimestamp(cache_file.stat().st_mtime)
+            if datetime.now() - last_check < timedelta(days=1):
+                return  # Already checked today
+        except Exception:
+            pass
+    
+    try:
+        # Query PyPI for latest version
+        req = urllib.request.Request(
+            "https://pypi.org/pypi/rubber-ducky/json",
+            headers={"User-Agent": f"rubber-ducky/{__version__}"}
+        )
+        
+        with urllib.request.urlopen(req, timeout=3) as response:
+            data = json.loads(response.read())
+            latest_version = data["info"]["version"]
+            
+            if latest_version != __version__:
+                console.print(
+                    f"\n[dim]A new version is available: {latest_version} "
+                    f"(you have {__version__}). "
+                    f"Run: uv tool upgrade rubber-ducky[/dim]\n"
+                )
+        
+        # Update cache file timestamp
+        cache_file.touch()
+    except Exception:
+        # Silently fail if no internet or PyPI is down
+        pass
+
+
 def confirm(prompt: str, default: bool = False) -> bool:
     suffix = " [Y/n]: " if default else " [y/N]: "
     try:
@@ -1194,6 +1264,12 @@ async def ducky() -> None:
         action="store_true",
         help="Suppress startup messages and help text",
     )
+    parser.add_argument(
+        "--upgrade",
+        "-u",
+        action="store_true",
+        help="Upgrade rubber-ducky to the latest version using uv",
+    )
     parser.add_argument(
         "single_prompt",
         nargs="*",
@@ -1202,9 +1278,35 @@ async def ducky() -> None:
     )
     args = parser.parse_args()
 
+    # Handle upgrade request immediately
+    if args.upgrade:
+        console.print("Upgrading rubber-ducky...", style="yellow")
+        try:
+            result = subprocess.run(
+                ["uv", "tool", "upgrade", "rubber-ducky"],
+                capture_output=True,
+                text=True,
+                check=True
+            )
+            console.print(result.stdout, style="dim")
+            console.print("Upgrade complete!", style="green")
+        except subprocess.CalledProcessError as e:
+            console.print(f"Upgrade failed: {e.stderr}", style="red")
+        except FileNotFoundError:
+            console.print("uv not found. Please install uv to use --upgrade.", style="red")
+        return
+
     ensure_history_dir()
     logger = ConversationLogger(CONVERSATION_LOG_FILE)
 
+    # Check for updates in background (non-blocking, runs once per day)
+    # Skip if quiet mode, piped input, or single prompt (faster paths)
+    check_piped = not sys.stdin.isatty()
+    if not args.quiet and not args.single_prompt and not check_piped:
+        # Run in a thread to not block startup
+        import threading
+        threading.Thread(target=check_for_updates, daemon=True).start()
+
     # Load the last used model from config if no model is specified
     config_manager = ConfigManager()
     last_model, last_host = config_manager.get_last_model()
@@ -1235,20 +1337,35 @@ async def ducky() -> None:
 
     if piped_prompt is not None:
         if piped_prompt:
-            result = await run_single_prompt(
-                rubber_ducky, piped_prompt, code=code, logger=logger
-            )
-            if (
-                result.command
-                and sys.stdout.isatty()
-                and confirm("Run suggested command?")
-            ):
-                await run_shell_and_print(
-                    rubber_ducky,
-                    result.command,
-                    logger=logger,
-                    history=rubber_ducky.messages,
+            # Check if user also provided a command-line prompt
+            if args.single_prompt:
+                # Combine piped content with user prompt
+                # User prompt is the instruction, piped content is context
+                user_prompt = " ".join(args.single_prompt)
+                combined_prompt = (
+                    f"Context from stdin:\n```\n{piped_prompt}\n```\n\n"
+                    f"User request: {user_prompt}"
                 )
+                # Disable command_mode for this scenario - user wants an explanation, not a command
+                result = await run_single_prompt(
+                    rubber_ducky, combined_prompt, code=code, logger=logger, command_mode=False
+                )
+            else:
+                # Only piped input - proceed with command mode (default behavior)
+                result = await run_single_prompt(
+                    rubber_ducky, piped_prompt, code=code, logger=logger
+                )
+                if (
+                    result.command
+                    and sys.stdout.isatty()
+                    and confirm("Run suggested command?")
+                ):
+                    await run_shell_and_print(
+                        rubber_ducky,
+                        result.command,
+                        logger=logger,
+                        history=rubber_ducky.messages,
+                    )
         else:
             console.print("No input received from stdin.", style="yellow")
         return

{rubber_ducky-1.6.4.dist-info → rubber_ducky-1.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rubber-ducky
-Version: 1.6.4
+Version: 1.6.6
 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.6.4.dist-info → rubber_ducky-1.6.6.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=FEf-Xl7xMH-xV1fvYgV-ZgiNRURlS3tHIj7kJKsFurc,51977
+ducky/ducky.py,sha256=pplx1lRnhpNoLn8prrfHL6FTZ0wAy0eRh-mN8lD7jxQ,56844
 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.6.4.dist-info/licenses/LICENSE,sha256=gQ1rCmw18NqTk5GxG96F6vgyN70e1c4kcKUtWDwdNaE,1069
-rubber_ducky-1.6.4.dist-info/METADATA,sha256=wnYys-BUUyJqGnJdSIh1peeCJhMCOcNsBMoEYABlRk8,6638
-rubber_ducky-1.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubber_ducky-1.6.4.dist-info/entry_points.txt,sha256=WPnVUUNvWdMDcBlCo8JCzkLghGllMX5QVZyQghyq85Q,75
-rubber_ducky-1.6.4.dist-info/top_level.txt,sha256=hid_mDkugR6XIeravFKuzcRPpuN_ylN3ejC_06Fmnb4,15
-rubber_ducky-1.6.4.dist-info/RECORD,,
+rubber_ducky-1.6.6.dist-info/licenses/LICENSE,sha256=gQ1rCmw18NqTk5GxG96F6vgyN70e1c4kcKUtWDwdNaE,1069
+rubber_ducky-1.6.6.dist-info/METADATA,sha256=7Lo7fiBYqQgkaXhxtERGDm96C1PDH4nHV0zMwyuN3DY,6638
+rubber_ducky-1.6.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+rubber_ducky-1.6.6.dist-info/entry_points.txt,sha256=WPnVUUNvWdMDcBlCo8JCzkLghGllMX5QVZyQghyq85Q,75
+rubber_ducky-1.6.6.dist-info/top_level.txt,sha256=hid_mDkugR6XIeravFKuzcRPpuN_ylN3ejC_06Fmnb4,15
+rubber_ducky-1.6.6.dist-info/RECORD,,

{rubber_ducky-1.6.4.dist-info → rubber_ducky-1.6.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any