From nobody Thu Jul 04 22:07:27 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WFW3M6Dxtz5PvVh; Thu, 04 Jul 2024 22:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WFW3M5djPz4VHB; Thu, 4 Jul 2024 22:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720130847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wp6/WrPecG32kfeTu3eKOq57F4usOKrWZU6L22Ol63I=; b=EAyJRg1fKeMgEUEgPrqyVaHl+dLfv3n4mgODOu2lFitsq1W0dS7Ldq5/QpcWOWTOA4p1R+ ddQXGpQHCNMWB0hiQmGhC65RQQUh1SNyhn4sI8R020Ex7BUXtbpM18mMZTL1OEIrz0xXhA gjYHQ9AevXVwnSJdJLh3OK45UuGpEcbr2dAyKQAGvleoVg1RqnXBpvM33jWXji60Zo9Mj7 A4WFTn8X10oI6Yzl5GUrqUhrZZG+LPszkCQTdCVVVi1h8cGIE45cAQg905cmqIeu2kFskr 6Xkt6UKso3AKLdiIup8Eqc+cODAshHZDzHbN+HRfOderR53+36UPG1U74mwu6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720130847; a=rsa-sha256; cv=none; b=HGKVAY933dyuHlxLKMON6hRDk1BUob7yKFx/XK4zd/edDxjdd8tWGDowdj5PoBti6Fuf6c 93JvUTipegwgRNo9bfkj46vwXwyeems5BYSbRmxOpMkqGBrvkJBoo0f3ikDPLean1H/WNm ixosICBja8ONHxowUNIXHexES3RdglF5dJWPQ1s9V3VTttxZbRsdXlNOwUZoxKAIcOJ8nu eFm/Ei4gc3u0+M8UjwbUgxorxPOecRyWk/1W7pO2HBQrU7DutDSa1xOATX9bSki6thp+E1 WO+k1PAa1XT1Z7pOy5OdGOqV1jo6jvqThkGdDL4j497wSa/1FvOoLdE+unO4xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720130847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wp6/WrPecG32kfeTu3eKOq57F4usOKrWZU6L22Ol63I=; b=O4U7AkWgTRPiPwSWdEnEokgj1cP1mx9fLlvBc+nLl0nnDBF+4x8W/LLXgy/9ir06E3E5a+ ElGMNmHrIoPzbVJctHVxNKvwNoG4SRcK9ZBbrRwn5xXNXGFgPytt8j0aDr29oc1Cpp20za kgS8FU/Q6K1PdN6qhqY5sh3NsA01cWMv6yaeekWT8ED954BrRaIiF4TpZq94tgjezmxtcf enUbv4o56+itZ0YoNWyDg4rQtNy9IW4wtynY31pWefTvDMw/88g0VIwpogEn6VKO0xPWVn xPFeGsS6R2KmdZVsbSf2UPTlbA6mIBbmm62px/dYG11nM1j379gczGymdgZEgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WFW3M5FBfzX30; Thu, 4 Jul 2024 22:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 464M7Rhi061648; Thu, 4 Jul 2024 22:07:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464M7RtU061645; Thu, 4 Jul 2024 22:07:27 GMT (envelope-from git) Date: Thu, 4 Jul 2024 22:07:27 GMT Message-Id: <202407042207.464M7RtU061645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: 6357e140db3c - 2024Q3 - misc/py-aider-chat: update to 0.42.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 6357e140db3c4fd572eff107abb40fbd84a06308 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=6357e140db3c4fd572eff107abb40fbd84a06308 commit 6357e140db3c4fd572eff107abb40fbd84a06308 Author: Dave Cottlehuber AuthorDate: 2024-07-04 08:47:35 +0000 Commit: Dave Cottlehuber 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