summaryrefslogtreecommitdiff
path: root/misc/py-aider-chat
diff options
context:
space:
mode:
Diffstat (limited to 'misc/py-aider-chat')
-rw-r--r--misc/py-aider-chat/Makefile10
-rw-r--r--misc/py-aider-chat/distinfo6
-rw-r--r--misc/py-aider-chat/files/patch-aider_commands.py29
-rw-r--r--misc/py-aider-chat/files/patch-aider_scrape.py79
-rw-r--r--misc/py-aider-chat/files/patch-pyproject.toml6
5 files changed, 42 insertions, 88 deletions
diff --git a/misc/py-aider-chat/Makefile b/misc/py-aider-chat/Makefile
index e5a9a4af1dbb..c14f28fd7ede 100644
--- a/misc/py-aider-chat/Makefile
+++ b/misc/py-aider-chat/Makefile
@@ -1,5 +1,6 @@
PORTNAME= aider_chat
-DISTVERSION= 0.77.1
+DISTVERSION= 0.83.0
+PORTREVISION= 1
CATEGORIES= misc python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -20,6 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=1.3:devel/py-arrow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12:www/py-beautifulsoup@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}blinker>=1.8:devel/py-blinker@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cachetools>=5.5:devel/py-cachetools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorama>=0.4.6:devel/py-colorama@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}configargparse>=1.5:devel/py-configargparse@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}diskcache>=5.6.0:devel/py-diskcache@${PY_FLAVOR} \
@@ -36,11 +38,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=1.3:devel/py-arrow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}networkx>=3.3:math/py-networkx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpy<2.0,1:math/py-numpy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}openai>=1.43.1:misc/py-openai@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslex>=0.1.3:devel/py-oslex@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}packaging>=24.1:devel/py-packaging@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pathspec>=0.12.1:devel/py-pathspec@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pexpect>=4.9.0:misc/py-pexpect@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=10.4.0:graphics/py-pillow@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}posthog>=3.7.0:misc/py-posthog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}posthog>=4.0.1:misc/py-posthog@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.47:devel/py-prompt-toolkit@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pydub>=0.25:audio/py-pydub@${PY_FLAVOR} \
@@ -48,7 +51,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=1.3:devel/py-arrow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyperclip>=1.7.0:devel/py-pyperclip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyyaml-include>=1.2:devel/py-pyyaml-include@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}rich>=13.8:textproc/py-rich@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=1.11,1<1.14,1:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=1.11,1:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}shtab>0:devel/py-shtab@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}socksio>=1<2:net/py-socksio@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sounddevice>=0.5.0:audio/py-sounddevice@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}SoundFile>=0.12:audio/py-SoundFile@${PY_FLAVOR} \
diff --git a/misc/py-aider-chat/distinfo b/misc/py-aider-chat/distinfo
index 1c5cfb26f472..535961c50880 100644
--- a/misc/py-aider-chat/distinfo
+++ b/misc/py-aider-chat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742544729
-SHA256 (aider_chat-0.77.1.tar.gz) = 70f798bce0e07506e2e9cdf121eb63e78a142ff419d3f58974e158fb769adc2a
-SIZE (aider_chat-0.77.1.tar.gz) = 1222022
+TIMESTAMP = 1747997462
+SHA256 (aider_chat-0.83.0.tar.gz) = e2ce2ea5881d92327a75b07f4a983c053a4f488d05b078d67bc2efa0b54661ff
+SIZE (aider_chat-0.83.0.tar.gz) = 1301188
diff --git a/misc/py-aider-chat/files/patch-aider_commands.py b/misc/py-aider-chat/files/patch-aider_commands.py
index 9a9c10e0cebe..cfa6e67a6b58 100644
--- a/misc/py-aider-chat/files/patch-aider_commands.py
+++ b/misc/py-aider-chat/files/patch-aider_commands.py
@@ -1,6 +1,6 @@
---- aider/commands.py.orig 2025-02-24 10:27:07 UTC
+--- aider/commands.py.orig 2025-05-09 22:41:18 UTC
+++ aider/commands.py
-@@ -20,7 +20,7 @@ from aider.run_cmd import run_cmd
+@@ -21,7 +21,7 @@ from aider.run_cmd import run_cmd
from aider.llm import litellm
from aider.repo import ANY_GIT_ERROR
from aider.run_cmd import run_cmd
@@ -9,17 +9,24 @@
from aider.utils import is_image_file
from .dump import dump # noqa: F401
-@@ -172,12 +172,8 @@ class Commands:
+@@ -220,20 +220,6 @@ class Commands:
+ return
self.io.tool_output(f"Scraping {url}...")
- if not self.scraper:
-- res = install_playwright(self.io)
-- if not res:
-- self.io.tool_warning("Unable to initialize playwright.")
+- if not self.scraper:
+- disable_playwright = getattr(self.args, "disable_playwright", False)
+- if disable_playwright:
+- res = False
+- else:
+- res = install_playwright(self.io)
+- if not res:
+- self.io.tool_warning("Unable to initialize playwright.")
-
- self.scraper = Scraper(
-- print_error=self.io.tool_error, playwright_available=res, verify_ssl=self.verify_ssl
-+ print_error=self.io.tool_error, playwright_available=False, verify_ssl=self.verify_ssl
- )
+- self.scraper = Scraper(
+- print_error=self.io.tool_error,
+- playwright_available=res,
+- verify_ssl=self.verify_ssl,
+- )
content = self.scraper.scrape(url) or ""
+ content = f"Here is the content of {url}:\n\n" + content
diff --git a/misc/py-aider-chat/files/patch-aider_scrape.py b/misc/py-aider-chat/files/patch-aider_scrape.py
index 969ff29d15f8..ba103c6f725e 100644
--- a/misc/py-aider-chat/files/patch-aider_scrape.py
+++ b/misc/py-aider-chat/files/patch-aider_scrape.py
@@ -1,65 +1,6 @@
---- aider/scrape.py.orig 2024-09-09 10:28:04 UTC
+--- aider/scrape.py.orig 2025-05-09 22:41:18 UTC
+++ aider/scrape.py
-@@ -15,57 +15,8 @@ def install_playwright(io):
-
-
- def install_playwright(io):
-- try:
-- from playwright.sync_api import sync_playwright
-+ return False
-
-- has_pip = True
-- except ImportError:
-- has_pip = False
--
-- try:
-- with sync_playwright() as p:
-- p.chromium.launch()
-- has_chromium = True
-- except Exception:
-- has_chromium = False
--
-- if has_pip and has_chromium:
-- return True
--
-- pip_cmd = utils.get_pip_install(["aider-chat[playwright]"])
-- chromium_cmd = "-m playwright install --with-deps chromium"
-- chromium_cmd = [sys.executable] + chromium_cmd.split()
--
-- cmds = ""
-- if not has_pip:
-- cmds += " ".join(pip_cmd) + "\n"
-- if not has_chromium:
-- cmds += " ".join(chromium_cmd) + "\n"
--
-- text = f"""For the best web scraping, install Playwright:
--
--{cmds}
--See {urls.enable_playwright} for more info.
--"""
--
-- io.tool_output(text)
-- if not io.confirm_ask("Install playwright?", default="y"):
-- return
--
-- if not has_pip:
-- success, output = utils.run_install(pip_cmd)
-- if not success:
-- io.tool_error(output)
-- return
--
-- success, output = utils.run_install(chromium_cmd)
-- if not success:
-- io.tool_error(output)
-- return
--
-- return True
--
--
- class Scraper:
- pandoc_available = None
- playwright_available = None
-@@ -82,7 +33,7 @@ class Scraper:
+@@ -92,7 +92,7 @@ class Scraper:
else:
self.print_error = print
@@ -68,7 +9,7 @@
self.verify_ssl = verify_ssl
def scrape(self, url):
-@@ -93,10 +44,7 @@ class Scraper:
+@@ -103,10 +103,7 @@ class Scraper:
`url` - the URL to scrape.
"""
@@ -80,10 +21,12 @@
if not content:
self.print_error(f"Failed to retrieve content from {url}")
-@@ -130,56 +78,6 @@ class Scraper:
+@@ -138,58 +135,6 @@ class Scraper:
+ ]
+ return any(re.search(pattern, content, re.IGNORECASE) for pattern in html_patterns)
return False
-
- # Internals...
+-
+- # Internals...
- def scrape_with_playwright(self, url):
- import playwright # noqa: F401
- from playwright.sync_api import Error as PlaywrightError
@@ -113,7 +56,8 @@
- try:
- response = page.goto(url, wait_until="networkidle", timeout=5000)
- except PlaywrightTimeoutError:
-- self.print_error(f"Timeout while loading {url}")
+- print(f"Page didn't quiesce, scraping content anyway: {url}")
+- response = None
- except PlaywrightError as e:
- self.print_error(f"Error navigating to {url}: {str(e)}")
- return None, None
@@ -133,7 +77,6 @@
- browser.close()
-
- return content, mime_type
--
+
def scrape_with_httpx(self, url):
import httpx
-
diff --git a/misc/py-aider-chat/files/patch-pyproject.toml b/misc/py-aider-chat/files/patch-pyproject.toml
index 2c261ee0ce98..c6b5ebe68b8c 100644
--- a/misc/py-aider-chat/files/patch-pyproject.toml
+++ b/misc/py-aider-chat/files/patch-pyproject.toml
@@ -1,7 +1,7 @@
---- pyproject.toml.orig 2024-09-09 09:50:15 UTC
+--- pyproject.toml.orig 2025-04-14 23:24:32 UTC
+++ pyproject.toml
-@@ -62,7 +62,7 @@ include = ["aider*", "aider.website"]
- ]
+@@ -41,7 +41,7 @@ include = ["aider"]
+ include = ["aider"]
[build-system]
-requires = ["setuptools>=68", "setuptools_scm[toml]>=8"]
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 20:43:02 +0000