diff options
Diffstat (limited to 'misc/py-aider-chat')
| -rw-r--r-- | misc/py-aider-chat/Makefile | 3 | ||||
| -rw-r--r-- | misc/py-aider-chat/distinfo | 6 | ||||
| -rw-r--r-- | misc/py-aider-chat/files/patch-aider_commands.py | 15 | ||||
| -rw-r--r-- | misc/py-aider-chat/files/patch-aider_scrape.py | 16 | ||||
| -rw-r--r-- | misc/py-aider-chat/files/patch-pyproject.toml | 6 |
5 files changed, 25 insertions, 21 deletions
diff --git a/misc/py-aider-chat/Makefile b/misc/py-aider-chat/Makefile index e5a9a4af1dbb..6247f4fdfa2f 100644 --- a/misc/py-aider-chat/Makefile +++ b/misc/py-aider-chat/Makefile @@ -1,5 +1,5 @@ PORTNAME= aider_chat -DISTVERSION= 0.77.1 +DISTVERSION= 0.82.2 CATEGORIES= misc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,6 +20,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} \ diff --git a/misc/py-aider-chat/distinfo b/misc/py-aider-chat/distinfo index 1c5cfb26f472..7a4c0bdbab8d 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 = 1746434942 +SHA256 (aider_chat-0.82.2.tar.gz) = fb725d4b5c7874a76b113bee3ab49e1a4c7daeae6f30accc6fd36960aa4f5928 +SIZE (aider_chat-0.82.2.tar.gz) = 1280757 diff --git a/misc/py-aider-chat/files/patch-aider_commands.py b/misc/py-aider-chat/files/patch-aider_commands.py index 9a9c10e0cebe..4ee55c42b1dd 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-04-14 23:24:32 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,18 @@ from aider.utils import is_image_file from .dump import dump # noqa: F401 -@@ -172,12 +172,8 @@ class Commands: +@@ -219,14 +219,6 @@ class Commands: + return self.io.tool_output(f"Scraping {url}...") - if not self.scraper: +- if not self.scraper: - res = install_playwright(self.io) - if not res: - self.io.tool_warning("Unable to initialize playwright.") - - self.scraper = Scraper( +- 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 - ) +- ) 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..e52881317294 100644 --- a/misc/py-aider-chat/files/patch-aider_scrape.py +++ b/misc/py-aider-chat/files/patch-aider_scrape.py @@ -1,4 +1,4 @@ ---- aider/scrape.py.orig 2024-09-09 10:28:04 UTC +--- aider/scrape.py.orig 2025-04-14 23:24:32 UTC +++ aider/scrape.py @@ -15,57 +15,8 @@ def install_playwright(io): @@ -80,10 +80,12 @@ if not content: self.print_error(f"Failed to retrieve content from {url}") -@@ -130,56 +78,6 @@ class Scraper: +@@ -128,58 +76,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 +115,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 +136,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"] |