#335, #339: cmd_web no longer exists, update to use do_run()

Author: dwash96

aider/coders/base_coder.py

@@ -1652,7 +1652,7 @@ async def check_for_urls(self, inp: str) -> List[str]:
                     "Add URL to the chat?", subject=url, group=group, allow_never=True
                 ):
                     inp += "\n\n"
-                    inp += await self.commands.cmd_web(url, return_content=True)
+                    inp += await self.commands.do_run("web", url, return_content=True)
                 else:
                     self.rejected_urls.add(url)
 

aider/commands.py

@@ -105,7 +105,7 @@ def get_commands(self):
         commands = [f"/{cmd}" for cmd in registry_commands]
         return sorted(commands)
 
-    async def do_run(self, cmd_name, args):
+    async def do_run(self, cmd_name, args, **kwargs):
         # Execute command using registry
         command_class = CommandRegistry.get_command(cmd_name)
         if not command_class:
@@ -115,17 +115,19 @@ async def do_run(self, cmd_name, args):
         self.cmd_running_event.clear()  # Command is running
         try:
             # Generate a spreadable kwargs dict with all relevant Commands attributes
-            kwargs = {
-                "original_read_only_fnames": self.original_read_only_fnames,
-                "voice_language": self.voice_language,
-                "voice_format": self.voice_format,
-                "voice_input_device": self.voice_input_device,
-                "verify_ssl": self.verify_ssl,
-                "parser": self.parser,
-                "verbose": self.verbose,
-                "editor": self.editor,
-                "system_args": self.args,
-            }
+            kwargs.update(
+                {
+                    "original_read_only_fnames": self.original_read_only_fnames,
+                    "voice_language": self.voice_language,
+                    "voice_format": self.voice_format,
+                    "voice_input_device": self.voice_input_device,
+                    "verify_ssl": self.verify_ssl,
+                    "parser": self.parser,
+                    "verbose": self.verbose,
+                    "editor": self.editor,
+                    "system_args": self.args,
+                }
+            )
 
             return await CommandRegistry.execute(
                 cmd_name,

tests/scrape/test_scrape.py

@@ -58,7 +58,7 @@ def mock_install(*args, **kwargs):
 
         try:
             # Run the cmd_web command
-            result = await self.commands.cmd_web("https://example.com", return_content=True)
+            result = await self.commands.do_run("web", "https://example.com", return_content=True)
 
             # Assert that the result contains some content
             self.assertIsNotNone(result)