git: 6357e140db3c - 2024Q3 - misc/py-aider-chat: update to 0.42.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Jul 2024 22:07:27 UTC
The branch 2024Q3 has been updated by dch:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6357e140db3c4fd572eff107abb40fbd84a06308
commit 6357e140db3c4fd572eff107abb40fbd84a06308
Author: Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2024-07-04 08:47:35 +0000
Commit: Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2024-07-04 22:07:12 +0000
misc/py-aider-chat: update to 0.42.0
- https://github.com/paul-gauthier/aider/blob/main/HISTORY.md
(cherry picked from commit 1dc4baafd80eede6dc8b094f35155f41e01cb40b)
---
misc/py-aider-chat/Makefile | 11 ++++-----
misc/py-aider-chat/distinfo | 6 ++---
misc/py-aider-chat/files/patch-aider_scrape.py | 31 +++++++++++++-------------
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/misc/py-aider-chat/Makefile b/misc/py-aider-chat/Makefile
index 03ed500e482b..455d0aa783a9 100644
--- a/misc/py-aider-chat/Makefile
+++ b/misc/py-aider-chat/Makefile
@@ -1,5 +1,5 @@
PORTNAME= aider_chat
-DISTVERSION= 0.38.0
+DISTVERSION= 0.42.0
CATEGORIES= misc python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -44,10 +44,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}streamlit>0:www/py-streamlit@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}tiktoken>=0.7.0:textproc/py-tiktoken@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}tokenizers>0:textproc/py-tokenizers@${PY_FLAVOR}
-# missing
-# playwright
-# pypandoc
-# google-generativeai
+# missing dependencies
+# playwright its a chromium browser automation library
+# watchdog is pulled in by streamlit
+# google-generativeai is not a popular aider dependency
+
USES= python shebangfix
USE_PYTHON= autoplist concurrent distutils
diff --git a/misc/py-aider-chat/distinfo b/misc/py-aider-chat/distinfo
index e62a32e53bc8..5947b8872afc 100644
--- a/misc/py-aider-chat/distinfo
+++ b/misc/py-aider-chat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718917111
-SHA256 (aider_chat-0.38.0.tar.gz) = 62b162bd709d4b96509cc3e3b4938a1c3c17490575d4f3694c57079680577b0c
-SIZE (aider_chat-0.38.0.tar.gz) = 119449
+TIMESTAMP = 1720106776
+SHA256 (aider_chat-0.42.0.tar.gz) = e64a63befcadea2500485ed7c60f91495e31d3a33c9955bd18fe9901c0d0f31e
+SIZE (aider_chat-0.42.0.tar.gz) = 124553
diff --git a/misc/py-aider-chat/files/patch-aider_scrape.py b/misc/py-aider-chat/files/patch-aider_scrape.py
index 05973f8fbd0d..6ba15a5ce575 100644
--- a/misc/py-aider-chat/files/patch-aider_scrape.py
+++ b/misc/py-aider-chat/files/patch-aider_scrape.py
@@ -1,21 +1,23 @@
---- aider/scrape.py.orig 2024-06-17 03:58:03 UTC
+--- aider/scrape.py.orig 2024-07-04 14:23:32 UTC
+++ aider/scrape.py
-@@ -7,7 +7,6 @@ from bs4 import BeautifulSoup
- import playwright
+@@ -3,9 +3,7 @@ import sys
+ import re
+ import sys
+
+-import playwright
import pypandoc
- from bs4 import BeautifulSoup
-from playwright.sync_api import sync_playwright
from aider import __version__, urls
from aider.dump import dump # noqa: F401
-@@ -44,14 +43,11 @@ class Scraper:
+@@ -42,14 +40,10 @@ class Scraper:
"""
Scrape a url and turn it into readable markdown.
- `url` - the URLto scrape.
+ `url` - the URL to scrape.
"""
- self.try_playwright()
+- self.try_playwright()
- if self.playwright_available:
- content = self.scrape_with_playwright(url)
@@ -25,11 +27,10 @@
if not content:
return
-@@ -64,51 +60,6 @@ class Scraper:
- return content
+@@ -62,50 +56,8 @@ class Scraper:
# Internals...
-- def scrape_with_playwright(self, url):
+ def scrape_with_playwright(self, url):
- with sync_playwright() as p:
- try:
- browser = p.chromium.launch()
@@ -59,16 +60,16 @@
- if self.playwright_available is not None:
- return
-
-- with sync_playwright() as p:
-- try:
+- try:
+- with sync_playwright() as p:
- p.chromium.launch()
- self.playwright_available = True
-- except Exception:
-- self.playwright_available = False
+- except Exception:
+ self.playwright_available = False
-
- def get_playwright_instructions(self):
- if self.playwright_available in (True, None):
-- return
+ return
- if self.playwright_instructions_shown:
- return
-
@@ -76,4 +77,4 @@
- return PLAYWRIGHT_INFO
def scrape_with_httpx(self, url):
- headers = {"User-Agent": f"Mozilla./5.0 ({aider_user_agent})"}
+ import httpx