From eaedd828b71f93e0441864e145ddfb88ec585d63 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 20:40:29 -0800
Subject: [PATCH 001/126] fix missing stderr redirect breaking docker hub
 autobuild

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 10e153e3..24ed751b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -171,10 +171,10 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$T
     # Save version info
     && ( \
         which curl && curl --version | head -n1 \
-        && which wget && wget --version | head -n1 \
-        && which yt-dlp && yt-dlp --version | head -n1 \
-        && which git && git --version | head -n1 \
-        && which rg && rg --version | head -n1 \
+        && which wget && wget --version 2>&1 | head -n1 \
+        && which yt-dlp && yt-dlp --version 2>&1 | head -n1 \
+        && which git && git --version 2>&1 | head -n1 \
+        && which rg && rg --version 2>&1 | head -n1 \
         && echo -e '\n\n' \
     ) | tee -a /VERSION.txt
 

From 9c0b637bf4f2fc0ac50ff4b28f4d9759719f9f88 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:27:25 -0800
Subject: [PATCH 002/126] Create jekyll-gh-pages.yml

---
 .github/workflows/jekyll-gh-pages.yml | 51 +++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/workflows/jekyll-gh-pages.yml

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
new file mode 100644
index 00000000..fa8ac1b1
--- /dev/null
+++ b/.github/workflows/jekyll-gh-pages.yml
@@ -0,0 +1,51 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["dev"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

From 6092a273301168d8b3d2cc564a4a5f9c785f46f9 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:30:24 -0800
Subject: [PATCH 003/126] Update jekyll-gh-pages.yml

---
 .github/workflows/jekyll-gh-pages.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
index fa8ac1b1..3e704b94 100644
--- a/.github/workflows/jekyll-gh-pages.yml
+++ b/.github/workflows/jekyll-gh-pages.yml
@@ -27,7 +27,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 1
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Build with Jekyll

From dc346c06d061bd5c1d137fec7b139d105e3659fd Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:34:25 -0800
Subject: [PATCH 004/126] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 94ef4154..68bb112d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-<em><img src="https://i.imgur.com/5B48E3N.png" height="90px"></em>
+<em><img src="icon.png" height="90px"></em>
 <h1>ArchiveBox<br/><sub>Open-source self-hosted web archiving.</sub></h1>
 
 <br/>

From c6a4fe325fe6cef695f568f3e0ac83c0e48733a9 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:34:48 -0800
Subject: [PATCH 005/126] Update jekyll-gh-pages.yml

---
 .github/workflows/jekyll-gh-pages.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
index 3e704b94..a5f941ef 100644
--- a/.github/workflows/jekyll-gh-pages.yml
+++ b/.github/workflows/jekyll-gh-pages.yml
@@ -19,7 +19,7 @@ permissions:
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
   group: "pages"
-  cancel-in-progress: false
+  cancel-in-progress: true
 
 jobs:
   # Build job
@@ -36,7 +36,7 @@ jobs:
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@v1
         with:
-          source: ./
+          source: ./website
           destination: ./_site
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v2

From 083d8b9965b72523b4ef6c42047776aea0b6f245 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 20:57:31 -0800
Subject: [PATCH 006/126] fix Dockerfile lint issues

---
 Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 24ed751b..3a700784 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -208,7 +208,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$T
 
 # Install Node dependencies
 WORKDIR "$CODE_DIR"
-COPY --chown=root:root --chmod=755 "package.json" "package-lock.json" "$CODE_DIR/"
+COPY --chown=root:root --chmod=755 "package.json" "package-lock.json" "$CODE_DIR"/
 RUN --mount=type=cache,target=/root/.npm,sharing=locked,id=npm-$TARGETARCH$TARGETVARIANT \
     echo "[+] Installing NPM extractor dependencies from package.json into $NODE_MODULES..." \
     && npm ci --prefer-offline --no-audit --cache /root/.npm \
@@ -222,9 +222,9 @@ RUN --mount=type=cache,target=/root/.npm,sharing=locked,id=npm-$TARGETARCH$TARGE
 
 # Install ArchiveBox Python dependencies
 WORKDIR "$CODE_DIR"
-COPY --chown=root:root --chmod=755 "./pyproject.toml" "requirements.txt" "$CODE_DIR/"
+COPY --chown=root:root --chmod=755 "./pyproject.toml" "requirements.txt" "$CODE_DIR"/
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$TARGETVARIANT --mount=type=cache,target=/root/.cache/pip,sharing=locked,id=pip-$TARGETARCH$TARGETVARIANT \
-    echo "[+] Installing PIP ArchiveBox dependencies from requirements.txt for ${TARGETPLATFORM}..." \ 
+    echo "[+] Installing PIP ArchiveBox dependencies from requirements.txt for ${TARGETPLATFORM}..." \
     && apt-get update -qq \
     && apt-get install -qq -y -t bookworm-backports --no-install-recommends \
         build-essential \
@@ -239,7 +239,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$T
     && pip install -r requirements.txt \
     && apt-get purge -y \
         build-essential \
-        # these are only needed to build CPython libs, we discard after build phase to shrink layer size
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 

From 716f68c34a83ea27cb85f67e87d150b25f4830f6 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:29:07 -0800
Subject: [PATCH 007/126] bump vendor dependency versions

---
 archivebox/vendor/django-taggit       | 2 +-
 archivebox/vendor/package-lock.json   | 1 +
 archivebox/vendor/package.json        | 1 +
 archivebox/vendor/pocket              | 2 +-
 archivebox/vendor/python-atomicwrites | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)
 create mode 120000 archivebox/vendor/package-lock.json
 create mode 120000 archivebox/vendor/package.json

diff --git a/archivebox/vendor/django-taggit b/archivebox/vendor/django-taggit
index 1e4dca37..9aaac8ff 160000
--- a/archivebox/vendor/django-taggit
+++ b/archivebox/vendor/django-taggit
@@ -1 +1 @@
-Subproject commit 1e4dca37e534ca70e99c39fb4198970eb8aad5aa
+Subproject commit 9aaac8ffffc9ac2030c503955e7d35ccc24ab26e
diff --git a/archivebox/vendor/package-lock.json b/archivebox/vendor/package-lock.json
new file mode 120000
index 00000000..322001ae
--- /dev/null
+++ b/archivebox/vendor/package-lock.json
@@ -0,0 +1 @@
+../../package-lock.json
\ No newline at end of file
diff --git a/archivebox/vendor/package.json b/archivebox/vendor/package.json
new file mode 120000
index 00000000..138a42cd
--- /dev/null
+++ b/archivebox/vendor/package.json
@@ -0,0 +1 @@
+../../package.json
\ No newline at end of file
diff --git a/archivebox/vendor/pocket b/archivebox/vendor/pocket
index 3a0c5c76..e7970b63 160000
--- a/archivebox/vendor/pocket
+++ b/archivebox/vendor/pocket
@@ -1 +1 @@
-Subproject commit 3a0c5c76832b0e92923383af3f9831ece7901c2f
+Subproject commit e7970b63feafc8941c325111c5ce3706698a18b5
diff --git a/archivebox/vendor/python-atomicwrites b/archivebox/vendor/python-atomicwrites
index c35cd32e..4183999d 160000
--- a/archivebox/vendor/python-atomicwrites
+++ b/archivebox/vendor/python-atomicwrites
@@ -1 +1 @@
-Subproject commit c35cd32eb364d5a4210e64bf38fd1a55f329f316
+Subproject commit 4183999d9b7e81af85dee070d5311299bdf5164c

From 823138887cac13f4b2ae68c59e14e3be0409d279 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:38:10 -0800
Subject: [PATCH 008/126] move gh pages content to subdirectory

---
 CNAME => website/CNAME                    |   0
 website/README.md                         |   1 +
 _config.yml => website/_config.yml        |   0
 {assets => website/assets}/README.md      |   0
 {assets => website/assets}/css/style.scss |   0
 icon.png => website/icon.png              | Bin
 6 files changed, 1 insertion(+)
 rename CNAME => website/CNAME (100%)
 create mode 120000 website/README.md
 rename _config.yml => website/_config.yml (100%)
 rename {assets => website/assets}/README.md (100%)
 rename {assets => website/assets}/css/style.scss (100%)
 rename icon.png => website/icon.png (100%)

diff --git a/CNAME b/website/CNAME
similarity index 100%
rename from CNAME
rename to website/CNAME
diff --git a/website/README.md b/website/README.md
new file mode 120000
index 00000000..32d46ee8
--- /dev/null
+++ b/website/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/_config.yml b/website/_config.yml
similarity index 100%
rename from _config.yml
rename to website/_config.yml
diff --git a/assets/README.md b/website/assets/README.md
similarity index 100%
rename from assets/README.md
rename to website/assets/README.md
diff --git a/assets/css/style.scss b/website/assets/css/style.scss
similarity index 100%
rename from assets/css/style.scss
rename to website/assets/css/style.scss
diff --git a/icon.png b/website/icon.png
similarity index 100%
rename from icon.png
rename to website/icon.png

From c778ea3eead08b4c95432b979af2859ad264462f Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:39:23 -0800
Subject: [PATCH 009/126] remove old stdeb.cfg config

---
 deb_dist  |  2 +-
 stdeb.cfg | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 stdeb.cfg

diff --git a/deb_dist b/deb_dist
index 88e4b7e5..92f8fe8f 160000
--- a/deb_dist
+++ b/deb_dist
@@ -1 +1 @@
-Subproject commit 88e4b7e5a6c8998f781e45be1e264c48f3ed5e65
+Subproject commit 92f8fe8f34bd5dabadb080676755e56fe5fcaf73
diff --git a/stdeb.cfg b/stdeb.cfg
deleted file mode 100644
index a6ee7e69..00000000
--- a/stdeb.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-[DEFAULT]
-Source: archivebox
-Package: archivebox
-Package3: archivebox
-Suite: focal
-Suite3: focal
-Build-Depends: debhelper, dh-python, python3-all, python3-pip, python3-setuptools, python3-wheel, python3-stdeb
-Depends3: nodejs, wget, curl, git, ffmpeg, yt-dlp, ripgrep, python3-all, python3-pip, python3-setuptools, python3-croniter, python3-crontab, python3-dateparser, python3-django, python3-django-extensions, python3-django-jsonfield, python3-mypy-extensions, python3-requests, python3-w3lib
-X-Python3-Version: >= 3.9
-XS-Python-Version: >= 3.9
-Setup-Env-Vars: DEB_BUILD_OPTIONS=nocheck

From ab64a867160385c5884c1bd3600dadfaa901d7aa Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:50:03 -0800
Subject: [PATCH 010/126] Update jekyll-gh-pages.yml

---
 .github/workflows/jekyll-gh-pages.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
index a5f941ef..9dd5326d 100644
--- a/.github/workflows/jekyll-gh-pages.yml
+++ b/.github/workflows/jekyll-gh-pages.yml
@@ -1,5 +1,5 @@
 # Sample workflow for building and deploying a Jekyll site to GitHub Pages
-name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+name: Build Jekyll GitHub Pages ArchiveBox.io Website
 
 on:
   # Runs on pushes targeting the default branch
@@ -31,6 +31,10 @@ jobs:
         with:
           submodules: true
           fetch-depth: 1
+      - name: Copy README.md into place
+        run: |
+          rm ./website/README.md
+          cp ./README.md ./website/README.md
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Build with Jekyll

From 74e03fd6f943aa12ac820acaa5190612548760b8 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 22:50:35 -0800
Subject: [PATCH 011/126] Update jekyll-gh-pages.yml

---
 .github/workflows/jekyll-gh-pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
index 9dd5326d..75786914 100644
--- a/.github/workflows/jekyll-gh-pages.yml
+++ b/.github/workflows/jekyll-gh-pages.yml
@@ -1,5 +1,5 @@
 # Sample workflow for building and deploying a Jekyll site to GitHub Pages
-name: Build Jekyll GitHub Pages ArchiveBox.io Website
+name: Build GitHub Pages website
 
 on:
   # Runs on pushes targeting the default branch

From 4523d6817f2fbf23e5001f006379f929c3a8ef98 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 23:43:53 -0800
Subject: [PATCH 012/126] readme fixes

---
 README.md                       |   2 +-
 archivebox/logging_util.py      |   4 +-
 archivebox/system.py            |   8 +-
 archivebox/vendor/django-taggit |   2 +-
 pdm.lock                        | 871 +++++++++++++++++++++++++++++++-
 5 files changed, 879 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 68bb112d..9a561a28 100644
--- a/README.md
+++ b/README.md
@@ -989,7 +989,7 @@ https://stackoverflow.com/questions/1074212/how-can-i-see-the-raw-sql-queries-dj
 
 <details><summary><i>Click to expand...</i></summary>
 
-```bash|
+```bash
 # docker-compose.yml:
 services:
     archivebox:
diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py
index a52cf82a..d43bb086 100644
--- a/archivebox/logging_util.py
+++ b/archivebox/logging_util.py
@@ -517,8 +517,8 @@ def log_shell_welcome_msg():
     from .cli import list_subcommands
 
     print('{green}# ArchiveBox Imports{reset}'.format(**ANSI))
-    print('{green}from core.models import Snapshot, User{reset}'.format(**ANSI))
-    print('{green}from archivebox import *\n    {}{reset}'.format("\n    ".join(list_subcommands().keys()), **ANSI))
+    print('{green}from archivebox.core.models import Snapshot, ArchiveResult, Tag, User{reset}'.format(**ANSI))
+    print('{green}from archivebox.cli import *\n    {}{reset}'.format("\n    ".join(list_subcommands().keys()), **ANSI))
     print()
     print('[i] Welcome to the ArchiveBox Shell!')
     print('    https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#Shell-Usage')
diff --git a/archivebox/system.py b/archivebox/system.py
index 37927ba2..d80a2cb5 100644
--- a/archivebox/system.py
+++ b/archivebox/system.py
@@ -185,17 +185,19 @@ def dedupe_cron_jobs(cron: CronTab) -> CronTab:
 
 
 class suppress_output(object):
-    '''
+    """
     A context manager for doing a "deep suppression" of stdout and stderr in 
     Python, i.e. will suppress all print, even if the print originates in a 
     compiled C/Fortran sub-function.
-       This will not suppress raised exceptions, since exceptions are printed
+    
+    This will not suppress raised exceptions, since exceptions are printed
     to stderr just before a script exits, and after the context manager has
     exited (at least, I think that is why it lets exceptions through).      
 
     with suppress_stdout_stderr():
         rogue_function()
-    '''
+    """
+    
     def __init__(self, stdout=True, stderr=True):
         # Open a pair of null files
         # Save the actual stdout (1) and stderr (2) file descriptors.
diff --git a/archivebox/vendor/django-taggit b/archivebox/vendor/django-taggit
index 9aaac8ff..3847b3cb 160000
--- a/archivebox/vendor/django-taggit
+++ b/archivebox/vendor/django-taggit
@@ -1 +1 @@
-Subproject commit 9aaac8ffffc9ac2030c503955e7d35ccc24ab26e
+Subproject commit 3847b3cb32cd80448a1ef4c319951a2a4a6a971c
diff --git a/pdm.lock b/pdm.lock
index 39a1d1ec..53329a63 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -2,11 +2,21 @@
 # It is not intended for manual editing.
 
 [metadata]
-groups = ["default", "ldap", "sonic"]
+groups = ["default", "build", "debug", "dev", "doc", "ldap", "lint", "sonic", "test"]
 strategy = ["cross_platform"]
 lock_version = "4.4"
 content_hash = "sha256:3355b57d87304093c9176a6387d80f5c5226b169964d8039f14a5998046faf4d"
 
+[[package]]
+name = "alabaster"
+version = "0.7.13"
+requires_python = ">=3.6"
+summary = "A configurable sidebar-enabled Sphinx theme"
+files = [
+    {file = "alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
+    {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
+]
+
 [[package]]
 name = "appnope"
 version = "0.1.3"
@@ -41,6 +51,29 @@ files = [
     {file = "asttokens-2.4.1.tar.gz", hash = "sha256:b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0"},
 ]
 
+[[package]]
+name = "babel"
+version = "2.13.1"
+requires_python = ">=3.7"
+summary = "Internationalization utilities"
+dependencies = [
+    "setuptools; python_version >= \"3.12\"",
+]
+files = [
+    {file = "Babel-2.13.1-py3-none-any.whl", hash = "sha256:7077a4984b02b6727ac10f1f7294484f737443d7e2e66c5e4380e41a3ae0b4ed"},
+    {file = "Babel-2.13.1.tar.gz", hash = "sha256:33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900"},
+]
+
+[[package]]
+name = "blinker"
+version = "1.7.0"
+requires_python = ">=3.8"
+summary = "Fast, simple object-to-object and broadcast signaling"
+files = [
+    {file = "blinker-1.7.0-py3-none-any.whl", hash = "sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9"},
+    {file = "blinker-1.7.0.tar.gz", hash = "sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182"},
+]
+
 [[package]]
 name = "brotli"
 version = "1.1.0"
@@ -135,6 +168,35 @@ files = [
     {file = "brotlicffi-1.1.0.0.tar.gz", hash = "sha256:b77827a689905143f87915310b93b273ab17888fd43ef350d4832c4a71083c13"},
 ]
 
+[[package]]
+name = "cachecontrol"
+version = "0.13.1"
+requires_python = ">=3.7"
+summary = "httplib2 caching for requests"
+dependencies = [
+    "msgpack>=0.5.2",
+    "requests>=2.16.0",
+]
+files = [
+    {file = "cachecontrol-0.13.1-py3-none-any.whl", hash = "sha256:95dedbec849f46dda3137866dc28b9d133fc9af55f5b805ab1291833e4457aa4"},
+    {file = "cachecontrol-0.13.1.tar.gz", hash = "sha256:f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b"},
+]
+
+[[package]]
+name = "cachecontrol"
+version = "0.13.1"
+extras = ["filecache"]
+requires_python = ">=3.7"
+summary = "httplib2 caching for requests"
+dependencies = [
+    "cachecontrol==0.13.1",
+    "filelock>=3.8.0",
+]
+files = [
+    {file = "cachecontrol-0.13.1-py3-none-any.whl", hash = "sha256:95dedbec849f46dda3137866dc28b9d133fc9af55f5b805ab1291833e4457aa4"},
+    {file = "cachecontrol-0.13.1.tar.gz", hash = "sha256:f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b"},
+]
+
 [[package]]
 name = "certifi"
 version = "2023.7.22"
@@ -280,6 +342,15 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
+[[package]]
+name = "commonmark"
+version = "0.9.1"
+summary = "Python parser for the CommonMark Markdown spec"
+files = [
+    {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"},
+    {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"},
+]
+
 [[package]]
 name = "croniter"
 version = "2.0.1"
@@ -320,6 +391,15 @@ files = [
     {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"},
 ]
 
+[[package]]
+name = "distlib"
+version = "0.3.7"
+summary = "Distribution utilities"
+files = [
+    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
+    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
+]
+
 [[package]]
 name = "django"
 version = "3.1.14"
@@ -349,6 +429,20 @@ files = [
     {file = "django_auth_ldap-4.1.0-py3-none-any.whl", hash = "sha256:68870e7921e84b1a9867e268a9c8a3e573e8a0d95ea08bcf31be178f5826ff36"},
 ]
 
+[[package]]
+name = "django-debug-toolbar"
+version = "3.2.4"
+requires_python = ">=3.6"
+summary = "A configurable set of panels that display various debug information about the current request/response."
+dependencies = [
+    "Django>=2.2",
+    "sqlparse>=0.2.0",
+]
+files = [
+    {file = "django-debug-toolbar-3.2.4.tar.gz", hash = "sha256:644bbd5c428d3283aa9115722471769cac1bec189edf3a0c855fd8ff870375a9"},
+    {file = "django_debug_toolbar-3.2.4-py3-none-any.whl", hash = "sha256:6b633b6cfee24f232d73569870f19aa86c819d750e7f3e833f2344a9eb4b4409"},
+]
+
 [[package]]
 name = "django-extensions"
 version = "3.1.5"
@@ -362,6 +456,57 @@ files = [
     {file = "django_extensions-3.1.5-py3-none-any.whl", hash = "sha256:9238b9e016bb0009d621e05cf56ea8ce5cce9b32e91ad2026996a7377ca28069"},
 ]
 
+[[package]]
+name = "django-stubs"
+version = "4.2.6"
+requires_python = ">=3.8"
+summary = "Mypy stubs for Django"
+dependencies = [
+    "django",
+    "django-stubs-ext>=4.2.5",
+    "tomli; python_version < \"3.11\"",
+    "types-PyYAML",
+    "types-pytz",
+    "typing-extensions",
+]
+files = [
+    {file = "django-stubs-4.2.6.tar.gz", hash = "sha256:e60b43de662a199db4b15c803c06669e0ac5035614af291cbd3b91591f7dcc94"},
+    {file = "django_stubs-4.2.6-py3-none-any.whl", hash = "sha256:2fcd257884a68dfa02de41ee5410ec805264d9b07d9b5b119e4dea82c7b8345e"},
+]
+
+[[package]]
+name = "django-stubs-ext"
+version = "4.2.5"
+requires_python = ">=3.8"
+summary = "Monkey-patching and extensions for django-stubs"
+dependencies = [
+    "django",
+    "typing-extensions",
+]
+files = [
+    {file = "django-stubs-ext-4.2.5.tar.gz", hash = "sha256:8c4d1fb5f68419b3b2474c659681a189803e27d6a5e5abf5aa0da57601b58633"},
+    {file = "django_stubs_ext-4.2.5-py3-none-any.whl", hash = "sha256:921cd7ae4614e74c234bc0fe86ee75537d163addfe1fc6f134bf03e29d86c01e"},
+]
+
+[[package]]
+name = "djdt-flamegraph"
+version = "0.2.13"
+summary = "Flamegraphs for Django Debug Toolbar"
+files = [
+    {file = "djdt_flamegraph-0.2.13-py2.py3-none-any.whl", hash = "sha256:b3252b8cc9b586829166cc158b26952626cd6f41a3ffa92dceef2f5dbe5b99a0"},
+    {file = "djdt_flamegraph-0.2.13.tar.gz", hash = "sha256:c07a71be58484636e021d4c49b129fd819f24c9128849cb59558e5141192dbf3"},
+]
+
+[[package]]
+name = "docutils"
+version = "0.18.1"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+summary = "Docutils -- Python Documentation Utilities"
+files = [
+    {file = "docutils-0.18.1-py2.py3-none-any.whl", hash = "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c"},
+    {file = "docutils-0.18.1.tar.gz", hash = "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06"},
+]
+
 [[package]]
 name = "exceptiongroup"
 version = "1.1.3"
@@ -382,6 +527,57 @@ files = [
     {file = "executing-2.0.1.tar.gz", hash = "sha256:35afe2ce3affba8ee97f2d69927fa823b08b472b7b994e36a52a964b93d16147"},
 ]
 
+[[package]]
+name = "filelock"
+version = "3.13.1"
+requires_python = ">=3.8"
+summary = "A platform independent file lock."
+files = [
+    {file = "filelock-3.13.1-py3-none-any.whl", hash = "sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c"},
+    {file = "filelock-3.13.1.tar.gz", hash = "sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e"},
+]
+
+[[package]]
+name = "findpython"
+version = "0.4.0"
+requires_python = ">=3.7"
+summary = "A utility to find python versions on your system"
+dependencies = [
+    "packaging>=20",
+]
+files = [
+    {file = "findpython-0.4.0-py3-none-any.whl", hash = "sha256:087148ac5935f9be458f36a05f3fa479efdf2c629f5d386c73ea481cfecff15e"},
+    {file = "findpython-0.4.0.tar.gz", hash = "sha256:18b14d115678da18ae92ee22d7001cc30915ea531053f77010ee05a39680f438"},
+]
+
+[[package]]
+name = "flake8"
+version = "6.1.0"
+requires_python = ">=3.8.1"
+summary = "the modular source code checker: pep8 pyflakes and co"
+dependencies = [
+    "mccabe<0.8.0,>=0.7.0",
+    "pycodestyle<2.12.0,>=2.11.0",
+    "pyflakes<3.2.0,>=3.1.0",
+]
+files = [
+    {file = "flake8-6.1.0-py2.py3-none-any.whl", hash = "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"},
+    {file = "flake8-6.1.0.tar.gz", hash = "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23"},
+]
+
+[[package]]
+name = "homebrew-pypi-poet"
+version = "0.10.0"
+summary = "Writes Homebrew stanzas for pypi packages"
+dependencies = [
+    "jinja2",
+    "setuptools",
+]
+files = [
+    {file = "homebrew-pypi-poet-0.10.0.tar.gz", hash = "sha256:e09e997e35a98f66445f9a39ccb33d6d93c5cd090302a59f231707eac0bf378e"},
+    {file = "homebrew_pypi_poet-0.10.0-py2.py3-none-any.whl", hash = "sha256:65824f97aea0e713c4ac18aa2ef4477aca69426554eac842eeaaddf97df3fc47"},
+]
+
 [[package]]
 name = "idna"
 version = "3.4"
@@ -392,6 +588,66 @@ files = [
     {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
 ]
 
+[[package]]
+name = "imagesize"
+version = "1.4.1"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "Getting image size from png/jpeg/jpeg2000/gif file"
+files = [
+    {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"},
+    {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"},
+]
+
+[[package]]
+name = "importlib-metadata"
+version = "6.8.0"
+requires_python = ">=3.8"
+summary = "Read metadata from Python packages"
+dependencies = [
+    "zipp>=0.5",
+]
+files = [
+    {file = "importlib_metadata-6.8.0-py3-none-any.whl", hash = "sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb"},
+    {file = "importlib_metadata-6.8.0.tar.gz", hash = "sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743"},
+]
+
+[[package]]
+name = "iniconfig"
+version = "2.0.0"
+requires_python = ">=3.7"
+summary = "brain-dead simple config-ini parsing"
+files = [
+    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
+    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
+]
+
+[[package]]
+name = "installer"
+version = "0.7.0"
+requires_python = ">=3.7"
+summary = "A library for installing Python wheels."
+files = [
+    {file = "installer-0.7.0-py3-none-any.whl", hash = "sha256:05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53"},
+    {file = "installer-0.7.0.tar.gz", hash = "sha256:a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631"},
+]
+
+[[package]]
+name = "ipdb"
+version = "0.13.13"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "IPython-enabled pdb"
+dependencies = [
+    "decorator; python_version > \"3.6\" and python_version < \"3.11\"",
+    "decorator; python_version >= \"3.11\"",
+    "ipython>=7.31.1; python_version > \"3.6\" and python_version < \"3.11\"",
+    "ipython>=7.31.1; python_version >= \"3.11\"",
+    "tomli; python_version > \"3.6\" and python_version < \"3.11\"",
+]
+files = [
+    {file = "ipdb-0.13.13-py3-none-any.whl", hash = "sha256:45529994741c4ab6d2388bfa5d7b725c2cf7fe9deffabdb8a6113aa5ed449ed4"},
+    {file = "ipdb-0.13.13.tar.gz", hash = "sha256:e3ac6018ef05126d442af680aad863006ec19d02290561ac88b8b1c0b0cfc726"},
+]
+
 [[package]]
 name = "ipython"
 version = "8.17.2"
@@ -429,6 +685,81 @@ files = [
     {file = "jedi-0.19.1.tar.gz", hash = "sha256:cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd"},
 ]
 
+[[package]]
+name = "jinja2"
+version = "3.1.2"
+requires_python = ">=3.7"
+summary = "A very fast and expressive template engine."
+dependencies = [
+    "MarkupSafe>=2.0",
+]
+files = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
+
+[[package]]
+name = "markdown-it-py"
+version = "3.0.0"
+requires_python = ">=3.8"
+summary = "Python port of markdown-it. Markdown parsing, done right!"
+dependencies = [
+    "mdurl~=0.1",
+]
+files = [
+    {file = "markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"},
+    {file = "markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1"},
+]
+
+[[package]]
+name = "markupsafe"
+version = "2.1.3"
+requires_python = ">=3.7"
+summary = "Safely add untrusted strings to HTML/XML markup."
+files = [
+    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"},
+    {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
+]
+
 [[package]]
 name = "matplotlib-inline"
 version = "0.1.6"
@@ -442,6 +773,79 @@ files = [
     {file = "matplotlib_inline-0.1.6-py3-none-any.whl", hash = "sha256:f1f41aab5328aa5aaea9b16d083b128102f8712542f819fe7e6a420ff581b311"},
 ]
 
+[[package]]
+name = "mccabe"
+version = "0.7.0"
+requires_python = ">=3.6"
+summary = "McCabe checker, plugin for flake8"
+files = [
+    {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
+    {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
+]
+
+[[package]]
+name = "mdurl"
+version = "0.1.2"
+requires_python = ">=3.7"
+summary = "Markdown URL utilities"
+files = [
+    {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"},
+    {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"},
+]
+
+[[package]]
+name = "msgpack"
+version = "1.0.7"
+requires_python = ">=3.8"
+summary = "MessagePack serializer"
+files = [
+    {file = "msgpack-1.0.7-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:04ad6069c86e531682f9e1e71b71c1c3937d6014a7c3e9edd2aa81ad58842862"},
+    {file = "msgpack-1.0.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cca1b62fe70d761a282496b96a5e51c44c213e410a964bdffe0928e611368329"},
+    {file = "msgpack-1.0.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e50ebce52f41370707f1e21a59514e3375e3edd6e1832f5e5235237db933c98b"},
+    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a7b4f35de6a304b5533c238bee86b670b75b03d31b7797929caa7a624b5dda6"},
+    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28efb066cde83c479dfe5a48141a53bc7e5f13f785b92ddde336c716663039ee"},
+    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4cb14ce54d9b857be9591ac364cb08dc2d6a5c4318c1182cb1d02274029d590d"},
+    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b573a43ef7c368ba4ea06050a957c2a7550f729c31f11dd616d2ac4aba99888d"},
+    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ccf9a39706b604d884d2cb1e27fe973bc55f2890c52f38df742bc1d79ab9f5e1"},
+    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cb70766519500281815dfd7a87d3a178acf7ce95390544b8c90587d76b227681"},
+    {file = "msgpack-1.0.7-cp310-cp310-win32.whl", hash = "sha256:b610ff0f24e9f11c9ae653c67ff8cc03c075131401b3e5ef4b82570d1728f8a9"},
+    {file = "msgpack-1.0.7-cp310-cp310-win_amd64.whl", hash = "sha256:a40821a89dc373d6427e2b44b572efc36a2778d3f543299e2f24eb1a5de65415"},
+    {file = "msgpack-1.0.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:576eb384292b139821c41995523654ad82d1916da6a60cff129c715a6223ea84"},
+    {file = "msgpack-1.0.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:730076207cb816138cf1af7f7237b208340a2c5e749707457d70705715c93b93"},
+    {file = "msgpack-1.0.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:85765fdf4b27eb5086f05ac0491090fc76f4f2b28e09d9350c31aac25a5aaff8"},
+    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3476fae43db72bd11f29a5147ae2f3cb22e2f1a91d575ef130d2bf49afd21c46"},
+    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d4c80667de2e36970ebf74f42d1088cc9ee7ef5f4e8c35eee1b40eafd33ca5b"},
+    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5b0bf0effb196ed76b7ad883848143427a73c355ae8e569fa538365064188b8e"},
+    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f9a7c509542db4eceed3dcf21ee5267ab565a83555c9b88a8109dcecc4709002"},
+    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:84b0daf226913133f899ea9b30618722d45feffa67e4fe867b0b5ae83a34060c"},
+    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ec79ff6159dffcc30853b2ad612ed572af86c92b5168aa3fc01a67b0fa40665e"},
+    {file = "msgpack-1.0.7-cp311-cp311-win32.whl", hash = "sha256:3e7bf4442b310ff154b7bb9d81eb2c016b7d597e364f97d72b1acc3817a0fdc1"},
+    {file = "msgpack-1.0.7-cp311-cp311-win_amd64.whl", hash = "sha256:3f0c8c6dfa6605ab8ff0611995ee30d4f9fcff89966cf562733b4008a3d60d82"},
+    {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f0936e08e0003f66bfd97e74ee530427707297b0d0361247e9b4f59ab78ddc8b"},
+    {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:98bbd754a422a0b123c66a4c341de0474cad4a5c10c164ceed6ea090f3563db4"},
+    {file = "msgpack-1.0.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b291f0ee7961a597cbbcc77709374087fa2a9afe7bdb6a40dbbd9b127e79afee"},
+    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebbbba226f0a108a7366bf4b59bf0f30a12fd5e75100c630267d94d7f0ad20e5"},
+    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e2d69948e4132813b8d1131f29f9101bc2c915f26089a6d632001a5c1349672"},
+    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bdf38ba2d393c7911ae989c3bbba510ebbcdf4ecbdbfec36272abe350c454075"},
+    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:993584fc821c58d5993521bfdcd31a4adf025c7d745bbd4d12ccfecf695af5ba"},
+    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:52700dc63a4676669b341ba33520f4d6e43d3ca58d422e22ba66d1736b0a6e4c"},
+    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e45ae4927759289c30ccba8d9fdce62bb414977ba158286b5ddaf8df2cddb5c5"},
+    {file = "msgpack-1.0.7-cp312-cp312-win32.whl", hash = "sha256:27dcd6f46a21c18fa5e5deed92a43d4554e3df8d8ca5a47bf0615d6a5f39dbc9"},
+    {file = "msgpack-1.0.7-cp312-cp312-win_amd64.whl", hash = "sha256:7687e22a31e976a0e7fc99c2f4d11ca45eff652a81eb8c8085e9609298916dcf"},
+    {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bfef2bb6ef068827bbd021017a107194956918ab43ce4d6dc945ffa13efbc25f"},
+    {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:484ae3240666ad34cfa31eea7b8c6cd2f1fdaae21d73ce2974211df099a95d81"},
+    {file = "msgpack-1.0.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3967e4ad1aa9da62fd53e346ed17d7b2e922cba5ab93bdd46febcac39be636fc"},
+    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8dd178c4c80706546702c59529ffc005681bd6dc2ea234c450661b205445a34d"},
+    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6ffbc252eb0d229aeb2f9ad051200668fc3a9aaa8994e49f0cb2ffe2b7867e7"},
+    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:822ea70dc4018c7e6223f13affd1c5c30c0f5c12ac1f96cd8e9949acddb48a61"},
+    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:384d779f0d6f1b110eae74cb0659d9aa6ff35aaf547b3955abf2ab4c901c4819"},
+    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f64e376cd20d3f030190e8c32e1c64582eba56ac6dc7d5b0b49a9d44021b52fd"},
+    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ed82f5a7af3697b1c4786053736f24a0efd0a1b8a130d4c7bfee4b9ded0f08f"},
+    {file = "msgpack-1.0.7-cp39-cp39-win32.whl", hash = "sha256:f26a07a6e877c76a88e3cecac8531908d980d3d5067ff69213653649ec0f60ad"},
+    {file = "msgpack-1.0.7-cp39-cp39-win_amd64.whl", hash = "sha256:1dc93e8e4653bdb5910aed79f11e165c85732067614f180f70534f056da97db3"},
+    {file = "msgpack-1.0.7.tar.gz", hash = "sha256:572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87"},
+]
+
 [[package]]
 name = "mutagen"
 version = "1.47.0"
@@ -452,6 +856,41 @@ files = [
     {file = "mutagen-1.47.0.tar.gz", hash = "sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99"},
 ]
 
+[[package]]
+name = "mypy"
+version = "1.7.0"
+requires_python = ">=3.8"
+summary = "Optional static typing for Python"
+dependencies = [
+    "mypy-extensions>=1.0.0",
+    "tomli>=1.1.0; python_version < \"3.11\"",
+    "typing-extensions>=4.1.0",
+]
+files = [
+    {file = "mypy-1.7.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5da84d7bf257fd8f66b4f759a904fd2c5a765f70d8b52dde62b521972a0a2357"},
+    {file = "mypy-1.7.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a3637c03f4025f6405737570d6cbfa4f1400eb3c649317634d273687a09ffc2f"},
+    {file = "mypy-1.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b633f188fc5ae1b6edca39dae566974d7ef4e9aaaae00bc36efe1f855e5173ac"},
+    {file = "mypy-1.7.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d6ed9a3997b90c6f891138e3f83fb8f475c74db4ccaa942a1c7bf99e83a989a1"},
+    {file = "mypy-1.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:1fe46e96ae319df21359c8db77e1aecac8e5949da4773c0274c0ef3d8d1268a9"},
+    {file = "mypy-1.7.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:df67fbeb666ee8828f675fee724cc2cbd2e4828cc3df56703e02fe6a421b7401"},
+    {file = "mypy-1.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a79cdc12a02eb526d808a32a934c6fe6df07b05f3573d210e41808020aed8b5d"},
+    {file = "mypy-1.7.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f65f385a6f43211effe8c682e8ec3f55d79391f70a201575def73d08db68ead1"},
+    {file = "mypy-1.7.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e81ffd120ee24959b449b647c4b2fbfcf8acf3465e082b8d58fd6c4c2b27e46"},
+    {file = "mypy-1.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:f29386804c3577c83d76520abf18cfcd7d68264c7e431c5907d250ab502658ee"},
+    {file = "mypy-1.7.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:87c076c174e2c7ef8ab416c4e252d94c08cd4980a10967754f91571070bf5fbe"},
+    {file = "mypy-1.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6cb8d5f6d0fcd9e708bb190b224089e45902cacef6f6915481806b0c77f7786d"},
+    {file = "mypy-1.7.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d93e76c2256aa50d9c82a88e2f569232e9862c9982095f6d54e13509f01222fc"},
+    {file = "mypy-1.7.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:cddee95dea7990e2215576fae95f6b78a8c12f4c089d7e4367564704e99118d3"},
+    {file = "mypy-1.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:d01921dbd691c4061a3e2ecdbfbfad029410c5c2b1ee88946bf45c62c6c91210"},
+    {file = "mypy-1.7.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c1b06b4b109e342f7dccc9efda965fc3970a604db70f8560ddfdee7ef19afb05"},
+    {file = "mypy-1.7.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf7a2f0a6907f231d5e41adba1a82d7d88cf1f61a70335889412dec99feeb0f8"},
+    {file = "mypy-1.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:551d4a0cdcbd1d2cccdcc7cb516bb4ae888794929f5b040bb51aae1846062901"},
+    {file = "mypy-1.7.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55d28d7963bef00c330cb6461db80b0b72afe2f3c4e2963c99517cf06454e665"},
+    {file = "mypy-1.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:870bd1ffc8a5862e593185a4c169804f2744112b4a7c55b93eb50f48e7a77010"},
+    {file = "mypy-1.7.0-py3-none-any.whl", hash = "sha256:96650d9a4c651bc2a4991cf46f100973f656d69edc7faf91844e87fe627f7e96"},
+    {file = "mypy-1.7.0.tar.gz", hash = "sha256:1e280b5697202efa698372d2f39e9a6713a0395a756b1c6bd48995f8d72690dc"},
+]
+
 [[package]]
 name = "mypy-extensions"
 version = "1.0.0"
@@ -462,6 +901,16 @@ files = [
     {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
 ]
 
+[[package]]
+name = "packaging"
+version = "23.2"
+requires_python = ">=3.7"
+summary = "Core utilities for Python packages"
+files = [
+    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
+    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
+]
+
 [[package]]
 name = "parso"
 version = "0.8.3"
@@ -472,6 +921,37 @@ files = [
     {file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"},
 ]
 
+[[package]]
+name = "pdm"
+version = "2.10.1"
+requires_python = ">=3.7"
+summary = "A modern Python package and dependency manager supporting the latest PEP standards"
+dependencies = [
+    "blinker",
+    "cachecontrol[filecache]>=0.13.0",
+    "certifi",
+    "findpython<1.0.0a0,>=0.4.0",
+    "importlib-metadata>=3.6; python_version < \"3.10\"",
+    "installer<0.8,>=0.7",
+    "packaging!=22.0,>=20.9",
+    "platformdirs",
+    "pyproject-hooks",
+    "python-dotenv>=0.15",
+    "requests-toolbelt",
+    "resolvelib>=1.0.1",
+    "rich>=12.3.0",
+    "shellingham>=1.3.2",
+    "tomli>=1.1.0; python_version < \"3.11\"",
+    "tomlkit<1,>=0.11.1",
+    "truststore; python_version >= \"3.10\"",
+    "unearth>=0.12.1",
+    "virtualenv>=20",
+]
+files = [
+    {file = "pdm-2.10.1-py3-none-any.whl", hash = "sha256:2b2853b83830ed110a8a1eb3feb62cf4e55165de4809a5278bc9453c788898d3"},
+    {file = "pdm-2.10.1.tar.gz", hash = "sha256:d166531c659fc4905933546544dd2e16cf648c2ba6d898c82126ad6a42117a81"},
+]
+
 [[package]]
 name = "pexpect"
 version = "4.8.0"
@@ -484,6 +964,26 @@ files = [
     {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"},
 ]
 
+[[package]]
+name = "platformdirs"
+version = "3.11.0"
+requires_python = ">=3.7"
+summary = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+files = [
+    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
+    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
+]
+
+[[package]]
+name = "pluggy"
+version = "1.3.0"
+requires_python = ">=3.8"
+summary = "plugin and hook calling mechanisms for python"
+files = [
+    {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"},
+    {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"},
+]
+
 [[package]]
 name = "prompt-toolkit"
 version = "3.0.40"
@@ -538,6 +1038,16 @@ files = [
     {file = "pyasn1_modules-0.3.0.tar.gz", hash = "sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c"},
 ]
 
+[[package]]
+name = "pycodestyle"
+version = "2.11.1"
+requires_python = ">=3.8"
+summary = "Python style guide checker"
+files = [
+    {file = "pycodestyle-2.11.1-py2.py3-none-any.whl", hash = "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"},
+    {file = "pycodestyle-2.11.1.tar.gz", hash = "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f"},
+]
+
 [[package]]
 name = "pycparser"
 version = "2.21"
@@ -577,6 +1087,16 @@ files = [
     {file = "pycryptodomex-3.19.0.tar.gz", hash = "sha256:af83a554b3f077564229865c45af0791be008ac6469ef0098152139e6bd4b5b6"},
 ]
 
+[[package]]
+name = "pyflakes"
+version = "3.1.0"
+requires_python = ">=3.8"
+summary = "passive checker of Python programs"
+files = [
+    {file = "pyflakes-3.1.0-py2.py3-none-any.whl", hash = "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774"},
+    {file = "pyflakes-3.1.0.tar.gz", hash = "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"},
+]
+
 [[package]]
 name = "pygments"
 version = "2.16.1"
@@ -587,6 +1107,37 @@ files = [
     {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"},
 ]
 
+[[package]]
+name = "pyproject-hooks"
+version = "1.0.0"
+requires_python = ">=3.7"
+summary = "Wrappers to call pyproject.toml-based build backend hooks."
+dependencies = [
+    "tomli>=1.1.0; python_version < \"3.11\"",
+]
+files = [
+    {file = "pyproject_hooks-1.0.0-py3-none-any.whl", hash = "sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8"},
+    {file = "pyproject_hooks-1.0.0.tar.gz", hash = "sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5"},
+]
+
+[[package]]
+name = "pytest"
+version = "7.4.3"
+requires_python = ">=3.7"
+summary = "pytest: simple powerful testing with Python"
+dependencies = [
+    "colorama; sys_platform == \"win32\"",
+    "exceptiongroup>=1.0.0rc8; python_version < \"3.11\"",
+    "iniconfig",
+    "packaging",
+    "pluggy<2.0,>=0.12",
+    "tomli>=1.0.0; python_version < \"3.11\"",
+]
+files = [
+    {file = "pytest-7.4.3-py3-none-any.whl", hash = "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac"},
+    {file = "pytest-7.4.3.tar.gz", hash = "sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5"},
+]
+
 [[package]]
 name = "python-crontab"
 version = "3.0.0"
@@ -612,6 +1163,16 @@ files = [
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
 
+[[package]]
+name = "python-dotenv"
+version = "1.0.0"
+requires_python = ">=3.8"
+summary = "Read key-value pairs from a .env file and set them as environment variables"
+files = [
+    {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"},
+    {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"},
+]
+
 [[package]]
 name = "python-ldap"
 version = "3.4.3"
@@ -634,6 +1195,20 @@ files = [
     {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"},
 ]
 
+[[package]]
+name = "recommonmark"
+version = "0.7.1"
+summary = "A docutils-compatibility bridge to CommonMark, enabling you to write CommonMark inside of Docutils & Sphinx projects."
+dependencies = [
+    "commonmark>=0.8.1",
+    "docutils>=0.11",
+    "sphinx>=1.3.1",
+]
+files = [
+    {file = "recommonmark-0.7.1-py2.py3-none-any.whl", hash = "sha256:1b1db69af0231efce3fa21b94ff627ea33dee7079a01dd0a7f8482c3da148b3f"},
+    {file = "recommonmark-0.7.1.tar.gz", hash = "sha256:bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67"},
+]
+
 [[package]]
 name = "regex"
 version = "2023.10.3"
@@ -717,6 +1292,62 @@ files = [
     {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
 ]
 
+[[package]]
+name = "requests-toolbelt"
+version = "1.0.0"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "A utility belt for advanced users of python-requests"
+dependencies = [
+    "requests<3.0.0,>=2.0.1",
+]
+files = [
+    {file = "requests-toolbelt-1.0.0.tar.gz", hash = "sha256:7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6"},
+    {file = "requests_toolbelt-1.0.0-py2.py3-none-any.whl", hash = "sha256:cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06"},
+]
+
+[[package]]
+name = "resolvelib"
+version = "1.0.1"
+summary = "Resolve abstract dependencies into concrete ones"
+files = [
+    {file = "resolvelib-1.0.1-py2.py3-none-any.whl", hash = "sha256:d2da45d1a8dfee81bdd591647783e340ef3bcb104b54c383f70d422ef5cc7dbf"},
+    {file = "resolvelib-1.0.1.tar.gz", hash = "sha256:04ce76cbd63fded2078ce224785da6ecd42b9564b1390793f64ddecbe997b309"},
+]
+
+[[package]]
+name = "rich"
+version = "13.6.0"
+requires_python = ">=3.7.0"
+summary = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
+dependencies = [
+    "markdown-it-py>=2.2.0",
+    "pygments<3.0.0,>=2.13.0",
+]
+files = [
+    {file = "rich-13.6.0-py3-none-any.whl", hash = "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245"},
+    {file = "rich-13.6.0.tar.gz", hash = "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef"},
+]
+
+[[package]]
+name = "setuptools"
+version = "68.2.2"
+requires_python = ">=3.8"
+summary = "Easily download, build, install, upgrade, and uninstall Python packages"
+files = [
+    {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
+    {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
+]
+
+[[package]]
+name = "shellingham"
+version = "1.5.4"
+requires_python = ">=3.7"
+summary = "Tool to Detect Surrounding Shell"
+files = [
+    {file = "shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686"},
+    {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"},
+]
+
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -727,6 +1358,15 @@ files = [
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
 
+[[package]]
+name = "snowballstemmer"
+version = "2.2.0"
+summary = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms."
+files = [
+    {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"},
+    {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"},
+]
+
 [[package]]
 name = "sonic-client"
 version = "1.0.0"
@@ -736,6 +1376,138 @@ files = [
     {file = "sonic_client-1.0.0-py3-none-any.whl", hash = "sha256:291bf292861e97a2dd765ff0c8754ea9631383680d31a63ec3da6f5aa5f4beda"},
 ]
 
+[[package]]
+name = "sphinx"
+version = "7.2.6"
+requires_python = ">=3.9"
+summary = "Python documentation generator"
+dependencies = [
+    "Jinja2>=3.0",
+    "Pygments>=2.14",
+    "alabaster<0.8,>=0.7",
+    "babel>=2.9",
+    "colorama>=0.4.5; sys_platform == \"win32\"",
+    "docutils<0.21,>=0.18.1",
+    "imagesize>=1.3",
+    "importlib-metadata>=4.8; python_version < \"3.10\"",
+    "packaging>=21.0",
+    "requests>=2.25.0",
+    "snowballstemmer>=2.0",
+    "sphinxcontrib-applehelp",
+    "sphinxcontrib-devhelp",
+    "sphinxcontrib-htmlhelp>=2.0.0",
+    "sphinxcontrib-jsmath",
+    "sphinxcontrib-qthelp",
+    "sphinxcontrib-serializinghtml>=1.1.9",
+]
+files = [
+    {file = "sphinx-7.2.6-py3-none-any.whl", hash = "sha256:1e09160a40b956dc623c910118fa636da93bd3ca0b9876a7b3df90f07d691560"},
+    {file = "sphinx-7.2.6.tar.gz", hash = "sha256:9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5"},
+]
+
+[[package]]
+name = "sphinx-rtd-theme"
+version = "1.3.0"
+requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
+summary = "Read the Docs theme for Sphinx"
+dependencies = [
+    "docutils<0.19",
+    "sphinx<8,>=1.6",
+    "sphinxcontrib-jquery<5,>=4",
+]
+files = [
+    {file = "sphinx_rtd_theme-1.3.0-py2.py3-none-any.whl", hash = "sha256:46ddef89cc2416a81ecfbeaceab1881948c014b1b6e4450b815311a89fb977b0"},
+    {file = "sphinx_rtd_theme-1.3.0.tar.gz", hash = "sha256:590b030c7abb9cf038ec053b95e5380b5c70d61591eb0b552063fbe7c41f0931"},
+]
+
+[[package]]
+name = "sphinxcontrib-applehelp"
+version = "1.0.7"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-applehelp is a Sphinx extension which outputs Apple help books"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_applehelp-1.0.7-py3-none-any.whl", hash = "sha256:094c4d56209d1734e7d252f6e0b3ccc090bd52ee56807a5d9315b19c122ab15d"},
+    {file = "sphinxcontrib_applehelp-1.0.7.tar.gz", hash = "sha256:39fdc8d762d33b01a7d8f026a3b7d71563ea3b72787d5f00ad8465bd9d6dfbfa"},
+]
+
+[[package]]
+name = "sphinxcontrib-devhelp"
+version = "1.0.5"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp documents"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_devhelp-1.0.5-py3-none-any.whl", hash = "sha256:fe8009aed765188f08fcaadbb3ea0d90ce8ae2d76710b7e29ea7d047177dae2f"},
+    {file = "sphinxcontrib_devhelp-1.0.5.tar.gz", hash = "sha256:63b41e0d38207ca40ebbeabcf4d8e51f76c03e78cd61abe118cf4435c73d4212"},
+]
+
+[[package]]
+name = "sphinxcontrib-htmlhelp"
+version = "2.0.4"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_htmlhelp-2.0.4-py3-none-any.whl", hash = "sha256:8001661c077a73c29beaf4a79968d0726103c5605e27db92b9ebed8bab1359e9"},
+    {file = "sphinxcontrib_htmlhelp-2.0.4.tar.gz", hash = "sha256:6c26a118a05b76000738429b724a0568dbde5b72391a688577da08f11891092a"},
+]
+
+[[package]]
+name = "sphinxcontrib-jquery"
+version = "4.1"
+requires_python = ">=2.7"
+summary = "Extension to include jQuery on newer Sphinx releases"
+dependencies = [
+    "Sphinx>=1.8",
+]
+files = [
+    {file = "sphinxcontrib-jquery-4.1.tar.gz", hash = "sha256:1620739f04e36a2c779f1a131a2dfd49b2fd07351bf1968ced074365933abc7a"},
+    {file = "sphinxcontrib_jquery-4.1-py2.py3-none-any.whl", hash = "sha256:f936030d7d0147dd026a4f2b5a57343d233f1fc7b363f68b3d4f1cb0993878ae"},
+]
+
+[[package]]
+name = "sphinxcontrib-jsmath"
+version = "1.0.1"
+requires_python = ">=3.5"
+summary = "A sphinx extension which renders display math in HTML via JavaScript"
+files = [
+    {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"},
+    {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"},
+]
+
+[[package]]
+name = "sphinxcontrib-qthelp"
+version = "1.0.6"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp documents"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_qthelp-1.0.6-py3-none-any.whl", hash = "sha256:bf76886ee7470b934e363da7a954ea2825650013d367728588732c7350f49ea4"},
+    {file = "sphinxcontrib_qthelp-1.0.6.tar.gz", hash = "sha256:62b9d1a186ab7f5ee3356d906f648cacb7a6bdb94d201ee7adf26db55092982d"},
+]
+
+[[package]]
+name = "sphinxcontrib-serializinghtml"
+version = "1.1.9"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_serializinghtml-1.1.9-py3-none-any.whl", hash = "sha256:9b36e503703ff04f20e9675771df105e58aa029cfcbc23b8ed716019b7416ae1"},
+    {file = "sphinxcontrib_serializinghtml-1.1.9.tar.gz", hash = "sha256:0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54"},
+]
+
 [[package]]
 name = "sqlparse"
 version = "0.4.4"
@@ -760,6 +1532,26 @@ files = [
     {file = "stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9"},
 ]
 
+[[package]]
+name = "tomli"
+version = "2.0.1"
+requires_python = ">=3.7"
+summary = "A lil' TOML parser"
+files = [
+    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+]
+
+[[package]]
+name = "tomlkit"
+version = "0.12.2"
+requires_python = ">=3.7"
+summary = "Style preserving TOML library"
+files = [
+    {file = "tomlkit-0.12.2-py3-none-any.whl", hash = "sha256:eeea7ac7563faeab0a1ed8fe12c2e5a51c61f933f2502f7e9db0241a65163ad0"},
+    {file = "tomlkit-0.12.2.tar.gz", hash = "sha256:df32fab589a81f0d7dc525a4267b6d7a64ee99619cbd1eeb0fae32c1dd426977"},
+]
+
 [[package]]
 name = "traitlets"
 version = "5.13.0"
@@ -770,6 +1562,34 @@ files = [
     {file = "traitlets-5.13.0.tar.gz", hash = "sha256:9b232b9430c8f57288c1024b34a8f0251ddcc47268927367a0dd3eeaca40deb5"},
 ]
 
+[[package]]
+name = "truststore"
+version = "0.8.0"
+requires_python = ">= 3.10"
+summary = "Verify certificates using native system trust stores"
+files = [
+    {file = "truststore-0.8.0-py3-none-any.whl", hash = "sha256:e37a5642ae9fc48caa8f120b6283d77225d600d224965a672c9e8ef49ce4bb4c"},
+    {file = "truststore-0.8.0.tar.gz", hash = "sha256:dc70da89634944a579bfeec70a7a4523c53ffdb3cf52d1bb4a431fda278ddb96"},
+]
+
+[[package]]
+name = "types-pytz"
+version = "2023.3.1.1"
+summary = "Typing stubs for pytz"
+files = [
+    {file = "types-pytz-2023.3.1.1.tar.gz", hash = "sha256:cc23d0192cd49c8f6bba44ee0c81e4586a8f30204970fc0894d209a6b08dab9a"},
+    {file = "types_pytz-2023.3.1.1-py3-none-any.whl", hash = "sha256:1999a123a3dc0e39a2ef6d19f3f8584211de9e6a77fe7a0259f04a524e90a5cf"},
+]
+
+[[package]]
+name = "types-pyyaml"
+version = "6.0.12.12"
+summary = "Typing stubs for PyYAML"
+files = [
+    {file = "types-PyYAML-6.0.12.12.tar.gz", hash = "sha256:334373d392fde0fdf95af5c3f1661885fa10c52167b14593eb856289e1855062"},
+    {file = "types_PyYAML-6.0.12.12-py3-none-any.whl", hash = "sha256:c05bc6c158facb0676674b7f11fe3960db4f389718e19e62bd2b84d6205cfd24"},
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.8.0"
@@ -803,6 +1623,20 @@ files = [
     {file = "tzlocal-5.2.tar.gz", hash = "sha256:8d399205578f1a9342816409cc1e46a93ebd5755e39ea2d85334bea911bf0e6e"},
 ]
 
+[[package]]
+name = "unearth"
+version = "0.12.1"
+requires_python = ">=3.7"
+summary = "A utility to fetch and download python packages"
+dependencies = [
+    "packaging>=20",
+    "requests>=2.25",
+]
+files = [
+    {file = "unearth-0.12.1-py3-none-any.whl", hash = "sha256:a5a5c51ca44965cbe3618116bd592bb0bbe3705af5fe14e5792660d904aad7c8"},
+    {file = "unearth-0.12.1.tar.gz", hash = "sha256:4caad941b60f51e50fdc109866234d407910aef77f1233aa1b6b5d168c7427ee"},
+]
+
 [[package]]
 name = "urllib3"
 version = "2.1.0"
@@ -813,6 +1647,21 @@ files = [
     {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"},
 ]
 
+[[package]]
+name = "virtualenv"
+version = "20.24.6"
+requires_python = ">=3.7"
+summary = "Virtual Python Environment builder"
+dependencies = [
+    "distlib<1,>=0.3.7",
+    "filelock<4,>=3.12.2",
+    "platformdirs<4,>=3.9.1",
+]
+files = [
+    {file = "virtualenv-20.24.6-py3-none-any.whl", hash = "sha256:520d056652454c5098a00c0f073611ccbea4c79089331f60bf9d7ba247bb7381"},
+    {file = "virtualenv-20.24.6.tar.gz", hash = "sha256:02ece4f56fbf939dbbc33c0715159951d6bf14aaf5457b092e4548e1382455af"},
+]
+
 [[package]]
 name = "w3lib"
 version = "2.1.2"
@@ -901,6 +1750,16 @@ files = [
     {file = "websockets-12.0.tar.gz", hash = "sha256:81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b"},
 ]
 
+[[package]]
+name = "wheel"
+version = "0.41.3"
+requires_python = ">=3.7"
+summary = "A built-package format for Python"
+files = [
+    {file = "wheel-0.41.3-py3-none-any.whl", hash = "sha256:488609bc63a29322326e05560731bf7bfea8e48ad646e1f5e40d366607de0942"},
+    {file = "wheel-0.41.3.tar.gz", hash = "sha256:4d4987ce51a49370ea65c0bfd2234e8ce80a12780820d9dc462597a6e60d0841"},
+]
+
 [[package]]
 name = "yt-dlp"
 version = "2023.10.13"
@@ -918,3 +1777,13 @@ files = [
     {file = "yt-dlp-2023.10.13.tar.gz", hash = "sha256:e026ea1c435ff36eef1215bc4c5bb8c479938b90054997ba99f63a4541fe63b4"},
     {file = "yt_dlp-2023.10.13-py2.py3-none-any.whl", hash = "sha256:2b069f22675532eebacdfd6372b1825651a751fef848de9ae6efe6491b2dc38a"},
 ]
+
+[[package]]
+name = "zipp"
+version = "3.17.0"
+requires_python = ">=3.8"
+summary = "Backport of pathlib-compatible object wrapper for zip files"
+files = [
+    {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"},
+    {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"},
+]

From 1e4457690e0aa409193a8be96183d66373a99293 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 23:51:42 -0800
Subject: [PATCH 013/126] bump docs build

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index bfc5f76a..7a6f3bc8 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit bfc5f76a61faee5c0c04bae03fe2b88cff1c39c5
+Subproject commit 7a6f3bc86e67d6441360108ebe7a0744fa50671c

From ca8e3a5403926008dbc95e6136873897e11504ea Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 23:56:12 -0800
Subject: [PATCH 014/126] add .readthedocs.yaml config


From 79a69ca031533c8a9cfa6cf6fc9b40561bac1cdc Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 23:56:12 -0800
Subject: [PATCH 015/126] add .readthedocs.yaml config

---
 .readthedocs.yaml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .readthedocs.yaml

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 00000000..90f67af5
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,29 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+    nodejs: "22"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+
+Optionally build your docs in additional formats such as PDF and ePub
+formats:
+  - pdf
+  - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+    - requirements: requirements.txt
\ No newline at end of file

From 93d284a67b54636f961c7c1b7eeae622ed54d9e8 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 23:58:12 -0800
Subject: [PATCH 016/126] fix yaml typo

---
 .readthedocs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 90f67af5..99a8b5c5 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -16,7 +16,7 @@ sphinx:
   # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
   # builder: "dirhtml"
 
-Optionally build your docs in additional formats such as PDF and ePub
+# Optionally build your docs in additional formats such as PDF and ePub
 formats:
   - pdf
   - epub

From 282e033b3c51ebd80d58eb8f4e15bebc4ba6b8a0 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 13 Nov 2023 23:58:34 -0800
Subject: [PATCH 017/126] fix nodejs sphinx requirement

---
 .readthedocs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 99a8b5c5..bba4bdf2 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -8,7 +8,7 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.12"
-    nodejs: "22"
+    nodejs: "20"
 
 # Build documentation in the "docs/" directory with Sphinx
 sphinx:

From 65bf98bcd256a2ed1c4e8cc9cc36951219e48c71 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 00:01:44 -0800
Subject: [PATCH 018/126] remove python-ldap from requirements.txt

---
 requirements.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 6ec3d070..770ac3e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,6 @@ croniter==2.0.1
 dateparser==1.1.8
 decorator==5.1.1
 django==3.1.14
-django-auth-ldap==4.1.0
 django-extensions==3.1.5
 executing==2.0.1
 idna==3.4
@@ -31,7 +30,6 @@ pycryptodomex==3.19.0
 pygments==2.16.1
 python-crontab==3.0.0
 python-dateutil==2.8.2
-python-ldap==3.4.3
 pytz==2023.3.post1
 regex==2023.10.3
 requests==2.31.0

From 8b93641c4bcdabf5854225213d7ed3cec0f2b874 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 00:05:08 -0800
Subject: [PATCH 019/126] clone submodules

---
 .readthedocs.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index bba4bdf2..be8350af 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -3,6 +3,10 @@
 
 version: 2
 
+submodules:
+  include: all
+  recursive: true
+
 # Set the OS, Python version and other tools you might need
 build:
   os: ubuntu-22.04

From 7665c803da775f98e0f389190882a879a24731a8 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 00:10:10 -0800
Subject: [PATCH 020/126] add requirements.txt to docs subfolder

---
 .readthedocs.yaml | 2 +-
 docs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index be8350af..eb093893 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -30,4 +30,4 @@ formats:
 # See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
 python:
   install:
-    - requirements: requirements.txt
\ No newline at end of file
+    - requirements: docs/requirements.txt
\ No newline at end of file
diff --git a/docs b/docs
index 7a6f3bc8..f6afdb28 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 7a6f3bc86e67d6441360108ebe7a0744fa50671c
+Subproject commit f6afdb2886b6467b901c82b4a8449b2ac94e2fb5

From 8bb448c6147687db5352e8176954fbc2f832b3b1 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 00:11:45 -0800
Subject: [PATCH 021/126] install both sets of requirements

---
 .readthedocs.yaml | 1 +
 docs              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index eb093893..7224eee9 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -30,4 +30,5 @@ formats:
 # See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
 python:
   install:
+    - requirements: requirements.txt
     - requirements: docs/requirements.txt
\ No newline at end of file
diff --git a/docs b/docs
index f6afdb28..98e83eea 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit f6afdb2886b6467b901c82b4a8449b2ac94e2fb5
+Subproject commit 98e83eeabb5fc1a57de278bb165c3236f2938e67

From d3d05f5f64f4112ac4386e3288e3b9cb472109da Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 00:21:09 -0800
Subject: [PATCH 022/126] add fallback version detection mode

---
 archivebox/config.py | 10 +++++++++-
 archivebox/main.py   |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 99a1847c..9a5e0d35 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -377,7 +377,15 @@ ALLOWED_IN_OUTPUT_DIR = {
 }
 
 def get_version(config):
-    return importlib.metadata.version(__package__ or 'archivebox')
+    try:
+        return importlib.metadata.version(__package__ or 'archivebox')
+    except importlib.metadata.PackageNotFoundError:
+        pyproject_config = (config['PACKAGE_DIR'] / 'pyproject.toml').read_text()
+        for line in pyproject_config:
+            if line.startswith('version = '):
+                return line.split(' = ', 1)[-1].strip('"')
+
+    raise Exception('Failed to detect installed archivebox version!')
 
 def get_commit_hash(config):
     try:
diff --git a/archivebox/main.py b/archivebox/main.py
index 5ce1e288..b0e45bac 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -217,8 +217,8 @@ def version(quiet: bool=False,
     print(VERSION)
     
     if not quiet:
-        # 0.6.3
-        # ArchiveBox v0.6.3 Cpython Linux Linux-4.19.121-linuxkit-x86_64-with-glibc2.28 x86_64 (in Docker) (in TTY)
+        # 0.7.1
+        # ArchiveBox v0.7.1 Cpython Linux Linux-4.19.121-linuxkit-x86_64-with-glibc2.28 x86_64 (in Docker) (in TTY)
         # DEBUG=False IN_DOCKER=True IN_QEMU=False IS_TTY=True TZ=UTC FS_ATOMIC=True FS_REMOTE=False FS_PERMS=644 FS_USER=501:20 SEARCH_BACKEND=ripgrep
         
         p = platform.uname()

From 6188dcdcbd6c7cccd17a8cfb1599b4b03e928be8 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 00:38:37 -0800
Subject: [PATCH 023/126] return placeholder version during docs build

---
 archivebox/config.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 9a5e0d35..775be8e4 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -380,10 +380,14 @@ def get_version(config):
     try:
         return importlib.metadata.version(__package__ or 'archivebox')
     except importlib.metadata.PackageNotFoundError:
-        pyproject_config = (config['PACKAGE_DIR'] / 'pyproject.toml').read_text()
-        for line in pyproject_config:
-            if line.startswith('version = '):
-                return line.split(' = ', 1)[-1].strip('"')
+        try:
+            pyproject_config = (config['PACKAGE_DIR'] / 'pyproject.toml').read_text()
+            for line in pyproject_config:
+                if line.startswith('version = '):
+                    return line.split(' = ', 1)[-1].strip('"')
+        except FileNotFoundError:
+            # building docs, pyproject.toml is not available
+            return 'dev'
 
     raise Exception('Failed to detect installed archivebox version!')
 

From 3f8ff7913a5d19315332327bd55a4ede7dbf580b Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 00:45:53 -0800
Subject: [PATCH 024/126] override theme css

---
 docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs b/docs
index 98e83eea..a1b69c51 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 98e83eeabb5fc1a57de278bb165c3236f2938e67
+Subproject commit a1b69c51ba9b249c0b2a6efd141dbb792fc36ad2

From f6ea21eabf25ed3dc42ed51419b114dddda6d95a Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 00:52:29 -0800
Subject: [PATCH 025/126] bump version in package.json

---
 archivebox/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/package.json b/archivebox/package.json
index f3d5b736..9f903598 100644
--- a/archivebox/package.json
+++ b/archivebox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "archivebox",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "ArchiveBox: The self-hosted internet archive",
   "author": "Nick Sweeting <archivebox-npm@sweeting.me>",
   "repository": "github:ArchiveBox/ArchiveBox",

From 0b950b3253b5ccef6f324aede8e9e1f2e6723822 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 28 Mar 2023 02:58:49 -0600
Subject: [PATCH 026/126] make get_commit_hash more precisce by using exact ref

---
 archivebox/config.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 775be8e4..4e434c12 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -393,7 +393,10 @@ def get_version(config):
 
 def get_commit_hash(config):
     try:
-        return list((config['PACKAGE_DIR'] / '../.git/refs/heads/').glob('*'))[0].read_text().strip()
+        git_dir = config['PACKAGE_DIR'] / '../')
+        ref = (git_dir / 'HEAD').read_text().strip().split(' ')[-1]
+        commit_hash = git_dir.joinpath(ref).read_text().strip()
+        return commit_hash
     except Exception:
         return None
 

From f0033f75d07d856d9b3c60ea679f3b6241806ba5 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 May 2023 01:43:34 -0700
Subject: [PATCH 027/126] config.py lint fixes

---
 archivebox/config.py              | 6 +++---
 archivebox/extractors/__init__.py | 2 +-
 bin/build_docker.sh               | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 4e434c12..a047ff20 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -53,6 +53,7 @@ from .config_stubs import (
 
 ### Pre-Fetch Minimal System Config
 
+TIMEZONE = 'UTC'
 SYSTEM_USER = getpass.getuser() or os.getlogin()
 
 try:
@@ -81,7 +82,6 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = {
         'IN_QEMU':                  {'type': bool,  'default': False},
         'PUID':                     {'type': int,   'default': os.getuid()},
         'PGID':                     {'type': int,   'default': os.getgid()},
-        # TODO: 'SHOW_HINTS':       {'type:  bool,  'default': True},
     },
 
     'GENERAL_CONFIG': {
@@ -393,7 +393,7 @@ def get_version(config):
 
 def get_commit_hash(config):
     try:
-        git_dir = config['PACKAGE_DIR'] / '../')
+        git_dir = config['PACKAGE_DIR'] / '../'
         ref = (git_dir / 'HEAD').read_text().strip().split(' ')[-1]
         commit_hash = git_dir.joinpath(ref).read_text().strip()
         return commit_hash
@@ -1195,7 +1195,7 @@ def check_dependencies(config: ConfigDict=CONFIG, show_help: bool=True) -> None:
 
     if config['USE_YOUTUBEDL'] and config['MEDIA_TIMEOUT'] < 20:
         stderr(f'[!] Warning: MEDIA_TIMEOUT is set too low! (currently set to MEDIA_TIMEOUT={config["MEDIA_TIMEOUT"]} seconds)', color='red')
-        stderr('    Youtube-dl will fail to archive all media if set to less than ~20 seconds.')
+        stderr('    youtube-dl/yt-dlp will fail to archive any media if set to less than ~20 seconds.')
         stderr('    (Setting it somewhere over 60 seconds is recommended)')
         stderr()
         stderr('    If you want to disable media archiving entirely, set SAVE_MEDIA=False instead:')
diff --git a/archivebox/extractors/__init__.py b/archivebox/extractors/__init__.py
index edcf218b..2515b8fd 100644
--- a/archivebox/extractors/__init__.py
+++ b/archivebox/extractors/__init__.py
@@ -184,7 +184,7 @@ def archive_link(link: Link, overwrite: bool=False, methods: Optional[Iterable[s
                         link.url,
                         command,
                         ts
-                    ) + "\n"))
+                    ) + "\n" + str(e) + "\n"))
                     #f.write(f"\n> {command}; ts={ts} version={config['VERSION']} docker={config['IN_DOCKER']} is_tty={config['IS_TTY']}\n")
 
         # print('    ', stats)
diff --git a/bin/build_docker.sh b/bin/build_docker.sh
index c88ed54c..e427c0a6 100755
--- a/bin/build_docker.sh
+++ b/bin/build_docker.sh
@@ -74,6 +74,7 @@ echo "[+] Generating requirements.txt and pdm.lock from pyproject.toml..."
 pdm lock --group=':all' --strategy="cross_platform" --production
 pdm export --group=':all' --production --without-hashes -o requirements.txt
 
+
 echo "[+] Building archivebox:$VERSION docker image..."
 # docker builder prune
 # docker build . --no-cache -t archivebox-dev \

From 2b421c56bba9bebb85364578537fcd40d7ddf8b9 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 May 2023 01:43:47 -0700
Subject: [PATCH 028/126] require builx for for docker builds

---
 bin/build_docker.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/build_docker.sh b/bin/build_docker.sh
index e427c0a6..2de9f676 100755
--- a/bin/build_docker.sh
+++ b/bin/build_docker.sh
@@ -50,6 +50,7 @@ function create_builder() {
     docker buildx use xbuilder && return 0
     echo "[+] Creating new xbuilder for: $SELECTED_PLATFORMS"
     echo
+    docker pull 'moby/buildkit:buildx-stable-1'
 
     # Switch to buildx builder if already present / previously created
     docker buildx create --name xbuilder --driver docker-container --bootstrap --use --platform "$SELECTED_PLATFORMS" || true

From 6761ed368c75337d21f89c282bcbf982b081ad41 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 02:04:49 -0800
Subject: [PATCH 029/126] wip pre-0.7.1 side fixes

---
 .vscode/settings.json                         |    3 +
 archivebox/config.py                          |    1 +
 archivebox/core/admin.py                      |   19 +-
 archivebox/core/apps.py                       |    2 +-
 archivebox/core/settings.py                   |    1 +
 archivebox/logging_util.py                    |    6 +-
 archivebox/static                             |    1 +
 archivebox/templates/admin/private_index.html |    1 +
 docker-compose.yml                            |    3 +-
 etc/crontabs/archivebox                       |    8 +
 package-lock.json                             | 1740 +++++++++++++++++
 screenshot.png                                |  Bin 0 -> 42845 bytes
 12 files changed, 1772 insertions(+), 13 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 120000 archivebox/static
 create mode 100644 etc/crontabs/archivebox
 create mode 100644 screenshot.png

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..163c9840
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.formatting.provider": "black"
+}
diff --git a/archivebox/config.py b/archivebox/config.py
index a047ff20..2895f207 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -786,6 +786,7 @@ def find_chrome_binary() -> Optional[str]:
     # Precedence: Chromium, Chrome, Beta, Canary, Unstable, Dev
     # make sure data dir finding precedence order always matches binary finding order
     default_executable_paths = (
+        # '~/Library/Caches/ms-playwright/chromium-*/chrome-mac/Chromium.app/Contents/MacOS/Chromium',
         'chromium-browser',
         'chromium',
         '/Applications/Chromium.app/Contents/MacOS/Chromium',
diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py
index 0329d9b0..ce4612a7 100644
--- a/archivebox/core/admin.py
+++ b/archivebox/core/admin.py
@@ -48,22 +48,23 @@ class TagInline(admin.TabularInline):
 from django.contrib.admin.helpers import ActionForm
 from django.contrib.admin.widgets import AutocompleteSelectMultiple
 
-class AutocompleteTags:
-    model = Tag
-    search_fields = ['name']
+# class AutocompleteTags:
+#     model = Tag
+#     search_fields = ['name']
+#     name = 'tags'
 
-class AutocompleteTagsAdminStub:
-    name = 'admin'
+# class AutocompleteTagsAdminStub:
+#     name = 'admin'
 
 
 class SnapshotActionForm(ActionForm):
     tags = forms.ModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         required=False,
-        widget=AutocompleteSelectMultiple(
-            AutocompleteTags(),
-            AutocompleteTagsAdminStub(),
-        ),
+        # widget=AutocompleteSelectMultiple(
+        #     # AutocompleteTags(),
+        #     # AutocompleteTagsAdminStub(),
+        # ),
     )
 
     # TODO: allow selecting actions for specific extractors? is this useful?
diff --git a/archivebox/core/apps.py b/archivebox/core/apps.py
index 5182da05..21b95877 100644
--- a/archivebox/core/apps.py
+++ b/archivebox/core/apps.py
@@ -3,4 +3,4 @@ from django.apps import AppConfig
 
 class CoreConfig(AppConfig):
     name = 'core'
-    default_auto_field = 'django.db.models.UUIDField'
+    # default_auto_field = 'django.db.models.UUIDField'
diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py
index 11fd649d..8334c39b 100644
--- a/archivebox/core/settings.py
+++ b/archivebox/core/settings.py
@@ -268,6 +268,7 @@ AUTH_PASSWORD_VALIDATORS = [
     {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
 ]
 
+# DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
 
 ################################################################################
 ### Shell Settings
diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py
index d43bb086..af98c3fb 100644
--- a/archivebox/logging_util.py
+++ b/archivebox/logging_util.py
@@ -393,7 +393,11 @@ def log_link_archiving_finished(link: "Link", link_dir: str, is_new: bool, stats
     else:
         _LAST_RUN_STATS.succeeded += 1
 
-    size = get_dir_size(link_dir)
+    try:
+        size = get_dir_size(link_dir)
+    except FileNotFoundError:
+        size = (0, None, '0')
+
     end_ts = datetime.now(timezone.utc)
     duration = str(end_ts - start_ts).split('.')[0]
     print('        {black}{} files ({}) in {}s {reset}'.format(size[2], printable_filesize(size[0]), duration, **ANSI))
diff --git a/archivebox/static b/archivebox/static
new file mode 120000
index 00000000..5d01044d
--- /dev/null
+++ b/archivebox/static
@@ -0,0 +1 @@
+templates/static
\ No newline at end of file
diff --git a/archivebox/templates/admin/private_index.html b/archivebox/templates/admin/private_index.html
index b60f3a3e..a95a7716 100644
--- a/archivebox/templates/admin/private_index.html
+++ b/archivebox/templates/admin/private_index.html
@@ -88,4 +88,5 @@
       {% endblock %}
     </div>
   </div>
+  <script>alert(1)</script>
 {% endblock %}
diff --git a/docker-compose.yml b/docker-compose.yml
index e4ea2b5d..6eff7736 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,6 @@ services:
             # - ./etc/crontabs:/var/spool/cron/crontabs  # uncomment this and archivebox_scheduler below to set up automatic recurring archive jobs
             # - ./archivebox:/app/archivebox             # uncomment this to mount the ArchiveBox source code at runtime (for developers working on archivebox)
         # build: .                                       # uncomment this to build the image from source code at buildtime (for developers working on archivebox)
-        
         environment:
             - ALLOWED_HOSTS=*                   # restrict this to only accept incoming traffic via specific domain name
             # - PUBLIC_INDEX=True               # set to False to prevent anonymous users from viewing snapshot list
@@ -161,4 +160,4 @@ networks:
         ipam:
             driver: default
             config:
-                - subnet: 172.20.0.0/24
\ No newline at end of file
+                - subnet: 172.20.0.0/24
diff --git a/etc/crontabs/archivebox b/etc/crontabs/archivebox
new file mode 100644
index 00000000..fbb0acd3
--- /dev/null
+++ b/etc/crontabs/archivebox
@@ -0,0 +1,8 @@
+# DO NOT EDIT THIS FILE - edit the master and reinstall.
+# (/tmp/tmpe3dawo9u installed on Tue Jun 13 23:21:48 2023)
+# (Cron version -- $Id: crontab.c,v 2.13 1994/01/17 03:20:37 vixie Exp $)
+
+@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com/3" >> /data/logs/schedule.log 2>&1 # archivebox_schedule
+@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com/2" >> /data/logs/schedule.log 2>&1 # archivebox_schedule
+@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com" >> /data/logs/schedule.log 2>&1 # archivebox_schedule
+@daily cd /data && /usr/local/bin/archivebox add --depth=0 "update" >> /data/logs/schedule.log 2>&1 # archivebox_schedule
diff --git a/package-lock.json b/package-lock.json
index 158d57dd..bf024723 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,16 @@
 {
   "name": "archivebox",
+<<<<<<< HEAD
   "version": "0.7.1",
+=======
+  "version": "0.7.0",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "archivebox",
+<<<<<<< HEAD
       "version": "0.7.1",
       "license": "MIT",
       "dependencies": {
@@ -34,6 +39,36 @@
         "node": ">=14.0.0"
       }
     },
+=======
+      "version": "0.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@postlight/mercury-parser": "git+https://github.com/postlight/mercury-parser.git",
+        "readability-extractor": "git+https://github.com/ArchiveBox/readability-extractor.git",
+        "single-file": "git+https://github.com/gildas-lormeau/SingleFile.git"
+      }
+    },
+    "node_modules/@babel/runtime-corejs2": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.20.7.tgz",
+      "integrity": "sha512-SrtIxfjwLkUFljufH1GeqYlIYzdyxP2IoCb3tVjcrTdMyB7RQyRCdkyMzvw3k/h+CStnSf2SvvQicS1Rf/fuGQ==",
+      "dependencies": {
+        "core-js": "^2.6.12",
+        "regenerator-runtime": "^0.13.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@mozilla/readability": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.2.tgz",
+      "integrity": "sha512-48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/@postlight/ci-failed-test-reporter": {
       "version": "1.0.26",
       "resolved": "https://registry.npmjs.org/@postlight/ci-failed-test-reporter/-/ci-failed-test-reporter-1.0.26.tgz",
@@ -46,15 +81,26 @@
         "ciftr": "cli.js"
       }
     },
+<<<<<<< HEAD
     "node_modules/@postlight/parser": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@postlight/parser/-/parser-2.2.3.tgz",
       "integrity": "sha512-4/syRvqJARgLN4yH8qtl634WO0+KINjkijU/SmhCJqqh8/aOfv5uQf+SquFpA+JwsAsbGzYQkIxSum29riOreg==",
+=======
+    "node_modules/@postlight/mercury-parser": {
+      "version": "2.2.1",
+      "resolved": "git+ssh://git@github.com/postlight/mercury-parser.git#9cd9662bcbfea00b773fad691a4f6e53394ff543",
+      "integrity": "sha512-nTyjg98Zpe2anZVjl16QzC3b9nThISzhzw59aoRMCW7gqjDb8VFU1bXrFlt9dEkxxey1ysuJ109hdCJI17TVVg==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "bundleDependencies": [
         "jquery",
         "moment-timezone",
         "browser-request"
       ],
+<<<<<<< HEAD
+=======
+      "license": "MIT",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "@babel/runtime-corejs2": "^7.2.0",
         "@postlight/ci-failed-test-reporter": "^1.0",
@@ -75,13 +121,18 @@
         "yargs-parser": "^15.0.1"
       },
       "bin": {
+<<<<<<< HEAD
         "mercury-parser": "cli.js",
         "postlight-parser": "cli.js"
+=======
+        "mercury-parser": "cli.js"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "engines": {
         "node": ">=10"
       }
     },
+<<<<<<< HEAD
     "node_modules/@postlight/parser/node_modules/browser-request": {
       "version": "0.3.2",
       "engines": [
@@ -107,14 +158,28 @@
     },
     "node_modules/@postlight/parser/node_modules/moment": {
       "version": "2.29.4",
+=======
+    "node_modules/@postlight/mercury-parser/node_modules/jquery": {
+      "version": "3.4.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/@postlight/mercury-parser/node_modules/moment": {
+      "version": "2.23.0",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "inBundle": true,
       "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
+<<<<<<< HEAD
     "node_modules/@postlight/parser/node_modules/moment-timezone": {
       "version": "0.5.37",
+=======
+    "node_modules/@postlight/mercury-parser/node_modules/moment-timezone": {
+      "version": "0.5.26",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -124,11 +189,14 @@
         "node": "*"
       }
     },
+<<<<<<< HEAD
     "node_modules/@postlight/parser/node_modules/next-line": {
       "version": "1.1.0",
       "inBundle": true,
       "license": "MIT"
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/@postman/form-data": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.1.tgz",
@@ -142,6 +210,7 @@
         "node": ">= 6"
       }
     },
+<<<<<<< HEAD
     "node_modules/@postman/tough-cookie": {
       "version": "4.1.3-postman.1",
       "resolved": "https://registry.npmjs.org/@postman/tough-cookie/-/tough-cookie-4.1.3-postman.1.tgz",
@@ -156,6 +225,8 @@
         "node": ">=6"
       }
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/@postman/tunnel-agent": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/@postman/tunnel-agent/-/tunnel-agent-0.6.3.tgz",
@@ -167,6 +238,7 @@
         "node": "*"
       }
     },
+<<<<<<< HEAD
     "node_modules/@puppeteer/browsers": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.7.1.tgz",
@@ -240,6 +312,28 @@
       "integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==",
       "optional": true,
       "dependencies": {
+=======
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "18.11.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz",
+      "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==",
+      "optional": true
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "optional": true,
+      "dependencies": {
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
         "@types/node": "*"
       }
     },
@@ -249,14 +343,21 @@
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
     "node_modules/acorn": {
+<<<<<<< HEAD
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
       "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+=======
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "bin": {
         "acorn": "bin/acorn"
       },
       "engines": {
         "node": ">=0.4.0"
+<<<<<<< HEAD
       }
     },
     "node_modules/acorn-globals": {
@@ -276,6 +377,38 @@
         "node": ">=0.4.0"
       }
     },
+=======
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+      "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+      "dependencies": {
+        "acorn": "^6.0.1",
+        "acorn-walk": "^6.0.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -324,6 +457,14 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA=="
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -340,6 +481,7 @@
         "node": ">=0.8"
       }
     },
+<<<<<<< HEAD
     "node_modules/ast-types": {
       "version": "0.13.4",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
@@ -350,6 +492,12 @@
       "engines": {
         "node": ">=4"
       }
+=======
+    "node_modules/async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -369,11 +517,14 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
     },
+<<<<<<< HEAD
     "node_modules/b4a": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
       "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -398,6 +549,7 @@
         }
       ]
     },
+<<<<<<< HEAD
     "node_modules/basic-ftp": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz",
@@ -406,6 +558,8 @@
         "node": ">=10.0.0"
       }
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -414,6 +568,19 @@
         "tweetnacl": "^0.14.3"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/bluebird": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
@@ -441,6 +608,25 @@
         "base64-js": "^1.1.2"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+    },
+    "node_modules/browser-request": {
+      "version": "0.3.2",
+      "resolved": "git+ssh://git@github.com/postlight/browser-request.git#38faa5b85741aabfca61aa37d1ef044d68969ddf",
+      "integrity": "sha512-TOvTWJ0BrWcB8Ach1AvdSBuczm2fsJdBlmo8D4N8fei7xfboW9VEk67zfriCiBo3/19Xe1waSstCEcLFUeBCjA==",
+      "engines": [
+        "node"
+      ],
+      "dependencies": {
+        "http-headers": "^3.0.1"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -511,6 +697,7 @@
         "node": ">= 0.6"
       }
     },
+<<<<<<< HEAD
     "node_modules/chromium-bidi": {
       "version": "0.4.26",
       "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.26.tgz",
@@ -526,6 +713,17 @@
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+=======
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -579,6 +777,7 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
+<<<<<<< HEAD
     "node_modules/cross-fetch": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
@@ -587,6 +786,8 @@
         "node-fetch": "^2.6.12"
       }
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
@@ -604,6 +805,7 @@
       "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
       "engines": {
         "node": "*"
+<<<<<<< HEAD
       }
     },
     "node_modules/cssstyle": {
@@ -617,6 +819,23 @@
         "node": ">=14"
       }
     },
+=======
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "node_modules/cssstyle": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+      "dependencies": {
+        "cssom": "0.3.x"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -626,6 +845,7 @@
       },
       "engines": {
         "node": ">=0.10"
+<<<<<<< HEAD
       }
     },
     "node_modules/data-uri-to-buffer": {
@@ -670,6 +890,41 @@
       },
       "engines": {
         "node": ">=14"
+=======
+      }
+    },
+    "node_modules/data-urls": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+      "dependencies": {
+        "abab": "^2.0.0",
+        "whatwg-mimetype": "^2.2.0",
+        "whatwg-url": "^7.0.0"
+      }
+    },
+    "node_modules/data-urls/node_modules/tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/data-urls/node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
+      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+      "dependencies": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/debug": {
@@ -701,6 +956,7 @@
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
+<<<<<<< HEAD
     "node_modules/degenerator": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
@@ -713,6 +969,12 @@
       "engines": {
         "node": ">= 14"
       }
+=======
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
@@ -723,13 +985,23 @@
       }
     },
     "node_modules/devtools-protocol": {
+<<<<<<< HEAD
       "version": "0.0.1159816",
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1159816.tgz",
       "integrity": "sha512-2cZlHxC5IlgkIWe2pSDmCrDiTzbSJWywjbDDnupOImEBcG31CQgBLV8wWE+5t+C4rimcjHsbzy7CBzf9oFjboA=="
+=======
+      "version": "0.0.818844",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
+      "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg=="
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/difflib": {
       "version": "0.2.6",
       "resolved": "git+ssh://git@github.com/postlight/difflib.js.git#32e8e38c7fcd935241b9baab71bb432fd9b166ed",
+<<<<<<< HEAD
+=======
+      "integrity": "sha512-uFNs7czGYLWdMP22WQhD/vlFen/CuKzC+KiajNCj+ik2Ah/I9i2AFyMWkBjFgbVFGhv95kBHOtx7tgF6IVngqA==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "heap": ">= 0.2.0"
       }
@@ -749,6 +1021,7 @@
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
     },
     "node_modules/domexception": {
+<<<<<<< HEAD
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
       "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
@@ -759,6 +1032,20 @@
         "node": ">=12"
       }
     },
+=======
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "dependencies": {
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
@@ -767,6 +1054,7 @@
         "domelementtype": "1"
       }
     },
+<<<<<<< HEAD
     "node_modules/domino": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz",
@@ -777,6 +1065,13 @@
       "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz",
       "integrity": "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ=="
     },
+=======
+    "node_modules/dompurify": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz",
+      "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ=="
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/domutils": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
@@ -835,6 +1130,7 @@
       }
     },
     "node_modules/escodegen": {
+<<<<<<< HEAD
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
       "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
@@ -842,13 +1138,27 @@
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
         "esutils": "^2.0.2"
+=======
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "bin": {
         "escodegen": "bin/escodegen.js",
         "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
+<<<<<<< HEAD
         "node": ">=6.0"
+=======
+        "node": ">=4.0"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "optionalDependencies": {
         "source-map": "~0.6.1"
@@ -867,9 +1177,15 @@
       }
     },
     "node_modules/estraverse": {
+<<<<<<< HEAD
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+=======
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "engines": {
         "node": ">=4.0"
       }
@@ -919,16 +1235,27 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
+<<<<<<< HEAD
     "node_modules/fast-fifo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
       "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
+<<<<<<< HEAD
+=======
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -943,6 +1270,21 @@
       "integrity": "sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA==",
       "engines": {
         "node": ">=8"
+<<<<<<< HEAD
+=======
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/forever-agent": {
@@ -951,6 +1293,7 @@
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "engines": {
         "node": "*"
+<<<<<<< HEAD
       }
     },
     "node_modules/form-data": {
@@ -987,6 +1330,28 @@
         "node": ">= 4.0.0"
       }
     },
+=======
+      }
+    },
+    "node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -1014,6 +1379,7 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+<<<<<<< HEAD
     "node_modules/get-uri": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz",
@@ -1028,6 +1394,8 @@
         "node": ">= 14"
       }
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -1055,11 +1423,14 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+<<<<<<< HEAD
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -1087,6 +1458,7 @@
       "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="
     },
     "node_modules/html-encoding-sniffer": {
+<<<<<<< HEAD
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
@@ -1095,6 +1467,13 @@
       },
       "engines": {
         "node": ">=12"
+=======
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "dependencies": {
+        "whatwg-encoding": "^1.0.1"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/htmlparser2": {
@@ -1110,12 +1489,29 @@
         "readable-stream": "^3.1.1"
       }
     },
+<<<<<<< HEAD
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dependencies": {
         "@tootallnate/once": "2",
+=======
+    "node_modules/http-headers": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/http-headers/-/http-headers-3.0.2.tgz",
+      "integrity": "sha512-87E1I+2Wg4dxxz4rcxElo3dxO/w1ZtgL1yA0Sb6vH3qU16vRKq1NjWQv9SCY3ly2OQROcoxHZOUpmelS+k6wOw==",
+      "dependencies": {
+        "next-line": "^1.1.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dependencies": {
+        "@tootallnate/once": "1",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
         "agent-base": "6",
         "debug": "4"
       },
@@ -1197,11 +1593,14 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
+<<<<<<< HEAD
     "node_modules/ip": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
       "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -1230,12 +1629,21 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
     },
+<<<<<<< HEAD
+=======
+    "node_modules/jquery": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
+      "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
     },
     "node_modules/jsdom": {
+<<<<<<< HEAD
       "version": "21.1.2",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.2.tgz",
       "integrity": "sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ==",
@@ -1300,6 +1708,61 @@
       },
       "engines": {
         "node": ">=14"
+=======
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+      "dependencies": {
+        "abab": "^2.0.0",
+        "acorn": "^5.5.3",
+        "acorn-globals": "^4.1.0",
+        "array-equal": "^1.0.0",
+        "cssom": ">= 0.3.2 < 0.4.0",
+        "cssstyle": "^1.0.0",
+        "data-urls": "^1.0.0",
+        "domexception": "^1.0.1",
+        "escodegen": "^1.9.1",
+        "html-encoding-sniffer": "^1.0.2",
+        "left-pad": "^1.3.0",
+        "nwsapi": "^2.0.7",
+        "parse5": "4.0.0",
+        "pn": "^1.1.0",
+        "request": "^2.87.0",
+        "request-promise-native": "^1.0.5",
+        "sax": "^1.2.4",
+        "symbol-tree": "^3.2.2",
+        "tough-cookie": "^2.3.4",
+        "w3c-hr-time": "^1.0.1",
+        "webidl-conversions": "^4.0.2",
+        "whatwg-encoding": "^1.0.3",
+        "whatwg-mimetype": "^2.1.0",
+        "whatwg-url": "^6.4.1",
+        "ws": "^5.2.0",
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+    "node_modules/jsdom/node_modules/whatwg-url": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+      "dependencies": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/json-schema": {
@@ -1317,6 +1780,7 @@
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
     },
+<<<<<<< HEAD
     "node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -1325,6 +1789,8 @@
         "graceful-fs": "^4.1.6"
       }
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/jsprim": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
@@ -1348,6 +1814,7 @@
         "pako": "~1.0.2",
         "readable-stream": "~2.3.6",
         "setimmediate": "^1.0.5"
+<<<<<<< HEAD
       }
     },
     "node_modules/jszip/node_modules/readable-stream": {
@@ -1364,10 +1831,29 @@
         "util-deprecate": "~1.0.1"
       }
     },
+=======
+      }
+    },
+    "node_modules/jszip/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/jszip/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+<<<<<<< HEAD
     },
     "node_modules/jszip/node_modules/string_decoder": {
       "version": "1.1.1",
@@ -1375,6 +1861,33 @@
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dependencies": {
         "safe-buffer": "~5.1.0"
+=======
+    },
+    "node_modules/jszip/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "deprecated": "use String.prototype.padStart()"
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/lie": {
@@ -1385,6 +1898,20 @@
         "immediate": "~3.0.5"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -1450,6 +1977,7 @@
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
       "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ=="
     },
+<<<<<<< HEAD
     "node_modules/lru-cache": {
       "version": "7.18.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@@ -1457,6 +1985,12 @@
       "engines": {
         "node": ">=12"
       }
+=======
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
@@ -1488,26 +2022,55 @@
         "node": "*"
       }
     },
+<<<<<<< HEAD
     "node_modules/mitt": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
+<<<<<<< HEAD
+=======
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/moment-parseformat": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/moment-parseformat/-/moment-parseformat-3.0.0.tgz",
       "integrity": "sha512-dVgXe6b6DLnv4CHG7a1zUe5mSXaIZ3c6lSHm/EKeVeQI2/4pwe0VRde8OyoCE1Ro2lKT5P6uT9JElF7KDLV+jw=="
     },
+<<<<<<< HEAD
+=======
+    "node_modules/moment-timezone": {
+      "version": "0.5.26",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz",
+      "integrity": "sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==",
+      "dependencies": {
+        "moment": ">= 2.9.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+<<<<<<< HEAD
     "node_modules/netmask": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
@@ -1535,6 +2098,32 @@
         }
       }
     },
+=======
+    "node_modules/next-line": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz",
+      "integrity": "sha512-+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ=="
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
@@ -1544,9 +2133,15 @@
       }
     },
     "node_modules/nwsapi": {
+<<<<<<< HEAD
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
       "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
+=======
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
+      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/oauth-sign": {
       "version": "0.9.0",
@@ -1564,6 +2159,7 @@
         "wrappy": "1"
       }
     },
+<<<<<<< HEAD
     "node_modules/pac-proxy-agent": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
@@ -1630,12 +2226,72 @@
         "node": ">= 14"
       }
     },
+=======
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
       "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
     },
     "node_modules/parse5": {
+<<<<<<< HEAD
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
       "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
@@ -1655,6 +2311,18 @@
       },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
+=======
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/path-is-absolute": {
@@ -1675,10 +2343,33 @@
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
     },
+<<<<<<< HEAD
     "node_modules/postman-request": {
       "version": "2.88.1-postman.33",
       "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.33.tgz",
       "integrity": "sha512-uL9sCML4gPH6Z4hreDWbeinKU0p0Ke261nU7OvII95NU22HN6Dk7T/SaVPaj6T4TsQqGKIFw6/woLZnH7ugFNA==",
+=======
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
+    },
+    "node_modules/postman-request": {
+      "version": "2.88.1-postman.31",
+      "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.31.tgz",
+      "integrity": "sha512-OJbYqP7ItxQ84yHyuNpDywCZB0HYbpHJisMQ9lb1cSL3N5H3Td6a2+3l/a74UMd3u82BiGC5yQyYmdOIETP/nQ==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "@postman/form-data": "~3.1.1",
         "@postman/tough-cookie": "~4.1.3-postman.1",
@@ -1701,12 +2392,28 @@
         "qs": "~6.5.3",
         "safe-buffer": "^5.1.2",
         "stream-length": "^1.0.2",
+<<<<<<< HEAD
         "uuid": "^8.3.2"
+=======
+        "tough-cookie": "~2.5.0",
+        "uuid": "^3.3.2"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "engines": {
         "node": ">= 6"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -1720,6 +2427,7 @@
         "node": ">=0.4.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/proxy-agent": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
@@ -1773,6 +2481,8 @@
         "node": ">= 14"
       }
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -1793,14 +2503,21 @@
       }
     },
     "node_modules/punycode": {
+<<<<<<< HEAD
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+=======
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/puppeteer-core": {
+<<<<<<< HEAD
       "version": "21.2.1",
       "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.2.1.tgz",
       "integrity": "sha512-+I8EjpWFeeFKScpQiTEnC4jGve2Wr4eA9qUMoa8S317DJPm9h7wzrT4YednZK2TQZMyPtPQ2Disb/Tg02+4Naw==",
@@ -1826,6 +2543,59 @@
       "peerDependencies": {
         "bufferutil": "^4.0.1",
         "utf-8-validate": ">=5.0.2"
+=======
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-5.5.0.tgz",
+      "integrity": "sha512-tlA+1n+ziW/Db03hVV+bAecDKse8ihFRXYiEypBe9IlLRvOCzYFG6qrCMBYK34HO/Q/Ecjc+tvkHRAfLVH+NgQ==",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.818844",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^4.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.0.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/puppeteer-core/node_modules/agent-base": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/puppeteer-core/node_modules/https-proxy-agent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "dependencies": {
+        "agent-base": "5",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/puppeteer-core/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -1844,11 +2614,24 @@
         "node": ">=0.6"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
+<<<<<<< HEAD
     "node_modules/queue-tick": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
@@ -1871,20 +2654,425 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+=======
+    "node_modules/readability-extractor": {
+      "version": "0.0.2",
+      "resolved": "git+ssh://git@github.com/ArchiveBox/readability-extractor.git#42b243843c724a5d7a6b364d23985ff6acaeb55a",
+      "integrity": "sha512-B+oZuG4FwPYg5hxEafuhrwNOS8uiv/gYKlLKbIaeXXHlyznARYOqHpkHumiLMU6vkbZ3VAC7WucnWwh5jVOaBQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@mozilla/readability": "^0.4.1",
+        "dompurify": "^2.2.7",
+        "jsdom": "^16.5.2"
+      },
+      "bin": {
+        "readability-extractor": "readability-extractor"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+    },
+    "node_modules/readability-extractor/node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "node_modules/readability-extractor/node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/readability-extractor/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+    },
+    "node_modules/readability-extractor/node_modules/tough-cookie": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/readability-extractor/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
         "util-deprecate": "^1.0.1"
+<<<<<<< HEAD
+=======
       },
       "engines": {
         "node": ">= 6"
       }
     },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "node_modules/request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+<<<<<<< HEAD
     "node_modules/regenerator-runtime": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
       "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
     },
+=======
+    "node_modules/request-promise": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz",
+      "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==",
+      "deprecated": "request-promise has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dependencies": {
+        "lodash": "^4.17.19"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
+      "dependencies": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise/node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+    },
+    "node_modules/request/node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
+    "node_modules/request/node_modules/jsprim": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -1912,11 +3100,14 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+<<<<<<< HEAD
     "node_modules/rrweb-cssom": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
       "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw=="
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -1941,14 +3132,27 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+<<<<<<< HEAD
     "node_modules/saxes": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
       "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+=======
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
       "engines": {
+<<<<<<< HEAD
         "node": ">=v12.22.7"
       }
     },
@@ -1963,6 +3167,33 @@
       },
       "engines": {
         "node": ">= 14.20.0"
+=======
+        "node": ">=10"
+      }
+    },
+    "node_modules/selenium-webdriver": {
+      "version": "4.0.0-alpha.7",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.7.tgz",
+      "integrity": "sha512-D4qnTsyTr91jT8f7MfN+OwY0IlU5+5FmlO5xlgRUV6hDEV8JyYx2NerdTEqDDkNq7RZDYc4VoPALk8l578RBHw==",
+      "dependencies": {
+        "jszip": "^3.2.2",
+        "rimraf": "^2.7.1",
+        "tmp": "0.0.30"
+      },
+      "engines": {
+        "node": ">= 10.15.0"
+      }
+    },
+    "node_modules/selenium-webdriver/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/setimmediate": {
@@ -1970,6 +3201,7 @@
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
     },
+<<<<<<< HEAD
     "node_modules/single-file-cli": {
       "version": "1.1.18",
       "resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.18.tgz",
@@ -1989,6 +3221,172 @@
       }
     },
     "node_modules/single-file-cli/node_modules/iconv-lite": {
+=======
+    "node_modules/single-file": {
+      "version": "0.3.16",
+      "resolved": "git+ssh://git@github.com/gildas-lormeau/SingleFile.git#ec9dbc7c2272bff0dc2415a44d6cdfb2b48aa7d2",
+      "integrity": "sha512-NwwtloJdZlPG2zKrTAlcPRowIcwQx+1U39wcyPnfsbpVZKi6FAyLpo+CV0/xVJmvdOO0DSTvimuZtnc8/gJfTw==",
+      "license": "AGPL-3.0-or-later",
+      "dependencies": {
+        "file-url": "^3.0.0",
+        "iconv-lite": "^0.6.2",
+        "jsdom": "^16.4.0",
+        "puppeteer-core": "^5.3.0",
+        "selenium-webdriver": "4.0.0-alpha.7",
+        "strong-data-uri": "^1.0.6",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "single-file": "cli/single-file"
+      }
+    },
+    "node_modules/single-file/node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/single-file/node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/single-file/node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/single-file/node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/single-file/node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+    },
+    "node_modules/single-file/node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/single-file/node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "node_modules/single-file/node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/single-file/node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/single-file/node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/single-file/node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/single-file/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/single-file/node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/single-file/node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/single-file/node_modules/iconv-lite": {
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
@@ -1999,6 +3397,7 @@
         "node": ">=0.10.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/single-file-cli/node_modules/jsdom": {
       "version": "22.1.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
@@ -2030,6 +3429,43 @@
       },
       "engines": {
         "node": ">=16"
+=======
+    "node_modules/single-file/node_modules/jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "peerDependencies": {
         "canvas": "^2.5.0"
@@ -2040,6 +3476,7 @@
         }
       }
     },
+<<<<<<< HEAD
     "node_modules/single-file-cli/node_modules/tr46": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
@@ -2119,6 +3556,79 @@
       "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
       "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
     },
+=======
+    "node_modules/single-file/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+    },
+    "node_modules/single-file/node_modules/tough-cookie": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/single-file/node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/single-file/node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/single-file/node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/single-file/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -2129,9 +3639,15 @@
       }
     },
     "node_modules/sshpk": {
+<<<<<<< HEAD
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
+=======
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
+      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -2152,6 +3668,17 @@
         "node": ">=0.10.0"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/stream-length": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz",
@@ -2160,6 +3687,7 @@
         "bluebird": "^2.6.2"
       }
     },
+<<<<<<< HEAD
     "node_modules/streamx": {
       "version": "2.15.2",
       "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.2.tgz",
@@ -2169,6 +3697,8 @@
         "queue-tick": "^1.0.1"
       }
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -2223,16 +3753,25 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "node_modules/tar-fs": {
+<<<<<<< HEAD
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
       "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
       "dependencies": {
+=======
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dependencies": {
+        "chownr": "^1.1.1",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
         "tar-stream": "^3.1.5"
       }
     },
     "node_modules/tar-stream": {
+<<<<<<< HEAD
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
       "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
@@ -2240,6 +3779,20 @@
         "b4a": "^1.6.4",
         "fast-fifo": "^1.2.0",
         "streamx": "^2.15.0"
+=======
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/through": {
@@ -2248,6 +3801,7 @@
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
     },
     "node_modules/tmp": {
+<<<<<<< HEAD
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
       "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
@@ -2270,6 +3824,28 @@
       },
       "engines": {
         "node": ">=6"
+=======
+      "version": "0.0.30",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
+      "integrity": "sha512-HXdTB7lvMwcb55XFfrTM8CPr/IYREk4hVBFaQ4b/6nInrluSL86hfHm7vu0luYKCfyBZp2trCjpc8caC3vVM3w==",
+      "dependencies": {
+        "os-tmpdir": "~1.0.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/tr46": {
@@ -2283,6 +3859,7 @@
       "integrity": "sha512-em3E3SUDONOjTBcZ36DTm3RvDded3IRU9rX32oHwwXNt3rJD5MVaFlJTQvs8tJoHRoeYP36OuQ1eL/Q7bNEWIQ==",
       "engines": {
         "node": "*"
+<<<<<<< HEAD
       }
     },
     "node_modules/tslib": {
@@ -2296,6 +3873,27 @@
       "integrity": "sha512-ntI9R7fcUKjqBP6QU8rBK2Ehyt8LAzt3UBT9JR9tgo6GtuKvyUzpayWmeMKJw1DPdXzktvtIT8m2mVXz+bL/Qg==",
       "dependencies": {
         "domino": "^2.1.6"
+=======
+      }
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/turndown": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/turndown/-/turndown-5.0.3.tgz",
+      "integrity": "sha512-popfGXEiedpq6F5saRIAThKxq/bbEPVFnsDnUdjaDGIre9f3/OL9Yi/yPbPcZ7RYUDpekghr666bBfZPrwNnhQ==",
+      "dependencies": {
+        "jsdom": "^11.9.0"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/tweetnacl": {
@@ -2303,6 +3901,20 @@
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
     },
+<<<<<<< HEAD
+=======
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/unbzip2-stream": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
@@ -2312,12 +3924,15 @@
         "through": "^2.3.8"
       }
     },
+<<<<<<< HEAD
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "optional": true
     },
+=======
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/universalify": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
@@ -2334,6 +3949,18 @@
         "punycode": "^2.1.0"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -2343,17 +3970,34 @@
         "requires-port": "^1.0.0"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/uuid": {
+<<<<<<< HEAD
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "bin": {
         "uuid": "dist/bin/uuid"
+=======
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/valid-url": {
@@ -2374,6 +4018,7 @@
         "extsprintf": "^1.2.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
@@ -2423,6 +4068,57 @@
         "node": ">=12"
       }
     },
+=======
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dependencies": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dependencies": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+    },
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/whatwg-url": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
@@ -2432,10 +4128,20 @@
         "webidl-conversions": "^3.0.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/whatwg-url/node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+=======
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
@@ -2459,6 +4165,7 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
+<<<<<<< HEAD
       "version": "8.14.2",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
       "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
@@ -2476,6 +4183,13 @@
         "utf-8-validate": {
           "optional": true
         }
+=======
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
+      "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==",
+      "dependencies": {
+        "async-limiter": "~1.0.0"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/wuzzy": {
@@ -2487,12 +4201,18 @@
       }
     },
     "node_modules/xml-name-validator": {
+<<<<<<< HEAD
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
       "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "engines": {
         "node": ">=12"
       }
+=======
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
@@ -2508,11 +4228,19 @@
       }
     },
     "node_modules/yargs": {
+<<<<<<< HEAD
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dependencies": {
         "cliui": "^8.0.1",
+=======
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dependencies": {
+        "cliui": "^7.0.2",
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
@@ -2521,7 +4249,11 @@
         "yargs-parser": "^21.1.1"
       },
       "engines": {
+<<<<<<< HEAD
         "node": ">=12"
+=======
+        "node": ">=10"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/yargs-parser": {
@@ -2534,11 +4266,19 @@
       }
     },
     "node_modules/yargs/node_modules/yargs-parser": {
+<<<<<<< HEAD
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "engines": {
         "node": ">=12"
+=======
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "engines": {
+        "node": ">=10"
+>>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/yauzl": {
diff --git a/screenshot.png b/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dfcb530cce8a021b84e63f3290c4c2fa363b4bf
GIT binary patch
literal 42845
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
OS?cNP=d#Wzp$P!<TE|QP

literal 0
HcmV?d00001


From 76f6cfbfdee02d19861e9b610a9aff11dddcac19 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 02:24:51 -0800
Subject: [PATCH 030/126] Update pyproject.toml and merge dev groups

---
 pyproject.toml | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index cb3a0c36..a7a6f461 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,10 +3,9 @@ name = "archivebox"
 version = "0.7.1"
 description = "Self-hosted internet archiving solution."
 authors = [
-    {name = "Nick Sweeting", email = "setup.py@archivebox.io"},
+    {name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"},
 ]
 dependencies = [
-    # "setuptools>=68.2.2",
     "croniter>=0.3.34",
     "dateparser>=1.0.0",
     "django-extensions>=3.0.3",
@@ -16,8 +15,7 @@ dependencies = [
     "python-crontab>=2.5.1",
     "requests>=2.24.0",
     "w3lib>=1.22.0",
-    # "youtube-dl>=2021.04.17",
-    "yt-dlp>=2021.4.11",
+    "yt-dlp>=2023.10.13",
     # "playwright>=1.39.0; platform_machine != 'armv7l'",
 ]
 requires-python = ">=3.9"
@@ -56,34 +54,26 @@ classifiers = [
 # pdm lock -G:all
 # pdm install -G:all
 [tool.pdm.dev-dependencies]
-build = [
-    "setuptools",
+dev = [
+    # build
+    "setuptools>=68.2.2",
     "wheel",
     "pdm",
-    # "bottle",
-    # "stdeb",
-    # "twine",
-]
-lint = [
-    "flake8",
-    "mypy",
-    "django-stubs",
-]
-test = [
-    "pytest",
-]
-debug = [
-    "django-debug-toolbar",
-    "djdt_flamegraph",
-    "ipdb",
-]
-doc = [
+    "homebrew-pypi-poet>=0.10.0",
+    # docs
     "recommonmark",
     "sphinx",
     "sphinx-rtd-theme",
-]
-dev = [
-    "homebrew-pypi-poet>=0.10.0",
+    # debug
+    "django-debug-toolbar",
+    "djdt_flamegraph",
+    "ipdb",
+    # test
+    "pytest",
+    # lint
+    "flake8",
+    "mypy",
+    "django-stubs",
 ]
 
 [tool.pdm.scripts]

From 277364ab61fd901070d4907c661a60ad8fe5edae Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 02:29:18 -0800
Subject: [PATCH 031/126] remove extra files

---
 .vscode/settings.json |   3 ---
 screenshot.png        | Bin 42845 -> 0 bytes
 2 files changed, 3 deletions(-)
 delete mode 100644 .vscode/settings.json
 delete mode 100644 screenshot.png

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 163c9840..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "python.formatting.provider": "black"
-}
diff --git a/screenshot.png b/screenshot.png
deleted file mode 100644
index 0dfcb530cce8a021b84e63f3290c4c2fa363b4bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42845
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
OS?cNP=d#Wzp$P!<TE|QP


From f5c2cfcfe231f9d42c502e74f17e9d521ffe4b26 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 14 Nov 2023 02:30:59 -0800
Subject: [PATCH 032/126] dont alert on statics

---
 archivebox/templates/admin/private_index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/archivebox/templates/admin/private_index.html b/archivebox/templates/admin/private_index.html
index a95a7716..b60f3a3e 100644
--- a/archivebox/templates/admin/private_index.html
+++ b/archivebox/templates/admin/private_index.html
@@ -88,5 +88,4 @@
       {% endblock %}
     </div>
   </div>
-  <script>alert(1)</script>
 {% endblock %}

From b3adef6267c59dea6be27ed006f7051a4fa35a46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 14:49:40 +0000
Subject: [PATCH 033/126] Bump yt-dlp from 2023.10.13 to 2023.11.14

Bumps [yt-dlp](https://github.com/yt-dlp/yt-dlp) from 2023.10.13 to 2023.11.14.
- [Release notes](https://github.com/yt-dlp/yt-dlp/releases)
- [Changelog](https://github.com/yt-dlp/yt-dlp/blob/master/Changelog.md)
- [Commits](https://github.com/yt-dlp/yt-dlp/compare/2023.10.13...2023.11.14)

---
updated-dependencies:
- dependency-name: yt-dlp
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 770ac3e3..aa1cd8b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -43,4 +43,4 @@ urllib3==2.1.0
 w3lib==2.1.2
 wcwidth==0.2.10
 websockets==12.0
-yt-dlp==2023.10.13
+yt-dlp==2023.11.14

From f81e51a1fc336bc9bd432c1ff532bf27745ff429 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 19 Nov 2023 13:45:00 -0800
Subject: [PATCH 034/126] fix typo in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9a561a28..2c93d05b 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ curl -sSL 'https://get.archivebox.io' | sh    # (or see pip/brew/Docker instruct
 
 **ArchiveBox is a powerful, self-hosted internet archiving solution to collect, save, and view websites offline.**
 
-Without active preservation effort, everything on the internet eventually dissapears or degrades. Archive.org does a great job as a free central archive, but they require all archives to be public, and they cant save every type of content.
+Without active preservation effort, everything on the internet eventually dissapears or degrades. Archive.org does a great job as a free central archive, but they require all archives to be public, and they can't save every type of content.
 
 *ArchiveBox is an open source tool that helps you archive web content on your own (or privately within an organization): save sharable copies of browser bookmarks, preserve evidence for legal cases, backup photos on FB / Insta / Flickr, download your media from YT / Soundcloud / etc., snapshot research papers in academic citations, and more...*
 

From 2619853e60fb7f539f1553a1f909327c6414fea9 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 19 Nov 2023 13:45:58 -0800
Subject: [PATCH 035/126] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2c93d05b..104be916 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ curl -sSL 'https://get.archivebox.io' | sh    # (or see pip/brew/Docker instruct
 
 Without active preservation effort, everything on the internet eventually dissapears or degrades. Archive.org does a great job as a free central archive, but they require all archives to be public, and they can't save every type of content.
 
-*ArchiveBox is an open source tool that helps you archive web content on your own (or privately within an organization): save sharable copies of browser bookmarks, preserve evidence for legal cases, backup photos on FB / Insta / Flickr, download your media from YT / Soundcloud / etc., snapshot research papers in academic citations, and more...*
+*ArchiveBox is an open source tool that helps you archive web content on your own (or privately within an organization): save copies of browser bookmarks, preserve evidence for legal cases, backup photos from FB / Insta / Flickr, download your media from YT / Soundcloud / etc., snapshot research papers & academic citations, and more...*
 
 > ➡️ *Use ArchiveBox as a [command-line package](#quickstart) and/or [self-hosted web app](#quickstart) on Linux, macOS, or in [Docker](#quickstart).*
 

From ff12d34dbfabc0867167095ab9866d3751f80d37 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 19 Nov 2023 13:51:42 -0800
Subject: [PATCH 036/126] warn about delayed releases for some package managers

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 104be916..82240d05 100644
--- a/README.md
+++ b/README.md
@@ -320,6 +320,10 @@ See the <a href="https://github.com/ArchiveBox/pip-archivebox"><code>pip-archive
 <details>
 <summary><img src="https://user-images.githubusercontent.com/511499/118077361-f0616580-b381-11eb-973c-ee894a3349fb.png" alt="Arch" height="28px" align="top"/> <code>pacman</code> / <img src="https://user-images.githubusercontent.com/511499/118077946-29e6a080-b383-11eb-94f0-d4871da08c3f.png" alt="FreeBSD" height="28px" align="top"/> <code>pkg</code> / <img src="https://user-images.githubusercontent.com/511499/118077861-002d7980-b383-11eb-86a7-5936fad9190f.png" alt="Nix" height="28px" align="top"/> <code>nix</code> (Arch/FreeBSD/NixOS/more)</summary>
 <br/>
+
+> [!WARNING]  
+> *These are contributed by external volunteers and may lag behind the official `pip` channel.*
+
 <ul>
 <li>Arch: <a href="https://aur.archlinux.org/packages/archivebox/"><code>yay -S archivebox</code></a> (contributed by <a href="https://github.com/imlonghao"><code>@imlonghao</code></a>)</li>
 <li>FreeBSD: <a href="https://github.com/ArchiveBox/ArchiveBox#%EF%B8%8F-easy-setup"><code>curl -sSL 'https://get.archivebox.io' | sh</code></a> (uses <code>pkg</code> + <code>pip3</code> under-the-hood)</li>

From 0bd83076db5ddfe23857b0bcfc7028fa72cf2edf Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 19 Nov 2023 17:35:19 -0800
Subject: [PATCH 037/126] Fix icon and add Elest.io to paid hosting options

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 82240d05..df8aa0b6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-<em><img src="icon.png" height="90px"></em>
+<em><img src="https://archivebox.io/icon.png" height="90px"></em>
 <h1>ArchiveBox<br/><sub>Open-source self-hosted web archiving.</sub></h1>
 
 <br/>
@@ -370,6 +370,7 @@ See <a href="#%EF%B8%8F-cli-usage">below</a> for usage examples using the CLI, W
 <br/>
 Other providers of paid ArchiveBox hosting (not officially endorsed):<br/>
 <br/><br/>
+<li><a href="https://elest.io/open-source/archivebox"><img src="https://img.shields.io/badge/Managed_Hosting-Elest.io-%23193f7e.svg?style=flat" height="22px"/></a></li>
 <li><a href="https://www.stellarhosted.com/archivebox/"><img src="https://img.shields.io/badge/Semi_Managed_Hosting-StellarHosted.com-%23193f7e.svg?style=flat" height="22px"/></a> (USD $29-250/mo, <a href="https://www.stellarhosted.com/archivebox/#pricing">pricing</a>)</li>
 <li><a href="https://www.pikapods.com/pods?run=archivebox"><img src="https://img.shields.io/badge/Semi_Managed_Hosting-PikaPods.com-%2343a047.svg?style=flat" height="22px"/></a> (from USD $2.6/mo)</li>
 <li><a href="https://m.do.co/c/cbc4c0c17840">

From 7599dbb79df040e273fd1eaa0e96de5d365ff5f5 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Thu, 23 Nov 2023 03:04:31 -0600
Subject: [PATCH 038/126] Add notification about upgrade to admin page

---
 archivebox/core/urls.py              |  3 +-
 archivebox/templates/admin/base.html | 93 ++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 87261ae2..90544dbd 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -8,6 +8,7 @@ from django.views.generic.base import RedirectView
 
 from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView
 
+from config import VERSION
 
 # print('DEBUG', settings.DEBUG)
 
@@ -30,7 +31,7 @@ urlpatterns = [
 
 
     path('accounts/', include('django.contrib.auth.urls')),
-    path('admin/', admin.site.urls),
+    path('admin/', admin.site.urls, {'extra_context': {'VERSION': VERSION}}),
 
     path('health/', HealthCheckView.as_view(), name='healthcheck'),
     path('error/', lambda _: 1/0),
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 0592fa0a..b0979db5 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -123,6 +123,99 @@
         </div>
 
         <script>
+            const installedVersion = "{{VERSION}}";
+
+            // get versions from GitHub
+            const github_releases_api = "https://api.github.com/repos/pirate/archivebox/releases";
+
+            let release_data = fetch(github_releases_api)
+              .then(response => response.json())
+              .then(release_data => {
+                let upgradeVersion = findUpgradeVersion(installedVersion, release_data);
+                let currentVersion = findCurrentVersion(installedVersion, release_data);
+
+                const showBanner = localStorage.getItem("bannerDismissed") !== "true" && currentVersion.html_url !== upgradeVersion.html_url
+                if (showBanner) {
+                    createBanner(currentVersion, upgradeVersion);
+                }
+              })
+              .catch(error => {
+                console.error('Error fetching release data: ', error);
+              });
+
+            // finds the nearest stable version
+            function findCurrentVersion(currentVersionTagName, releaseData) {
+                for (let i = 0; i < releaseData.length; i++) {
+                    if (compareVersions(releaseData[i].tag_name, currentVersionTagName) <= 0) {
+                        return releaseData[i];
+                    }
+                }
+                return releaseData[releaseData.length - 1];
+            }
+
+            function findUpgradeVersion(currentVersionTagName, releaseData) {
+                for (let i = 0; i < releaseData.length; i++) {
+                    if (majorVersionDiff(releaseData[i].tag_name, currentVersionTagName) === 1) {
+                        return releaseData[i];
+                    }
+                }
+                return releaseData[0];
+            }
+
+            function createBanner(currentVersion, upgradeVersion) {
+                const banner = document.createElement('div');
+                banner.setAttribute('id', 'upgrade-banner');
+                banner.innerHTML = `
+                    There's a new version of ArchiveBox available!
+                    The next major version is <a href=${upgradeVersion.html_url}>${upgradeVersion.tag_name}</a>.
+                    Your current version is <a href=${currentVersion.html_url}>${installedVersion}</a>
+                    <p>
+                    <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrading</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
+                    </p>
+                    <button>
+                        <a href="#" onclick="dismissBanner()">Dismiss</a>
+                    </button>
+                `
+                document.body.appendChild(banner);
+            }
+
+
+            // dismisses the version banner and stores a cookie to prevent it from showing again
+            function dismissBanner() {
+                var banner = document.getElementById("version-banner");
+                banner.style.display = "none";
+                localStorage.setItem("bannerDismissed", "true");
+            }
+
+            function parseVersion(v) {
+                return v.replace(/^v/, '').split(".").map(Number);
+            }
+
+            // compares two version strings formatted like "vx.x.x" (where the x's are integers)
+            // and returns 1 if v1 is newer than v2, 0 if they're the same, and -1 
+            // if v1 is older than v2.
+            function compareVersions(v1, v2) {
+                let v1Parts = parseVersion(v1);
+                let v2Parts = parseVersion(v2);
+
+                for (let i = 0; i < 3; i++) {
+                    if (v1Parts[i] < v2Parts[i]) {
+                        return -1;
+                    }
+                    if (v1Parts[i] > v2Parts[i]) {
+                        return 1;
+                    }
+                }
+                return 0;
+            }
+
+            function majorVersionDiff(v1, v2) {
+                let v1Parts = parseVersion(v1);
+                let v2Parts = parseVersion(v2);
+
+                return v1Parts[1] - v2Parts[1];
+            }
+
             $ = django.jQuery;
             $.fn.reverse = [].reverse;
 

From a3fd8a8ecd2412bc4bd102f042214fbec6cec348 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Mon, 27 Nov 2023 22:56:30 -0600
Subject: [PATCH 039/126] Move version banner logic from JS to Python

Also adds CSS styling to banner.
---
 archivebox/config.py                 |  74 ++++++++++++++++++
 archivebox/core/urls.py              |   4 +-
 archivebox/templates/admin/base.html | 111 +++++++++------------------
 3 files changed, 111 insertions(+), 78 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 775be8e4..e0a1ccf5 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -30,6 +30,7 @@ import inspect
 import getpass
 import platform
 import shutil
+import requests
 import django
 from sqlite3 import dbapi2 as sqlite3
 
@@ -397,6 +398,55 @@ def get_commit_hash(config):
     except Exception:
         return None
 
+def get_version_releases(config):
+    """
+    returns a dictionary containing the GitHub release data for 
+    the recommended upgrade version and the currently installed version
+    """
+    github_releases_api = "https://api.github.com/repos/pirate/archivebox/releases"
+    response = requests.get(github_releases_api)
+    if response.status_code != 200:
+        stderr('Failed to get release data from GitHub', color='lightyellow', config=config)
+        return None
+
+    releases = response.json()
+    installed_version = config['VERSION']
+    installed_version_parts = parse_tag_name(installed_version)
+
+    # find current version or nearest older version (to link to)
+    current_version = None
+    for i, release in enumerate(releases):
+        release_parts = parse_tag_name(release["tag_name"])
+        if compare_versions(release["tag_name"], installed_version) <= 0:
+            current_version = release
+            break
+
+    current_version = current_version if current_version else releases[-1]
+
+    # find upgrade version
+    upgrade_version = None
+    smallest_version_diff = parse_tag_name(releases[0]["tag_name"])[1]
+    for i, release in enumerate(releases):
+        release_parts = parse_tag_name(release["tag_name"])
+        major_version_diff = release_parts[1] - installed_version_parts[1]
+        if major_version_diff < smallest_version_diff:
+            smallest_version_diff = major_version_diff
+            if smallest_version_diff < 1:
+                break
+            upgrade_version = release
+
+    upgrade_version = upgrade_version if upgrade_version else releases[0]
+
+    return {"upgrade_version": upgrade_version, "current_version": current_version}
+
+def can_upgrade(config):
+    if config['VERSION_RELEASES']:
+        upgrade_version_tag = config['VERSION_RELEASES']['upgrade_version']['tag_name']
+        current_version_tag = config['VERSION_RELEASES']['current_version']['tag_name']
+        return compare_versions(upgrade_version_tag, current_version_tag) == 1
+    return False
+
+
 ############################## Derived Config ##################################
 
 
@@ -424,6 +474,8 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
 
     'ARCHIVEBOX_BINARY':        {'default': lambda c: sys.argv[0] or bin_path('archivebox')},
     'VERSION':                  {'default': lambda c: get_version(c)},
+    'VERSION_RELEASES':         {'default': lambda c: get_version_releases(c)},
+    'CAN_UPGRADE':              {'default': lambda c: can_upgrade(c)},
     'COMMIT_HASH':              {'default': lambda c: get_commit_hash(c)},
     
     'PYTHON_BINARY':            {'default': lambda c: sys.executable},
@@ -696,6 +748,28 @@ def load_config(defaults: ConfigDefaultDict,
 
 #     with open(os.path.join(config['OUTPUT_DIR'], CONFIG_FILENAME), 'w+') as f:
 
+def parse_tag_name(v):
+    """parses a version tag string formatted like 'vx.x.x'"""
+    v = re.sub(r"\+.*$", "", v) # in case version string ends with '+editable'
+    parts = re.sub(r"^v", "", v).split(".")
+    return [int(p) for p in parts]
+
+
+def compare_versions(v1, v2):
+    """
+    for two version strings v1 and v2, returns 1 if v1 is newer than v2,
+    0 if they're equivalent and -1 if v1 is older than v2.
+    """
+    v1Parts = parse_tag_name(v1)
+    v2Parts = parse_tag_name(v2)
+    for i in range(len(v1Parts)):
+        if v1Parts[i] < v2Parts[i]:
+            return -1
+
+        if v1Parts[i] > v2Parts[i]:
+            return 1
+    return 0
+
 
 # Logging Helpers
 def stdout(*args, color: Optional[str]=None, prefix: str='', config: Optional[ConfigDict]=None) -> None:
diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 90544dbd..1520710c 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -8,7 +8,7 @@ from django.views.generic.base import RedirectView
 
 from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView
 
-from config import VERSION
+from config import VERSION, VERSION_RELEASES, CAN_UPGRADE
 
 # print('DEBUG', settings.DEBUG)
 
@@ -31,7 +31,7 @@ urlpatterns = [
 
 
     path('accounts/', include('django.contrib.auth.urls')),
-    path('admin/', admin.site.urls, {'extra_context': {'VERSION': VERSION}}),
+    path('admin/', admin.site.urls, {'extra_context': {'VERSION': VERSION, 'VERSION_RELEASES': VERSION_RELEASES, 'CAN_UPGRADE': CAN_UPGRADE}}),
 
     path('health/', HealthCheckView.as_view(), name='healthcheck'),
     path('error/', lambda _: 1/0),
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index b0979db5..7b00fae5 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -12,7 +12,26 @@
         {% endblock %}
         
         <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}">
-        {% block extrastyle %}{% endblock %}
+        {% block extrastyle %}
+        <style>
+            #upgrade-banner {
+                position: fixed;
+                right: 20px;
+                bottom: 20px;
+                background-color: #f8f8f8;
+                color: #333333;
+                border: 2px solid #772948;
+                padding: 10px 20px;
+                z-index: 1000;
+                text-align: center;
+            }
+            #dismiss-btn {
+                background: #aa1e55;
+                color: white;
+                cursor: pointer;
+            }
+        </style>
+        {% endblock %}
         
         {% if LANGUAGE_BIDI %}
             <link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">
@@ -123,99 +142,39 @@
         </div>
 
         <script>
-            const installedVersion = "{{VERSION}}";
+            if ("{{CAN_UPGRADE}}" === "True" && !localStorage.getItem("bannerDismissed")) {
+                let upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
+                let upgradeVersionURL= "{{VERSION_RELEASES.upgrade_version.html_url}}"
+                let currentVersionTag = "{{VERSION}}"
+                let currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
 
-            // get versions from GitHub
-            const github_releases_api = "https://api.github.com/repos/pirate/archivebox/releases";
-
-            let release_data = fetch(github_releases_api)
-              .then(response => response.json())
-              .then(release_data => {
-                let upgradeVersion = findUpgradeVersion(installedVersion, release_data);
-                let currentVersion = findCurrentVersion(installedVersion, release_data);
-
-                const showBanner = localStorage.getItem("bannerDismissed") !== "true" && currentVersion.html_url !== upgradeVersion.html_url
-                if (showBanner) {
-                    createBanner(currentVersion, upgradeVersion);
-                }
-              })
-              .catch(error => {
-                console.error('Error fetching release data: ', error);
-              });
-
-            // finds the nearest stable version
-            function findCurrentVersion(currentVersionTagName, releaseData) {
-                for (let i = 0; i < releaseData.length; i++) {
-                    if (compareVersions(releaseData[i].tag_name, currentVersionTagName) <= 0) {
-                        return releaseData[i];
-                    }
-                }
-                return releaseData[releaseData.length - 1];
+                createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
             }
 
-            function findUpgradeVersion(currentVersionTagName, releaseData) {
-                for (let i = 0; i < releaseData.length; i++) {
-                    if (majorVersionDiff(releaseData[i].tag_name, currentVersionTagName) === 1) {
-                        return releaseData[i];
-                    }
-                }
-                return releaseData[0];
-            }
-
-            function createBanner(currentVersion, upgradeVersion) {
+            function createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL){
                 const banner = document.createElement('div');
                 banner.setAttribute('id', 'upgrade-banner');
                 banner.innerHTML = `
-                    There's a new version of ArchiveBox available!
-                    The next major version is <a href=${upgradeVersion.html_url}>${upgradeVersion.tag_name}</a>.
-                    Your current version is <a href=${currentVersion.html_url}>${installedVersion}</a>
+                    <p>There's a new version of ArchiveBox available!</p>
+                    Your version: <a href=${currentVersionURL}>${currentVersionTag}</a> | New version: <a href=${upgradeVersionURL}>${upgradeVersionTag}</a>
                     <p>
                     <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrading</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
                     </p>
-                    <button>
-                        <a href="#" onclick="dismissBanner()">Dismiss</a>
-                    </button>
+                    <button id="dismiss-btn">Dismiss</button>
                 `
                 document.body.appendChild(banner);
+                let dismissButton = document.querySelector("#dismiss-btn")
+                if (dismissButton) {
+                    dismissButton.addEventListener("click", dismissBanner)
+                }
             }
 
-
-            // dismisses the version banner and stores a cookie to prevent it from showing again
             function dismissBanner() {
-                var banner = document.getElementById("version-banner");
+                var banner = document.getElementById("upgrade-banner");
                 banner.style.display = "none";
                 localStorage.setItem("bannerDismissed", "true");
             }
 
-            function parseVersion(v) {
-                return v.replace(/^v/, '').split(".").map(Number);
-            }
-
-            // compares two version strings formatted like "vx.x.x" (where the x's are integers)
-            // and returns 1 if v1 is newer than v2, 0 if they're the same, and -1 
-            // if v1 is older than v2.
-            function compareVersions(v1, v2) {
-                let v1Parts = parseVersion(v1);
-                let v2Parts = parseVersion(v2);
-
-                for (let i = 0; i < 3; i++) {
-                    if (v1Parts[i] < v2Parts[i]) {
-                        return -1;
-                    }
-                    if (v1Parts[i] > v2Parts[i]) {
-                        return 1;
-                    }
-                }
-                return 0;
-            }
-
-            function majorVersionDiff(v1, v2) {
-                let v1Parts = parseVersion(v1);
-                let v2Parts = parseVersion(v2);
-
-                return v1Parts[1] - v2Parts[1];
-            }
-
             $ = django.jQuery;
             $.fn.reverse = [].reverse;
 

From ba4342dadf9d026b2baaea9b51819af540f40215 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Mon, 27 Nov 2023 22:58:13 -0600
Subject: [PATCH 040/126] Add CLI hints to add and schedule jobs

---
 archivebox/main.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/archivebox/main.py b/archivebox/main.py
index b0e45bac..7abf3b4e 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -97,6 +97,8 @@ from .config import (
     check_data_folder,
     write_config_file,
     VERSION,
+    VERSION_RELEASES,
+    CAN_UPGRADE,
     COMMIT_HASH,
     CODE_LOCATIONS,
     EXTERNAL_LOCATIONS,
@@ -681,6 +683,9 @@ def add(urls: Union[str, List[str]],
             snapshot.save()
         # print(f'    √ Tagged {len(imported_links)} Snapshots with {len(tags)} tags {tags_str}')
 
+    if CAN_UPGRADE:
+        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSION_RELEASES['upgrade_version']['tag_name']} ({VERSION_RELEASES['upgrade_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
+
 
     return all_links
 
@@ -1270,6 +1275,9 @@ def schedule(add: bool=False,
                 print('\n{green}[√] Stopped.{reset}'.format(**ANSI))
                 raise SystemExit(1)
 
+    if CAN_UPGRADE:
+        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSION_RELEASES['upgrade_version']['tag_name']} ({VERSION_RELEASES['upgrade_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
+
     
 @enforce_types
 def server(runserver_args: Optional[List[str]]=None,

From 8616cd758a04dbf2c13b5a113983a017a75061c4 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Thu, 30 Nov 2023 18:06:54 -0600
Subject: [PATCH 041/126] Fix typos, formatting, and variable declarations

Co-authored-by: Nick Sweeting <git@sweeting.me>
---
 archivebox/config.py                 |  2 +-
 archivebox/templates/admin/base.html | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index e0a1ccf5..2195f50c 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -403,7 +403,7 @@ def get_version_releases(config):
     returns a dictionary containing the GitHub release data for 
     the recommended upgrade version and the currently installed version
     """
-    github_releases_api = "https://api.github.com/repos/pirate/archivebox/releases"
+    github_releases_api = "https://api.github.com/repos/ArchiveBox/ArchiveBox/releases"
     response = requests.get(github_releases_api)
     if response.status_code != 200:
         stderr('Failed to get release data from GitHub', color='lightyellow', config=config)
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 7b00fae5..5e84d9bc 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -144,15 +144,15 @@
         <script>
             if ("{{CAN_UPGRADE}}" === "True" && !localStorage.getItem("bannerDismissed")) {
                 let upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
-                let upgradeVersionURL= "{{VERSION_RELEASES.upgrade_version.html_url}}"
+                const upgradeVersionURL = "{{VERSION_RELEASES.upgrade_version.html_url}}"
                 let currentVersionTag = "{{VERSION}}"
                 let currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
 
                 createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
             }
 
-            function createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL){
-                const banner = document.createElement('div');
+            function createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL) {
+                const banner = document.createElement('div')
                 banner.setAttribute('id', 'upgrade-banner');
                 banner.innerHTML = `
                     <p>There's a new version of ArchiveBox available!</p>
@@ -163,16 +163,16 @@
                     <button id="dismiss-btn">Dismiss</button>
                 `
                 document.body.appendChild(banner);
-                let dismissButton = document.querySelector("#dismiss-btn")
+                const dismissButton = document.querySelector("#dismiss-btn")
                 if (dismissButton) {
                     dismissButton.addEventListener("click", dismissBanner)
                 }
             }
 
             function dismissBanner() {
-                var banner = document.getElementById("upgrade-banner");
-                banner.style.display = "none";
-                localStorage.setItem("bannerDismissed", "true");
+                const banner = document.getElementById("upgrade-banner")
+                banner.style.display = "none"
+                localStorage.setItem("bannerDismissed", "true")
             }
 
             $ = django.jQuery;

From 4ae35c86f274e22b13f27ad89db675bf78e2d7b5 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Thu, 30 Nov 2023 19:53:20 -0600
Subject: [PATCH 042/126] Update archivebox/config.py

Co-authored-by: Nick Sweeting <git@sweeting.me>
---
 archivebox/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 2195f50c..fbcbca03 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -415,7 +415,7 @@ def get_version_releases(config):
 
     # find current version or nearest older version (to link to)
     current_version = None
-    for i, release in enumerate(releases):
+    for release in releases:
         release_parts = parse_tag_name(release["tag_name"])
         if compare_versions(release["tag_name"], installed_version) <= 0:
             current_version = release

From 25d7f3ed1c5442811f771fba89a3f0be52468916 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Thu, 30 Nov 2023 19:57:46 -0600
Subject: [PATCH 043/126] Parse without regex and change 'let' to 'const'

---
 archivebox/config.py                 |  8 ++++----
 archivebox/templates/admin/base.html | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index fbcbca03..c8a40c30 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -426,7 +426,7 @@ def get_version_releases(config):
     # find upgrade version
     upgrade_version = None
     smallest_version_diff = parse_tag_name(releases[0]["tag_name"])[1]
-    for i, release in enumerate(releases):
+    for release in releases:
         release_parts = parse_tag_name(release["tag_name"])
         major_version_diff = release_parts[1] - installed_version_parts[1]
         if major_version_diff < smallest_version_diff:
@@ -750,9 +750,9 @@ def load_config(defaults: ConfigDefaultDict,
 
 def parse_tag_name(v):
     """parses a version tag string formatted like 'vx.x.x'"""
-    v = re.sub(r"\+.*$", "", v) # in case version string ends with '+editable'
-    parts = re.sub(r"^v", "", v).split(".")
-    return [int(p) for p in parts]
+    base = v.split('+')[0].split('v')[-1] # remove 'v' prefix and '+editable' suffix
+    int_parts = [int(part) for part in base.split('.')]
+    return int_parts
 
 
 def compare_versions(v1, v2):
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 5e84d9bc..7c31d83a 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -142,11 +142,12 @@
         </div>
 
         <script>
-            if ("{{CAN_UPGRADE}}" === "True" && !localStorage.getItem("bannerDismissed")) {
-                let upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
+            {% if user.is_authenticated and CAN_UPGRADE %}
+            if (!localStorage.getItem("bannerDismissed")) {
+                const upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
                 const upgradeVersionURL = "{{VERSION_RELEASES.upgrade_version.html_url}}"
-                let currentVersionTag = "{{VERSION}}"
-                let currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
+                const currentVersionTag = "{{VERSION}}"
+                const currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
 
                 createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
             }
@@ -174,6 +175,7 @@
                 banner.style.display = "none"
                 localStorage.setItem("bannerDismissed", "true")
             }
+            {% endif %}
 
             $ = django.jQuery;
             $.fn.reverse = [].reverse;

From a2b11b696d871db6112a74f27a777eefb69f3fc5 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Fri, 1 Dec 2023 16:55:07 -0600
Subject: [PATCH 044/126] Remove version comparison function

---
 archivebox/config.py | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index c8a40c30..b724b2cf 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -417,7 +417,7 @@ def get_version_releases(config):
     current_version = None
     for release in releases:
         release_parts = parse_tag_name(release["tag_name"])
-        if compare_versions(release["tag_name"], installed_version) <= 0:
+        if release_parts <= installed_version_parts :
             current_version = release
             break
 
@@ -441,9 +441,9 @@ def get_version_releases(config):
 
 def can_upgrade(config):
     if config['VERSION_RELEASES']:
-        upgrade_version_tag = config['VERSION_RELEASES']['upgrade_version']['tag_name']
-        current_version_tag = config['VERSION_RELEASES']['current_version']['tag_name']
-        return compare_versions(upgrade_version_tag, current_version_tag) == 1
+        upgrade_version = parse_tag_name(config['VERSION_RELEASES']['upgrade_version']['tag_name'])
+        current_version = parse_tag_name(config['VERSION_RELEASES']['current_version']['tag_name'])
+        return upgrade_version > current_version
     return False
 
 
@@ -751,24 +751,7 @@ def load_config(defaults: ConfigDefaultDict,
 def parse_tag_name(v):
     """parses a version tag string formatted like 'vx.x.x'"""
     base = v.split('+')[0].split('v')[-1] # remove 'v' prefix and '+editable' suffix
-    int_parts = [int(part) for part in base.split('.')]
-    return int_parts
-
-
-def compare_versions(v1, v2):
-    """
-    for two version strings v1 and v2, returns 1 if v1 is newer than v2,
-    0 if they're equivalent and -1 if v1 is older than v2.
-    """
-    v1Parts = parse_tag_name(v1)
-    v2Parts = parse_tag_name(v2)
-    for i in range(len(v1Parts)):
-        if v1Parts[i] < v2Parts[i]:
-            return -1
-
-        if v1Parts[i] > v2Parts[i]:
-            return 1
-    return 0
+    return tuple(int(part) for part in base.split('.'))
 
 
 # Logging Helpers

From d4b0660b8d48046ad8b15c96eb17de1628818315 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 16:04:02 -0800
Subject: [PATCH 045/126] add hint to use docker run instead of exec when
 catching root error fixes #1287

---
 archivebox/config.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/archivebox/config.py b/archivebox/config.py
index 775be8e4..0ee74922 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -1113,6 +1113,15 @@ def check_system_config(config: ConfigDict=CONFIG) -> None:
         stderr('[!] ArchiveBox should never be run as root!', color='red')
         stderr('    For more information, see the security overview documentation:')
         stderr('        https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#do-not-run-as-root')
+        
+        if config['IN_DOCKER']:
+            attempted_command = " ".join(sys.argv[:3])
+            stderr('')
+            stderr('    {lightred}Hint{reset}: When using Docker, ArchiveBox commands should run with {green}docker run{reset} instead of {lightyellow}docker exec{reset}, e.g.:')
+            stderr(f'        docker compose run archivebox {attempted_command}')
+            stderr('        or')
+            stderr(f'        docker run -it -v ... -p ... archivebox/archivebox {attempted_command}')
+        
         raise SystemExit(2)
 
     ### Check Python environment

From c183de29033aa6b865a7de8142e620bc3aad9c2c Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 16:04:48 -0800
Subject: [PATCH 046/126] split archivebox version into separate RUN line so
 that version can depend on VERSION.txt to get build time

---
 Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3a700784..46700c4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -276,11 +276,10 @@ ENV IN_DOCKER=True
 
 # Print version for nice docker finish summary
 RUN (echo -e "\n\n[√] Finished Docker build succesfully. Saving build summary in: /VERSION.txt" \
-    && echo -e "PLATFORM=${TARGETPLATFORM} ARCH=$(uname -m) ($(uname -s) ${TARGETARCH} ${TARGETVARIANT})" \
-    && echo -e "BUILD_END_TIME=$(date +"%Y-%m-%d %H:%M:%S %s") TZ=${TZ}\n\n" \
-    && "$CODE_DIR/bin/docker_entrypoint.sh" \
-        archivebox version 2>&1 \
+    && echo -e "PLATFORM=${TARGETPLATFORM} ARCH=$(uname -m) ($(uname -s) ${TARGETARCH} ${TARGETVARIANT})\n" \
+    && echo -e "BUILD_END_TIME=$(date +"%Y-%m-%d %H:%M:%S %s")\n\n" \
     ) | tee -a /VERSION.txt
+RUN "$CODE_DIR/bin/docker_entrypoint.sh" archivebox version 2>&1 | tee -a /VERSION.txt
 
 ####################################################
 

From 169b427fdebd247384de049dc7af8d70946e9354 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 16:05:00 -0800
Subject: [PATCH 047/126] bump min required python version to 3.7.0

---
 archivebox/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 0ee74922..424cf918 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -1125,7 +1125,7 @@ def check_system_config(config: ConfigDict=CONFIG) -> None:
         raise SystemExit(2)
 
     ### Check Python environment
-    if sys.version_info[:3] < (3, 6, 0):
+    if sys.version_info[:3] < (3, 7, 0):
         stderr(f'[X] Python version is not new enough: {config["PYTHON_VERSION"]} (>3.6 is required)', color='red')
         stderr('    See https://github.com/ArchiveBox/ArchiveBox/wiki/Troubleshooting#python for help upgrading your Python installation.')
         raise SystemExit(2)

From b9f25d84f3cfd55362db0cb79e85f4ea73d8bf3c Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 16:05:45 -0800
Subject: [PATCH 048/126] catch edge case where user sets PUID=0 or
 autodetected PUID=0 and add hints about network filesystem permissions being
 messed with

---
 bin/docker_entrypoint.sh | 45 +++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index 3f3654be..9b055fc4 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -1,20 +1,45 @@
 #!/bin/bash
 
+### Bash Environment Setup
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/
+# https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
+# set -o xtrace
+set -o errexit
+set -o errtrace
+set -o nounset
+set -o pipefail
+IFS=$'\n'
+
+# Load global config (set by Dockerfile during image build time, not intended to be customized by users at runtime)
 export DATA_DIR="${DATA_DIR:-/data}"
 export ARCHIVEBOX_USER="${ARCHIVEBOX_USER:-archivebox}"
 
-# default PUID and PGID if data dir is empty and no PUID+PGID is set
+# Global default PUID and PGID if data dir is empty and no intended PUID+PGID is set manually by user
 export DEFAULT_PUID=911
 export DEFAULT_PGID=911
 
-# if data directory already exists, autodetect detect owner by looking at files within
-export DETECTED_UID="$(stat -c '%u' "$DATA_DIR/logs/errors.log" 2>/dev/null || echo "$DEFAULT_PUID")"
-export DETECTED_GID="$(stat -c '%g' "$DATA_DIR/logs/errors.log" 2>/dev/null || echo "$DEFAULT_PGID")"
+# If user tires to set PUID and PGID to root values manually, catch and reject because root is not allowed
+if [[ "$PUID" == "0" ]] || [[ "$PGID" == "0" ]]; then
+    echo -e "\n[X] Error: Got PUID=$PUID and PGID=$PGID but ArchiveBox is not allowed to be run as root, please change or unset PUID & PGID and try again." >&2
+    echo -e "    Hint: some NFS/SMB/FUSE/etc. filesystems force-remap all permissions, leave PUID/PGID blank" >&2
+    echo -e "          or set PUID/PGID to the same value as the user/group they remap to (e.g. $DEFAULT_PUID:$DEFAULT_PGID)." >&2
+    echo -e "    https://linux.die.net/man/8/mount.cifs#:~:text=does%20not%20provide%20unix%20ownership" >&2
+    exit 3
+fi
+
+# If data directory already exists, autodetect detect owner by looking at files within
+export DETECTED_PUID="$(stat -c '%u' "$DATA_DIR/logs/errors.log" 2>/dev/null || echo "$DEFAULT_PUID")"
+export DETECTED_PGID="$(stat -c '%g' "$DATA_DIR/logs/errors.log" 2>/dev/null || echo "$DEFAULT_PGID")"
+
+# If data directory exists but is owned by root, use defaults instead of root because root is not allowed
+[[ "$DETECTED_PUID" == "0" ]] && export DETECTED_PUID="$DEFAULT_PUID"
+[[ "$DETECTED_PGID" == "0" ]] && export DETECTED_PGID="$DEFAULT_PGID"
+
 
 # Set the archivebox user to use the configured UID & GID
-# prefers PUID and PGID env vars passsed in explicitly, falls back to autodetected defaults
-usermod -o -u "${PUID:-$DETECTED_UID}" "$ARCHIVEBOX_USER" > /dev/null 2>&1
-groupmod -o -g "${PGID:-$DETECTED_GID}" "$ARCHIVEBOX_USER" > /dev/null 2>&1
+# prefer PUID and PGID env vars passsed in explicitly, falls back to autodetected values or global defaults
+usermod -o -u "${PUID:-$DETECTED_PUID}" "$ARCHIVEBOX_USER" > /dev/null 2>&1
+groupmod -o -g "${PGID:-$DETECTED_PGID}" "$ARCHIVEBOX_USER" > /dev/null 2>&1
 
 # re-set PUID and PGID to values reported by system instead of values we tried to set,
 # in case wonky filesystems or Docker setups try to play UID/GID remapping tricks on us
@@ -29,12 +54,12 @@ if [[ -d "$DATA_DIR/archive" ]]; then
         # echo "[√] Permissions are correct"
     else
      # the only time this fails is if the host filesystem doesn't allow us to write as root (e.g. some NFS mapall/maproot problems, connection issues, drive dissapeared, etc.)
-        echo -e "\n[X] Error: archivebox user (PUID=$PUID) is not able to write to your ./data dir." >&2
-        echo -e "    Change ./data to be owned by PUID=$PUID PGID=$PGID on the host and retry:"
+        echo -e "\n[X] Error: archivebox user (PUID=$PUID) is not able to write to your ./data dir (currently owned by $(stat -c '%u' "$DATA_DIR"):$(stat -c '%g' "$DATA_DIR")." >&2
+        echo -e "    Change ./data to be owned by PUID=$PUID PGID=$PGID on the host and retry:" >&2
         echo -e "       \$ chown -R $PUID:$PGID ./data\n" >&2
         echo -e "    Configure the PUID & PGID environment variables to change the desired owner:" >&2
         echo -e "       https://docs.linuxserver.io/general/understanding-puid-and-pgid\n" >&2
-        exit 1
+        exit 3
     fi
 else
     # create data directory

From 35685cf6ea44703872fffce0611e3dd5a851c5f7 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 16:06:02 -0800
Subject: [PATCH 049/126] mkdir and chown browsers directory automatically in
 entrypoint script

---
 bin/docker_entrypoint.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index 9b055fc4..2d8035e2 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -71,10 +71,11 @@ fi
 chown $PUID:$PGID "$DATA_DIR"
 chown $PUID:$PGID "$DATA_DIR"/*
 
-# also chown BROWSERS_DIR because otherwise 'archivebox setup' wont be able to install chrome
+# also chown BROWSERS_DIR because otherwise 'archivebox setup' wont be able to install chrome at runtime
 PLAYWRIGHT_BROWSERS_PATH="${PLAYWRIGHT_BROWSERS_PATH:-/browsers}"
+mkdir -p "$PLAYWRIGHT_BROWSERS_PATH"
 chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"
-chown $PUID:$PGID "${PLAYWRIGHT_BROWSERS_PATH}/*"
+chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/*
 
 # (this check is written in blood, QEMU silently breaks things in ways that are not obvious)
 export IN_QEMU="$(pmap 1 | grep qemu | wc -l | grep -E '^0$' >/dev/null && echo 'False' || echo 'True')"

From 951bba52a0341958b4286e94ad1c77268a7b181e Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 16:14:39 -0800
Subject: [PATCH 050/126] hide +editable from version string in output because
 all docker installs are editable

---
 archivebox/config.py | 2 +-
 archivebox/main.py   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 424cf918..9f373004 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -81,7 +81,7 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = {
         'IN_QEMU':                  {'type': bool,  'default': False},
         'PUID':                     {'type': int,   'default': os.getuid()},
         'PGID':                     {'type': int,   'default': os.getgid()},
-        # TODO: 'SHOW_HINTS':       {'type:  bool,  'default': True},
+        # TODO: 'SHOW_HINTS':       {'type:  bool,  'default': True},   # hints are hidden automatically once collection contains >0 Snapshots, no need to configure
     },
 
     'GENERAL_CONFIG': {
diff --git a/archivebox/main.py b/archivebox/main.py
index b0e45bac..8968dea6 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -214,7 +214,7 @@ def version(quiet: bool=False,
             out_dir: Path=OUTPUT_DIR) -> None:
     """Print the ArchiveBox version and dependency information"""
     
-    print(VERSION)
+    print(VERSION.split('+')[0])
     
     if not quiet:
         # 0.7.1
@@ -1005,9 +1005,9 @@ def setup(out_dir: Path=OUTPUT_DIR) -> None:
 
     stderr('\n    Installing SINGLEFILE_BINARY, READABILITY_BINARY, MERCURY_BINARY automatically using npm...')
     if not NODE_VERSION:
-        stderr('[X] You must first install node using your system package manager', color='red')
+        stderr('[X] You must first install node & npm using your system package manager', color='red')
         hint([
-            'curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash -',
+            'https://github.com/nodesource/distributions#table-of-contents',
             'or to disable all node-based modules run: archivebox config --set USE_NODE=False',
         ])
         raise SystemExit(1)

From 8a306dbf6fef4fef63dd4c423faba0d32117684e Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 16:57:02 -0800
Subject: [PATCH 051/126] add BUILD_TIME to archivebox version output

---
 archivebox/config.py | 11 ++++++++++-
 archivebox/main.py   | 38 ++++++++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 9f373004..785e6a60 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -391,12 +391,20 @@ def get_version(config):
 
     raise Exception('Failed to detect installed archivebox version!')
 
-def get_commit_hash(config):
+def get_commit_hash(config) -> Optional[str]:
     try:
         return list((config['PACKAGE_DIR'] / '../.git/refs/heads/').glob('*'))[0].read_text().strip()
     except Exception:
         return None
 
+def get_build_time(config) -> str:
+    if config['IN_DOCKER']:
+        docker_build_end_time = Path('/VERSION.txt').read_text().rsplit('BUILD_END_TIME=')[-1].split('\n', 1)[0]
+        return docker_build_end_time
+
+    src_last_modified_unix_timestamp = (config['PACKAGE_DIR'] / 'config.py').stat().st_mtime
+    return datetime.fromtimestamp(src_last_modified_unix_timestamp).strftime('%Y-%m-%d %H:%M:%S %s')
+
 ############################## Derived Config ##################################
 
 
@@ -425,6 +433,7 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
     'ARCHIVEBOX_BINARY':        {'default': lambda c: sys.argv[0] or bin_path('archivebox')},
     'VERSION':                  {'default': lambda c: get_version(c)},
     'COMMIT_HASH':              {'default': lambda c: get_commit_hash(c)},
+    'BUILD_TIME':               {'default': lambda c: get_build_time(c)},
     
     'PYTHON_BINARY':            {'default': lambda c: sys.executable},
     'PYTHON_ENCODING':          {'default': lambda c: sys.stdout.encoding.upper()},
diff --git a/archivebox/main.py b/archivebox/main.py
index 8968dea6..05b22b46 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -93,11 +93,13 @@ from .config import (
     SQL_INDEX_FILENAME,
     ALLOWED_IN_OUTPUT_DIR,
     SEARCH_BACKEND_ENGINE,
+    LDAP,
     check_dependencies,
     check_data_folder,
     write_config_file,
     VERSION,
     COMMIT_HASH,
+    BUILD_TIME,
     CODE_LOCATIONS,
     EXTERNAL_LOCATIONS,
     DATA_LOCATIONS,
@@ -218,31 +220,39 @@ def version(quiet: bool=False,
     
     if not quiet:
         # 0.7.1
-        # ArchiveBox v0.7.1 Cpython Linux Linux-4.19.121-linuxkit-x86_64-with-glibc2.28 x86_64 (in Docker) (in TTY)
-        # DEBUG=False IN_DOCKER=True IN_QEMU=False IS_TTY=True TZ=UTC FS_ATOMIC=True FS_REMOTE=False FS_PERMS=644 FS_USER=501:20 SEARCH_BACKEND=ripgrep
+        # ArchiveBox v0.7.1+editable COMMIT_HASH=951bba5 BUILD_TIME=2023-12-17 16:46:05 1702860365
+        # IN_DOCKER=False IN_QEMU=False ARCH=arm64 OS=Darwin PLATFORM=macOS-14.2-arm64-arm-64bit PYTHON=Cpython
+        # FS_ATOMIC=True FS_REMOTE=False FS_USER=501:20 FS_PERMS=644
+        # DEBUG=False IS_TTY=True TZ=UTC SEARCH_BACKEND=ripgrep LDAP=False
         
         p = platform.uname()
         print(
             'ArchiveBox v{}'.format(VERSION),
-            *((COMMIT_HASH[:7],) if COMMIT_HASH else ()),
-            sys.implementation.name.title(),
-            p.system,
-            platform.platform(),
-            p.machine,
+            *((f'COMMIT_HASH={COMMIT_HASH[:7]}',) if COMMIT_HASH else ()),
+            f'BUILD_TIME={BUILD_TIME}',
+        )
+        print(
+            f'IN_DOCKER={IN_DOCKER}',
+            f'IN_QEMU={IN_QEMU}',
+            f'ARCH={p.machine}',
+            f'OS={p.system}',
+            f'PLATFORM={platform.platform()}',
+            f'PYTHON={sys.implementation.name.title()}',
         )
         OUTPUT_IS_REMOTE_FS = DATA_LOCATIONS['OUTPUT_DIR']['is_mount'] or DATA_LOCATIONS['ARCHIVE_DIR']['is_mount']
         print(
-            f'DEBUG={DEBUG}',
-            f'IN_DOCKER={IN_DOCKER}',
-            f'IN_QEMU={IN_QEMU}',
-            f'IS_TTY={IS_TTY}',
-            f'TZ={TIMEZONE}',
-            #f'DB=django.db.backends.sqlite3 (({CONFIG["SQLITE_JOURNAL_MODE"]})',  # add this if we have more useful info to show eventually
             f'FS_ATOMIC={ENFORCE_ATOMIC_WRITES}',
             f'FS_REMOTE={OUTPUT_IS_REMOTE_FS}',
             f'FS_USER={PUID}:{PGID}',
             f'FS_PERMS={OUTPUT_PERMISSIONS}',
+        )
+        print(
+            f'DEBUG={DEBUG}',
+            f'IS_TTY={IS_TTY}',
+            f'TZ={TIMEZONE}',
             f'SEARCH_BACKEND={SEARCH_BACKEND_ENGINE}',
+            f'LDAP={LDAP}',
+            #f'DB=django.db.backends.sqlite3 (({CONFIG["SQLITE_JOURNAL_MODE"]})',  # add this if we have more useful info to show eventually
         )
         print()
 
@@ -271,7 +281,7 @@ def version(quiet: bool=False,
                 print(printable_folder_status(name, path))
         else:
             print()
-            print('{white}[i] Data locations:{reset}'.format(**ANSI))
+            print('{white}[i] Data locations:{reset} (not in a data directory)'.format(**ANSI))
 
         print()
         check_dependencies()

From d5f1411ed17988f0b50d7c594d65597272517637 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 16:57:40 -0800
Subject: [PATCH 052/126] exit with running as root error when PUID is 0

---
 archivebox/config.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 785e6a60..79bc5811 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -1118,15 +1118,15 @@ if not CONFIG['CHECK_SSL_VALIDITY']:
 
 def check_system_config(config: ConfigDict=CONFIG) -> None:
     ### Check system environment
-    if config['USER'] == 'root':
+    if config['USER'] == 'root' or str(config['PUID']) == "0":
         stderr('[!] ArchiveBox should never be run as root!', color='red')
         stderr('    For more information, see the security overview documentation:')
         stderr('        https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#do-not-run-as-root')
         
         if config['IN_DOCKER']:
-            attempted_command = " ".join(sys.argv[:3])
+            attempted_command = ' '.join(sys.argv[:3])
             stderr('')
-            stderr('    {lightred}Hint{reset}: When using Docker, ArchiveBox commands should run with {green}docker run{reset} instead of {lightyellow}docker exec{reset}, e.g.:')
+            stderr('    {lightred}Hint{reset}: When using Docker, you must run commands with {green}docker run{reset} instead of {lightyellow}docker exec{reset}, e.g.:')
             stderr(f'        docker compose run archivebox {attempted_command}')
             stderr('        or')
             stderr(f'        docker run -it -v ... -p ... archivebox/archivebox {attempted_command}')

From 4a4ed2cad6605fdeb86246689fea162b1c7e3e14 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 17:44:26 -0800
Subject: [PATCH 053/126] fix version string parsing

---
 Dockerfile               | 2 +-
 archivebox/config.py     | 5 ++---
 archivebox/main.py       | 5 +++--
 bin/docker_entrypoint.sh | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 46700c4a..4889cfd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -279,7 +279,7 @@ RUN (echo -e "\n\n[√] Finished Docker build succesfully. Saving build summary
     && echo -e "PLATFORM=${TARGETPLATFORM} ARCH=$(uname -m) ($(uname -s) ${TARGETARCH} ${TARGETVARIANT})\n" \
     && echo -e "BUILD_END_TIME=$(date +"%Y-%m-%d %H:%M:%S %s")\n\n" \
     ) | tee -a /VERSION.txt
-RUN "$CODE_DIR/bin/docker_entrypoint.sh" archivebox version 2>&1 | tee -a /VERSION.txt
+RUN "$CODE_DIR"/bin/docker_entrypoint.sh version 2>&1 | tee -a /VERSION.txt
 
 ####################################################
 
diff --git a/archivebox/config.py b/archivebox/config.py
index 79bc5811..29f1a265 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -431,7 +431,7 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
     'DIR_OUTPUT_PERMISSIONS':   {'default': lambda c: c['OUTPUT_PERMISSIONS'].replace('6', '7').replace('4', '5')},
 
     'ARCHIVEBOX_BINARY':        {'default': lambda c: sys.argv[0] or bin_path('archivebox')},
-    'VERSION':                  {'default': lambda c: get_version(c)},
+    'VERSION':                  {'default': lambda c: get_version(c).split('+', 1)[0]},
     'COMMIT_HASH':              {'default': lambda c: get_commit_hash(c)},
     'BUILD_TIME':               {'default': lambda c: get_build_time(c)},
     
@@ -1298,8 +1298,7 @@ def setup_django(out_dir: Path=None, check_db=False, config: ConfigDict=CONFIG,
         with open(settings.ERROR_LOG, "a", encoding='utf-8') as f:
             command = ' '.join(sys.argv)
             ts = datetime.now(timezone.utc).strftime('%Y-%m-%d__%H:%M:%S')
-            f.write(f"\n> {command}; ts={ts} version={config['VERSION']} docker={config['IN_DOCKER']} is_tty={config['IS_TTY']}\n")
-
+            f.write(f"\n> {command}; TS={ts} VERSION={config['VERSION']} IN_DOCKER={config['IN_DOCKER']} IS_TTY={config['IS_TTY']}\n")
 
         if check_db:
             # Enable WAL mode in sqlite3
diff --git a/archivebox/main.py b/archivebox/main.py
index 05b22b46..e806ee4d 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -94,6 +94,7 @@ from .config import (
     ALLOWED_IN_OUTPUT_DIR,
     SEARCH_BACKEND_ENGINE,
     LDAP,
+    get_version,
     check_dependencies,
     check_data_folder,
     write_config_file,
@@ -216,7 +217,7 @@ def version(quiet: bool=False,
             out_dir: Path=OUTPUT_DIR) -> None:
     """Print the ArchiveBox version and dependency information"""
     
-    print(VERSION.split('+')[0])
+    print(VERSION)
     
     if not quiet:
         # 0.7.1
@@ -227,7 +228,7 @@ def version(quiet: bool=False,
         
         p = platform.uname()
         print(
-            'ArchiveBox v{}'.format(VERSION),
+            'ArchiveBox v{}'.format(get_version(CONFIG)),
             *((f'COMMIT_HASH={COMMIT_HASH[:7]}',) if COMMIT_HASH else ()),
             f'BUILD_TIME={BUILD_TIME}',
         )
diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index 2d8035e2..c2abd8e8 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -6,7 +6,6 @@
 # set -o xtrace
 set -o errexit
 set -o errtrace
-set -o nounset
 set -o pipefail
 IFS=$'\n'
 

From f250762c987fb60afbbe6733010d6548ffcf1266 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 17:44:42 -0800
Subject: [PATCH 054/126] bump python requirement versions

---
 pdm.lock         | 975 +++--------------------------------------------
 requirements.txt |  36 +-
 2 files changed, 71 insertions(+), 940 deletions(-)

diff --git a/pdm.lock b/pdm.lock
index 53329a63..1f70acc9 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -2,29 +2,10 @@
 # It is not intended for manual editing.
 
 [metadata]
-groups = ["default", "build", "debug", "dev", "doc", "ldap", "lint", "sonic", "test"]
+groups = ["default", "ldap", "sonic"]
 strategy = ["cross_platform"]
-lock_version = "4.4"
-content_hash = "sha256:3355b57d87304093c9176a6387d80f5c5226b169964d8039f14a5998046faf4d"
-
-[[package]]
-name = "alabaster"
-version = "0.7.13"
-requires_python = ">=3.6"
-summary = "A configurable sidebar-enabled Sphinx theme"
-files = [
-    {file = "alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
-    {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
-]
-
-[[package]]
-name = "appnope"
-version = "0.1.3"
-summary = "Disable App Nap on macOS >= 10.9"
-files = [
-    {file = "appnope-0.1.3-py2.py3-none-any.whl", hash = "sha256:265a455292d0bd8a72453494fa24df5a11eb18373a60c7c0430889f22548605e"},
-    {file = "appnope-0.1.3.tar.gz", hash = "sha256:02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24"},
-]
+lock_version = "4.4.1"
+content_hash = "sha256:37a19e5e34763f5ea329b87a911d2422a097c3b655d07c321820f4fdd680c3b2"
 
 [[package]]
 name = "asgiref"
@@ -51,29 +32,6 @@ files = [
     {file = "asttokens-2.4.1.tar.gz", hash = "sha256:b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0"},
 ]
 
-[[package]]
-name = "babel"
-version = "2.13.1"
-requires_python = ">=3.7"
-summary = "Internationalization utilities"
-dependencies = [
-    "setuptools; python_version >= \"3.12\"",
-]
-files = [
-    {file = "Babel-2.13.1-py3-none-any.whl", hash = "sha256:7077a4984b02b6727ac10f1f7294484f737443d7e2e66c5e4380e41a3ae0b4ed"},
-    {file = "Babel-2.13.1.tar.gz", hash = "sha256:33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900"},
-]
-
-[[package]]
-name = "blinker"
-version = "1.7.0"
-requires_python = ">=3.8"
-summary = "Fast, simple object-to-object and broadcast signaling"
-files = [
-    {file = "blinker-1.7.0-py3-none-any.whl", hash = "sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9"},
-    {file = "blinker-1.7.0.tar.gz", hash = "sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182"},
-]
-
 [[package]]
 name = "brotli"
 version = "1.1.0"
@@ -168,43 +126,14 @@ files = [
     {file = "brotlicffi-1.1.0.0.tar.gz", hash = "sha256:b77827a689905143f87915310b93b273ab17888fd43ef350d4832c4a71083c13"},
 ]
 
-[[package]]
-name = "cachecontrol"
-version = "0.13.1"
-requires_python = ">=3.7"
-summary = "httplib2 caching for requests"
-dependencies = [
-    "msgpack>=0.5.2",
-    "requests>=2.16.0",
-]
-files = [
-    {file = "cachecontrol-0.13.1-py3-none-any.whl", hash = "sha256:95dedbec849f46dda3137866dc28b9d133fc9af55f5b805ab1291833e4457aa4"},
-    {file = "cachecontrol-0.13.1.tar.gz", hash = "sha256:f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b"},
-]
-
-[[package]]
-name = "cachecontrol"
-version = "0.13.1"
-extras = ["filecache"]
-requires_python = ">=3.7"
-summary = "httplib2 caching for requests"
-dependencies = [
-    "cachecontrol==0.13.1",
-    "filelock>=3.8.0",
-]
-files = [
-    {file = "cachecontrol-0.13.1-py3-none-any.whl", hash = "sha256:95dedbec849f46dda3137866dc28b9d133fc9af55f5b805ab1291833e4457aa4"},
-    {file = "cachecontrol-0.13.1.tar.gz", hash = "sha256:f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b"},
-]
-
 [[package]]
 name = "certifi"
-version = "2023.7.22"
+version = "2023.11.17"
 requires_python = ">=3.6"
 summary = "Python package for providing Mozilla's CA Bundle."
 files = [
-    {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
-    {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
+    {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"},
+    {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"},
 ]
 
 [[package]]
@@ -342,15 +271,6 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
-[[package]]
-name = "commonmark"
-version = "0.9.1"
-summary = "Python parser for the CommonMark Markdown spec"
-files = [
-    {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"},
-    {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"},
-]
-
 [[package]]
 name = "croniter"
 version = "2.0.1"
@@ -367,7 +287,7 @@ files = [
 
 [[package]]
 name = "dateparser"
-version = "1.1.8"
+version = "1.2.0"
 requires_python = ">=3.7"
 summary = "Date parsing library designed to parse dates from HTML pages"
 dependencies = [
@@ -377,8 +297,8 @@ dependencies = [
     "tzlocal",
 ]
 files = [
-    {file = "dateparser-1.1.8-py2.py3-none-any.whl", hash = "sha256:070b29b5bbf4b1ec2cd51c96ea040dc68a614de703910a91ad1abba18f9f379f"},
-    {file = "dateparser-1.1.8.tar.gz", hash = "sha256:86b8b7517efcc558f085a142cdb7620f0921543fcabdb538c8a4c4001d8178e3"},
+    {file = "dateparser-1.2.0-py2.py3-none-any.whl", hash = "sha256:0b21ad96534e562920a0083e97fd45fa959882d4162acc358705144520a35830"},
+    {file = "dateparser-1.2.0.tar.gz", hash = "sha256:7975b43a4222283e0ae15be7b4999d08c9a70e2d378ac87385b1ccf2cffbbb30"},
 ]
 
 [[package]]
@@ -391,15 +311,6 @@ files = [
     {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"},
 ]
 
-[[package]]
-name = "distlib"
-version = "0.3.7"
-summary = "Distribution utilities"
-files = [
-    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
-    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
-]
-
 [[package]]
 name = "django"
 version = "3.1.14"
@@ -429,20 +340,6 @@ files = [
     {file = "django_auth_ldap-4.1.0-py3-none-any.whl", hash = "sha256:68870e7921e84b1a9867e268a9c8a3e573e8a0d95ea08bcf31be178f5826ff36"},
 ]
 
-[[package]]
-name = "django-debug-toolbar"
-version = "3.2.4"
-requires_python = ">=3.6"
-summary = "A configurable set of panels that display various debug information about the current request/response."
-dependencies = [
-    "Django>=2.2",
-    "sqlparse>=0.2.0",
-]
-files = [
-    {file = "django-debug-toolbar-3.2.4.tar.gz", hash = "sha256:644bbd5c428d3283aa9115722471769cac1bec189edf3a0c855fd8ff870375a9"},
-    {file = "django_debug_toolbar-3.2.4-py3-none-any.whl", hash = "sha256:6b633b6cfee24f232d73569870f19aa86c819d750e7f3e833f2344a9eb4b4409"},
-]
-
 [[package]]
 name = "django-extensions"
 version = "3.1.5"
@@ -456,65 +353,14 @@ files = [
     {file = "django_extensions-3.1.5-py3-none-any.whl", hash = "sha256:9238b9e016bb0009d621e05cf56ea8ce5cce9b32e91ad2026996a7377ca28069"},
 ]
 
-[[package]]
-name = "django-stubs"
-version = "4.2.6"
-requires_python = ">=3.8"
-summary = "Mypy stubs for Django"
-dependencies = [
-    "django",
-    "django-stubs-ext>=4.2.5",
-    "tomli; python_version < \"3.11\"",
-    "types-PyYAML",
-    "types-pytz",
-    "typing-extensions",
-]
-files = [
-    {file = "django-stubs-4.2.6.tar.gz", hash = "sha256:e60b43de662a199db4b15c803c06669e0ac5035614af291cbd3b91591f7dcc94"},
-    {file = "django_stubs-4.2.6-py3-none-any.whl", hash = "sha256:2fcd257884a68dfa02de41ee5410ec805264d9b07d9b5b119e4dea82c7b8345e"},
-]
-
-[[package]]
-name = "django-stubs-ext"
-version = "4.2.5"
-requires_python = ">=3.8"
-summary = "Monkey-patching and extensions for django-stubs"
-dependencies = [
-    "django",
-    "typing-extensions",
-]
-files = [
-    {file = "django-stubs-ext-4.2.5.tar.gz", hash = "sha256:8c4d1fb5f68419b3b2474c659681a189803e27d6a5e5abf5aa0da57601b58633"},
-    {file = "django_stubs_ext-4.2.5-py3-none-any.whl", hash = "sha256:921cd7ae4614e74c234bc0fe86ee75537d163addfe1fc6f134bf03e29d86c01e"},
-]
-
-[[package]]
-name = "djdt-flamegraph"
-version = "0.2.13"
-summary = "Flamegraphs for Django Debug Toolbar"
-files = [
-    {file = "djdt_flamegraph-0.2.13-py2.py3-none-any.whl", hash = "sha256:b3252b8cc9b586829166cc158b26952626cd6f41a3ffa92dceef2f5dbe5b99a0"},
-    {file = "djdt_flamegraph-0.2.13.tar.gz", hash = "sha256:c07a71be58484636e021d4c49b129fd819f24c9128849cb59558e5141192dbf3"},
-]
-
-[[package]]
-name = "docutils"
-version = "0.18.1"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-summary = "Docutils -- Python Documentation Utilities"
-files = [
-    {file = "docutils-0.18.1-py2.py3-none-any.whl", hash = "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c"},
-    {file = "docutils-0.18.1.tar.gz", hash = "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06"},
-]
-
 [[package]]
 name = "exceptiongroup"
-version = "1.1.3"
+version = "1.2.0"
 requires_python = ">=3.7"
 summary = "Backport of PEP 654 (exception groups)"
 files = [
-    {file = "exceptiongroup-1.1.3-py3-none-any.whl", hash = "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3"},
-    {file = "exceptiongroup-1.1.3.tar.gz", hash = "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9"},
+    {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"},
+    {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"},
 ]
 
 [[package]]
@@ -527,149 +373,37 @@ files = [
     {file = "executing-2.0.1.tar.gz", hash = "sha256:35afe2ce3affba8ee97f2d69927fa823b08b472b7b994e36a52a964b93d16147"},
 ]
 
-[[package]]
-name = "filelock"
-version = "3.13.1"
-requires_python = ">=3.8"
-summary = "A platform independent file lock."
-files = [
-    {file = "filelock-3.13.1-py3-none-any.whl", hash = "sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c"},
-    {file = "filelock-3.13.1.tar.gz", hash = "sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e"},
-]
-
-[[package]]
-name = "findpython"
-version = "0.4.0"
-requires_python = ">=3.7"
-summary = "A utility to find python versions on your system"
-dependencies = [
-    "packaging>=20",
-]
-files = [
-    {file = "findpython-0.4.0-py3-none-any.whl", hash = "sha256:087148ac5935f9be458f36a05f3fa479efdf2c629f5d386c73ea481cfecff15e"},
-    {file = "findpython-0.4.0.tar.gz", hash = "sha256:18b14d115678da18ae92ee22d7001cc30915ea531053f77010ee05a39680f438"},
-]
-
-[[package]]
-name = "flake8"
-version = "6.1.0"
-requires_python = ">=3.8.1"
-summary = "the modular source code checker: pep8 pyflakes and co"
-dependencies = [
-    "mccabe<0.8.0,>=0.7.0",
-    "pycodestyle<2.12.0,>=2.11.0",
-    "pyflakes<3.2.0,>=3.1.0",
-]
-files = [
-    {file = "flake8-6.1.0-py2.py3-none-any.whl", hash = "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"},
-    {file = "flake8-6.1.0.tar.gz", hash = "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23"},
-]
-
-[[package]]
-name = "homebrew-pypi-poet"
-version = "0.10.0"
-summary = "Writes Homebrew stanzas for pypi packages"
-dependencies = [
-    "jinja2",
-    "setuptools",
-]
-files = [
-    {file = "homebrew-pypi-poet-0.10.0.tar.gz", hash = "sha256:e09e997e35a98f66445f9a39ccb33d6d93c5cd090302a59f231707eac0bf378e"},
-    {file = "homebrew_pypi_poet-0.10.0-py2.py3-none-any.whl", hash = "sha256:65824f97aea0e713c4ac18aa2ef4477aca69426554eac842eeaaddf97df3fc47"},
-]
-
 [[package]]
 name = "idna"
-version = "3.4"
+version = "3.6"
 requires_python = ">=3.5"
 summary = "Internationalized Domain Names in Applications (IDNA)"
 files = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
-
-[[package]]
-name = "imagesize"
-version = "1.4.1"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-summary = "Getting image size from png/jpeg/jpeg2000/gif file"
-files = [
-    {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"},
-    {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"},
-]
-
-[[package]]
-name = "importlib-metadata"
-version = "6.8.0"
-requires_python = ">=3.8"
-summary = "Read metadata from Python packages"
-dependencies = [
-    "zipp>=0.5",
-]
-files = [
-    {file = "importlib_metadata-6.8.0-py3-none-any.whl", hash = "sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb"},
-    {file = "importlib_metadata-6.8.0.tar.gz", hash = "sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743"},
-]
-
-[[package]]
-name = "iniconfig"
-version = "2.0.0"
-requires_python = ">=3.7"
-summary = "brain-dead simple config-ini parsing"
-files = [
-    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
-    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
-]
-
-[[package]]
-name = "installer"
-version = "0.7.0"
-requires_python = ">=3.7"
-summary = "A library for installing Python wheels."
-files = [
-    {file = "installer-0.7.0-py3-none-any.whl", hash = "sha256:05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53"},
-    {file = "installer-0.7.0.tar.gz", hash = "sha256:a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631"},
-]
-
-[[package]]
-name = "ipdb"
-version = "0.13.13"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-summary = "IPython-enabled pdb"
-dependencies = [
-    "decorator; python_version > \"3.6\" and python_version < \"3.11\"",
-    "decorator; python_version >= \"3.11\"",
-    "ipython>=7.31.1; python_version > \"3.6\" and python_version < \"3.11\"",
-    "ipython>=7.31.1; python_version >= \"3.11\"",
-    "tomli; python_version > \"3.6\" and python_version < \"3.11\"",
-]
-files = [
-    {file = "ipdb-0.13.13-py3-none-any.whl", hash = "sha256:45529994741c4ab6d2388bfa5d7b725c2cf7fe9deffabdb8a6113aa5ed449ed4"},
-    {file = "ipdb-0.13.13.tar.gz", hash = "sha256:e3ac6018ef05126d442af680aad863006ec19d02290561ac88b8b1c0b0cfc726"},
+    {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"},
+    {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"},
 ]
 
 [[package]]
 name = "ipython"
-version = "8.17.2"
+version = "8.18.1"
 requires_python = ">=3.9"
 summary = "IPython: Productive Interactive Computing"
 dependencies = [
-    "appnope; sys_platform == \"darwin\"",
     "colorama; sys_platform == \"win32\"",
     "decorator",
     "exceptiongroup; python_version < \"3.11\"",
     "jedi>=0.16",
     "matplotlib-inline",
     "pexpect>4.3; sys_platform != \"win32\"",
-    "prompt-toolkit!=3.0.37,<3.1.0,>=3.0.30",
+    "prompt-toolkit<3.1.0,>=3.0.41",
     "pygments>=2.4.0",
     "stack-data",
     "traitlets>=5",
     "typing-extensions; python_version < \"3.10\"",
 ]
 files = [
-    {file = "ipython-8.17.2-py3-none-any.whl", hash = "sha256:1e4d1d666a023e3c93585ba0d8e962867f7a111af322efff6b9c58062b3e5444"},
-    {file = "ipython-8.17.2.tar.gz", hash = "sha256:126bb57e1895594bb0d91ea3090bbd39384f6fe87c3d57fd558d0670f50339bb"},
+    {file = "ipython-8.18.1-py3-none-any.whl", hash = "sha256:e8267419d72d81955ec1177f8a29aaa90ac80ad647499201119e2f05e99aa397"},
+    {file = "ipython-8.18.1.tar.gz", hash = "sha256:ca6f079bb33457c66e233e4580ebfc4128855b4cf6370dddd73842a9563e8a27"},
 ]
 
 [[package]]
@@ -685,81 +419,6 @@ files = [
     {file = "jedi-0.19.1.tar.gz", hash = "sha256:cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd"},
 ]
 
-[[package]]
-name = "jinja2"
-version = "3.1.2"
-requires_python = ">=3.7"
-summary = "A very fast and expressive template engine."
-dependencies = [
-    "MarkupSafe>=2.0",
-]
-files = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
-
-[[package]]
-name = "markdown-it-py"
-version = "3.0.0"
-requires_python = ">=3.8"
-summary = "Python port of markdown-it. Markdown parsing, done right!"
-dependencies = [
-    "mdurl~=0.1",
-]
-files = [
-    {file = "markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"},
-    {file = "markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1"},
-]
-
-[[package]]
-name = "markupsafe"
-version = "2.1.3"
-requires_python = ">=3.7"
-summary = "Safely add untrusted strings to HTML/XML markup."
-files = [
-    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"},
-    {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
-]
-
 [[package]]
 name = "matplotlib-inline"
 version = "0.1.6"
@@ -773,79 +432,6 @@ files = [
     {file = "matplotlib_inline-0.1.6-py3-none-any.whl", hash = "sha256:f1f41aab5328aa5aaea9b16d083b128102f8712542f819fe7e6a420ff581b311"},
 ]
 
-[[package]]
-name = "mccabe"
-version = "0.7.0"
-requires_python = ">=3.6"
-summary = "McCabe checker, plugin for flake8"
-files = [
-    {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
-    {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
-]
-
-[[package]]
-name = "mdurl"
-version = "0.1.2"
-requires_python = ">=3.7"
-summary = "Markdown URL utilities"
-files = [
-    {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"},
-    {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"},
-]
-
-[[package]]
-name = "msgpack"
-version = "1.0.7"
-requires_python = ">=3.8"
-summary = "MessagePack serializer"
-files = [
-    {file = "msgpack-1.0.7-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:04ad6069c86e531682f9e1e71b71c1c3937d6014a7c3e9edd2aa81ad58842862"},
-    {file = "msgpack-1.0.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cca1b62fe70d761a282496b96a5e51c44c213e410a964bdffe0928e611368329"},
-    {file = "msgpack-1.0.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e50ebce52f41370707f1e21a59514e3375e3edd6e1832f5e5235237db933c98b"},
-    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a7b4f35de6a304b5533c238bee86b670b75b03d31b7797929caa7a624b5dda6"},
-    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28efb066cde83c479dfe5a48141a53bc7e5f13f785b92ddde336c716663039ee"},
-    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4cb14ce54d9b857be9591ac364cb08dc2d6a5c4318c1182cb1d02274029d590d"},
-    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b573a43ef7c368ba4ea06050a957c2a7550f729c31f11dd616d2ac4aba99888d"},
-    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ccf9a39706b604d884d2cb1e27fe973bc55f2890c52f38df742bc1d79ab9f5e1"},
-    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cb70766519500281815dfd7a87d3a178acf7ce95390544b8c90587d76b227681"},
-    {file = "msgpack-1.0.7-cp310-cp310-win32.whl", hash = "sha256:b610ff0f24e9f11c9ae653c67ff8cc03c075131401b3e5ef4b82570d1728f8a9"},
-    {file = "msgpack-1.0.7-cp310-cp310-win_amd64.whl", hash = "sha256:a40821a89dc373d6427e2b44b572efc36a2778d3f543299e2f24eb1a5de65415"},
-    {file = "msgpack-1.0.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:576eb384292b139821c41995523654ad82d1916da6a60cff129c715a6223ea84"},
-    {file = "msgpack-1.0.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:730076207cb816138cf1af7f7237b208340a2c5e749707457d70705715c93b93"},
-    {file = "msgpack-1.0.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:85765fdf4b27eb5086f05ac0491090fc76f4f2b28e09d9350c31aac25a5aaff8"},
-    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3476fae43db72bd11f29a5147ae2f3cb22e2f1a91d575ef130d2bf49afd21c46"},
-    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d4c80667de2e36970ebf74f42d1088cc9ee7ef5f4e8c35eee1b40eafd33ca5b"},
-    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5b0bf0effb196ed76b7ad883848143427a73c355ae8e569fa538365064188b8e"},
-    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f9a7c509542db4eceed3dcf21ee5267ab565a83555c9b88a8109dcecc4709002"},
-    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:84b0daf226913133f899ea9b30618722d45feffa67e4fe867b0b5ae83a34060c"},
-    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ec79ff6159dffcc30853b2ad612ed572af86c92b5168aa3fc01a67b0fa40665e"},
-    {file = "msgpack-1.0.7-cp311-cp311-win32.whl", hash = "sha256:3e7bf4442b310ff154b7bb9d81eb2c016b7d597e364f97d72b1acc3817a0fdc1"},
-    {file = "msgpack-1.0.7-cp311-cp311-win_amd64.whl", hash = "sha256:3f0c8c6dfa6605ab8ff0611995ee30d4f9fcff89966cf562733b4008a3d60d82"},
-    {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f0936e08e0003f66bfd97e74ee530427707297b0d0361247e9b4f59ab78ddc8b"},
-    {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:98bbd754a422a0b123c66a4c341de0474cad4a5c10c164ceed6ea090f3563db4"},
-    {file = "msgpack-1.0.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b291f0ee7961a597cbbcc77709374087fa2a9afe7bdb6a40dbbd9b127e79afee"},
-    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebbbba226f0a108a7366bf4b59bf0f30a12fd5e75100c630267d94d7f0ad20e5"},
-    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e2d69948e4132813b8d1131f29f9101bc2c915f26089a6d632001a5c1349672"},
-    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bdf38ba2d393c7911ae989c3bbba510ebbcdf4ecbdbfec36272abe350c454075"},
-    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:993584fc821c58d5993521bfdcd31a4adf025c7d745bbd4d12ccfecf695af5ba"},
-    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:52700dc63a4676669b341ba33520f4d6e43d3ca58d422e22ba66d1736b0a6e4c"},
-    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e45ae4927759289c30ccba8d9fdce62bb414977ba158286b5ddaf8df2cddb5c5"},
-    {file = "msgpack-1.0.7-cp312-cp312-win32.whl", hash = "sha256:27dcd6f46a21c18fa5e5deed92a43d4554e3df8d8ca5a47bf0615d6a5f39dbc9"},
-    {file = "msgpack-1.0.7-cp312-cp312-win_amd64.whl", hash = "sha256:7687e22a31e976a0e7fc99c2f4d11ca45eff652a81eb8c8085e9609298916dcf"},
-    {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bfef2bb6ef068827bbd021017a107194956918ab43ce4d6dc945ffa13efbc25f"},
-    {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:484ae3240666ad34cfa31eea7b8c6cd2f1fdaae21d73ce2974211df099a95d81"},
-    {file = "msgpack-1.0.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3967e4ad1aa9da62fd53e346ed17d7b2e922cba5ab93bdd46febcac39be636fc"},
-    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8dd178c4c80706546702c59529ffc005681bd6dc2ea234c450661b205445a34d"},
-    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6ffbc252eb0d229aeb2f9ad051200668fc3a9aaa8994e49f0cb2ffe2b7867e7"},
-    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:822ea70dc4018c7e6223f13affd1c5c30c0f5c12ac1f96cd8e9949acddb48a61"},
-    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:384d779f0d6f1b110eae74cb0659d9aa6ff35aaf547b3955abf2ab4c901c4819"},
-    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f64e376cd20d3f030190e8c32e1c64582eba56ac6dc7d5b0b49a9d44021b52fd"},
-    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ed82f5a7af3697b1c4786053736f24a0efd0a1b8a130d4c7bfee4b9ded0f08f"},
-    {file = "msgpack-1.0.7-cp39-cp39-win32.whl", hash = "sha256:f26a07a6e877c76a88e3cecac8531908d980d3d5067ff69213653649ec0f60ad"},
-    {file = "msgpack-1.0.7-cp39-cp39-win_amd64.whl", hash = "sha256:1dc93e8e4653bdb5910aed79f11e165c85732067614f180f70534f056da97db3"},
-    {file = "msgpack-1.0.7.tar.gz", hash = "sha256:572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87"},
-]
-
 [[package]]
 name = "mutagen"
 version = "1.47.0"
@@ -856,41 +442,6 @@ files = [
     {file = "mutagen-1.47.0.tar.gz", hash = "sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99"},
 ]
 
-[[package]]
-name = "mypy"
-version = "1.7.0"
-requires_python = ">=3.8"
-summary = "Optional static typing for Python"
-dependencies = [
-    "mypy-extensions>=1.0.0",
-    "tomli>=1.1.0; python_version < \"3.11\"",
-    "typing-extensions>=4.1.0",
-]
-files = [
-    {file = "mypy-1.7.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5da84d7bf257fd8f66b4f759a904fd2c5a765f70d8b52dde62b521972a0a2357"},
-    {file = "mypy-1.7.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a3637c03f4025f6405737570d6cbfa4f1400eb3c649317634d273687a09ffc2f"},
-    {file = "mypy-1.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b633f188fc5ae1b6edca39dae566974d7ef4e9aaaae00bc36efe1f855e5173ac"},
-    {file = "mypy-1.7.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d6ed9a3997b90c6f891138e3f83fb8f475c74db4ccaa942a1c7bf99e83a989a1"},
-    {file = "mypy-1.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:1fe46e96ae319df21359c8db77e1aecac8e5949da4773c0274c0ef3d8d1268a9"},
-    {file = "mypy-1.7.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:df67fbeb666ee8828f675fee724cc2cbd2e4828cc3df56703e02fe6a421b7401"},
-    {file = "mypy-1.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a79cdc12a02eb526d808a32a934c6fe6df07b05f3573d210e41808020aed8b5d"},
-    {file = "mypy-1.7.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f65f385a6f43211effe8c682e8ec3f55d79391f70a201575def73d08db68ead1"},
-    {file = "mypy-1.7.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e81ffd120ee24959b449b647c4b2fbfcf8acf3465e082b8d58fd6c4c2b27e46"},
-    {file = "mypy-1.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:f29386804c3577c83d76520abf18cfcd7d68264c7e431c5907d250ab502658ee"},
-    {file = "mypy-1.7.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:87c076c174e2c7ef8ab416c4e252d94c08cd4980a10967754f91571070bf5fbe"},
-    {file = "mypy-1.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6cb8d5f6d0fcd9e708bb190b224089e45902cacef6f6915481806b0c77f7786d"},
-    {file = "mypy-1.7.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d93e76c2256aa50d9c82a88e2f569232e9862c9982095f6d54e13509f01222fc"},
-    {file = "mypy-1.7.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:cddee95dea7990e2215576fae95f6b78a8c12f4c089d7e4367564704e99118d3"},
-    {file = "mypy-1.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:d01921dbd691c4061a3e2ecdbfbfad029410c5c2b1ee88946bf45c62c6c91210"},
-    {file = "mypy-1.7.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c1b06b4b109e342f7dccc9efda965fc3970a604db70f8560ddfdee7ef19afb05"},
-    {file = "mypy-1.7.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf7a2f0a6907f231d5e41adba1a82d7d88cf1f61a70335889412dec99feeb0f8"},
-    {file = "mypy-1.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:551d4a0cdcbd1d2cccdcc7cb516bb4ae888794929f5b040bb51aae1846062901"},
-    {file = "mypy-1.7.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55d28d7963bef00c330cb6461db80b0b72afe2f3c4e2963c99517cf06454e665"},
-    {file = "mypy-1.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:870bd1ffc8a5862e593185a4c169804f2744112b4a7c55b93eb50f48e7a77010"},
-    {file = "mypy-1.7.0-py3-none-any.whl", hash = "sha256:96650d9a4c651bc2a4991cf46f100973f656d69edc7faf91844e87fe627f7e96"},
-    {file = "mypy-1.7.0.tar.gz", hash = "sha256:1e280b5697202efa698372d2f39e9a6713a0395a756b1c6bd48995f8d72690dc"},
-]
-
 [[package]]
 name = "mypy-extensions"
 version = "1.0.0"
@@ -901,16 +452,6 @@ files = [
     {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
 ]
 
-[[package]]
-name = "packaging"
-version = "23.2"
-requires_python = ">=3.7"
-summary = "Core utilities for Python packages"
-files = [
-    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
-    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
-]
-
 [[package]]
 name = "parso"
 version = "0.8.3"
@@ -921,80 +462,29 @@ files = [
     {file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"},
 ]
 
-[[package]]
-name = "pdm"
-version = "2.10.1"
-requires_python = ">=3.7"
-summary = "A modern Python package and dependency manager supporting the latest PEP standards"
-dependencies = [
-    "blinker",
-    "cachecontrol[filecache]>=0.13.0",
-    "certifi",
-    "findpython<1.0.0a0,>=0.4.0",
-    "importlib-metadata>=3.6; python_version < \"3.10\"",
-    "installer<0.8,>=0.7",
-    "packaging!=22.0,>=20.9",
-    "platformdirs",
-    "pyproject-hooks",
-    "python-dotenv>=0.15",
-    "requests-toolbelt",
-    "resolvelib>=1.0.1",
-    "rich>=12.3.0",
-    "shellingham>=1.3.2",
-    "tomli>=1.1.0; python_version < \"3.11\"",
-    "tomlkit<1,>=0.11.1",
-    "truststore; python_version >= \"3.10\"",
-    "unearth>=0.12.1",
-    "virtualenv>=20",
-]
-files = [
-    {file = "pdm-2.10.1-py3-none-any.whl", hash = "sha256:2b2853b83830ed110a8a1eb3feb62cf4e55165de4809a5278bc9453c788898d3"},
-    {file = "pdm-2.10.1.tar.gz", hash = "sha256:d166531c659fc4905933546544dd2e16cf648c2ba6d898c82126ad6a42117a81"},
-]
-
 [[package]]
 name = "pexpect"
-version = "4.8.0"
+version = "4.9.0"
 summary = "Pexpect allows easy control of interactive console applications."
 dependencies = [
     "ptyprocess>=0.5",
 ]
 files = [
-    {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"},
-    {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"},
-]
-
-[[package]]
-name = "platformdirs"
-version = "3.11.0"
-requires_python = ">=3.7"
-summary = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-files = [
-    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
-    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
-]
-
-[[package]]
-name = "pluggy"
-version = "1.3.0"
-requires_python = ">=3.8"
-summary = "plugin and hook calling mechanisms for python"
-files = [
-    {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"},
-    {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"},
+    {file = "pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523"},
+    {file = "pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"},
 ]
 
 [[package]]
 name = "prompt-toolkit"
-version = "3.0.40"
+version = "3.0.43"
 requires_python = ">=3.7.0"
 summary = "Library for building powerful interactive command lines in Python"
 dependencies = [
     "wcwidth",
 ]
 files = [
-    {file = "prompt_toolkit-3.0.40-py3-none-any.whl", hash = "sha256:99ba3dfb23d5b5af89712f89e60a5f3d9b8b67a9482ca377c5771d0e9047a34b"},
-    {file = "prompt_toolkit-3.0.40.tar.gz", hash = "sha256:a371c06bb1d66cd499fecd708e50c0b6ae00acba9822ba33c586e2f16d1b739e"},
+    {file = "prompt_toolkit-3.0.43-py3-none-any.whl", hash = "sha256:a11a29cb3bf0a28a387fe5122cdb649816a957cd9261dcedf8c9f1fef33eacf6"},
+    {file = "prompt_toolkit-3.0.43.tar.gz", hash = "sha256:3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d"},
 ]
 
 [[package]]
@@ -1017,12 +507,12 @@ files = [
 
 [[package]]
 name = "pyasn1"
-version = "0.5.0"
+version = "0.5.1"
 requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
 summary = "Pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208)"
 files = [
-    {file = "pyasn1-0.5.0-py2.py3-none-any.whl", hash = "sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57"},
-    {file = "pyasn1-0.5.0.tar.gz", hash = "sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde"},
+    {file = "pyasn1-0.5.1-py2.py3-none-any.whl", hash = "sha256:4439847c58d40b1d0a573d07e3856e95333f1976294494c325775aeca506eb58"},
+    {file = "pyasn1-0.5.1.tar.gz", hash = "sha256:6d391a96e59b23130a5cfa74d6fd7f388dbbe26cc8f1edf39fdddf08d9d6676c"},
 ]
 
 [[package]]
@@ -1038,16 +528,6 @@ files = [
     {file = "pyasn1_modules-0.3.0.tar.gz", hash = "sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c"},
 ]
 
-[[package]]
-name = "pycodestyle"
-version = "2.11.1"
-requires_python = ">=3.8"
-summary = "Python style guide checker"
-files = [
-    {file = "pycodestyle-2.11.1-py2.py3-none-any.whl", hash = "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"},
-    {file = "pycodestyle-2.11.1.tar.gz", hash = "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f"},
-]
-
 [[package]]
 name = "pycparser"
 version = "2.21"
@@ -1087,55 +567,14 @@ files = [
     {file = "pycryptodomex-3.19.0.tar.gz", hash = "sha256:af83a554b3f077564229865c45af0791be008ac6469ef0098152139e6bd4b5b6"},
 ]
 
-[[package]]
-name = "pyflakes"
-version = "3.1.0"
-requires_python = ">=3.8"
-summary = "passive checker of Python programs"
-files = [
-    {file = "pyflakes-3.1.0-py2.py3-none-any.whl", hash = "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774"},
-    {file = "pyflakes-3.1.0.tar.gz", hash = "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"},
-]
-
 [[package]]
 name = "pygments"
-version = "2.16.1"
+version = "2.17.2"
 requires_python = ">=3.7"
 summary = "Pygments is a syntax highlighting package written in Python."
 files = [
-    {file = "Pygments-2.16.1-py3-none-any.whl", hash = "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692"},
-    {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"},
-]
-
-[[package]]
-name = "pyproject-hooks"
-version = "1.0.0"
-requires_python = ">=3.7"
-summary = "Wrappers to call pyproject.toml-based build backend hooks."
-dependencies = [
-    "tomli>=1.1.0; python_version < \"3.11\"",
-]
-files = [
-    {file = "pyproject_hooks-1.0.0-py3-none-any.whl", hash = "sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8"},
-    {file = "pyproject_hooks-1.0.0.tar.gz", hash = "sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5"},
-]
-
-[[package]]
-name = "pytest"
-version = "7.4.3"
-requires_python = ">=3.7"
-summary = "pytest: simple powerful testing with Python"
-dependencies = [
-    "colorama; sys_platform == \"win32\"",
-    "exceptiongroup>=1.0.0rc8; python_version < \"3.11\"",
-    "iniconfig",
-    "packaging",
-    "pluggy<2.0,>=0.12",
-    "tomli>=1.0.0; python_version < \"3.11\"",
-]
-files = [
-    {file = "pytest-7.4.3-py3-none-any.whl", hash = "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac"},
-    {file = "pytest-7.4.3.tar.gz", hash = "sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5"},
+    {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"},
+    {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"},
 ]
 
 [[package]]
@@ -1163,19 +602,9 @@ files = [
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
 
-[[package]]
-name = "python-dotenv"
-version = "1.0.0"
-requires_python = ">=3.8"
-summary = "Read key-value pairs from a .env file and set them as environment variables"
-files = [
-    {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"},
-    {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"},
-]
-
 [[package]]
 name = "python-ldap"
-version = "3.4.3"
+version = "3.4.4"
 requires_python = ">=3.6"
 summary = "Python modules for implementing LDAP clients"
 dependencies = [
@@ -1183,7 +612,7 @@ dependencies = [
     "pyasn1>=0.3.7",
 ]
 files = [
-    {file = "python-ldap-3.4.3.tar.gz", hash = "sha256:ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0"},
+    {file = "python-ldap-3.4.4.tar.gz", hash = "sha256:7edb0accec4e037797705f3a05cbf36a9fde50d08c8f67f2aef99a2628fab828"},
 ]
 
 [[package]]
@@ -1195,20 +624,6 @@ files = [
     {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"},
 ]
 
-[[package]]
-name = "recommonmark"
-version = "0.7.1"
-summary = "A docutils-compatibility bridge to CommonMark, enabling you to write CommonMark inside of Docutils & Sphinx projects."
-dependencies = [
-    "commonmark>=0.8.1",
-    "docutils>=0.11",
-    "sphinx>=1.3.1",
-]
-files = [
-    {file = "recommonmark-0.7.1-py2.py3-none-any.whl", hash = "sha256:1b1db69af0231efce3fa21b94ff627ea33dee7079a01dd0a7f8482c3da148b3f"},
-    {file = "recommonmark-0.7.1.tar.gz", hash = "sha256:bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67"},
-]
-
 [[package]]
 name = "regex"
 version = "2023.10.3"
@@ -1292,62 +707,6 @@ files = [
     {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
 ]
 
-[[package]]
-name = "requests-toolbelt"
-version = "1.0.0"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-summary = "A utility belt for advanced users of python-requests"
-dependencies = [
-    "requests<3.0.0,>=2.0.1",
-]
-files = [
-    {file = "requests-toolbelt-1.0.0.tar.gz", hash = "sha256:7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6"},
-    {file = "requests_toolbelt-1.0.0-py2.py3-none-any.whl", hash = "sha256:cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06"},
-]
-
-[[package]]
-name = "resolvelib"
-version = "1.0.1"
-summary = "Resolve abstract dependencies into concrete ones"
-files = [
-    {file = "resolvelib-1.0.1-py2.py3-none-any.whl", hash = "sha256:d2da45d1a8dfee81bdd591647783e340ef3bcb104b54c383f70d422ef5cc7dbf"},
-    {file = "resolvelib-1.0.1.tar.gz", hash = "sha256:04ce76cbd63fded2078ce224785da6ecd42b9564b1390793f64ddecbe997b309"},
-]
-
-[[package]]
-name = "rich"
-version = "13.6.0"
-requires_python = ">=3.7.0"
-summary = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
-dependencies = [
-    "markdown-it-py>=2.2.0",
-    "pygments<3.0.0,>=2.13.0",
-]
-files = [
-    {file = "rich-13.6.0-py3-none-any.whl", hash = "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245"},
-    {file = "rich-13.6.0.tar.gz", hash = "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef"},
-]
-
-[[package]]
-name = "setuptools"
-version = "68.2.2"
-requires_python = ">=3.8"
-summary = "Easily download, build, install, upgrade, and uninstall Python packages"
-files = [
-    {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
-    {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
-]
-
-[[package]]
-name = "shellingham"
-version = "1.5.4"
-requires_python = ">=3.7"
-summary = "Tool to Detect Surrounding Shell"
-files = [
-    {file = "shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686"},
-    {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"},
-]
-
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -1358,15 +717,6 @@ files = [
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
 
-[[package]]
-name = "snowballstemmer"
-version = "2.2.0"
-summary = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms."
-files = [
-    {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"},
-    {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"},
-]
-
 [[package]]
 name = "sonic-client"
 version = "1.0.0"
@@ -1376,138 +726,6 @@ files = [
     {file = "sonic_client-1.0.0-py3-none-any.whl", hash = "sha256:291bf292861e97a2dd765ff0c8754ea9631383680d31a63ec3da6f5aa5f4beda"},
 ]
 
-[[package]]
-name = "sphinx"
-version = "7.2.6"
-requires_python = ">=3.9"
-summary = "Python documentation generator"
-dependencies = [
-    "Jinja2>=3.0",
-    "Pygments>=2.14",
-    "alabaster<0.8,>=0.7",
-    "babel>=2.9",
-    "colorama>=0.4.5; sys_platform == \"win32\"",
-    "docutils<0.21,>=0.18.1",
-    "imagesize>=1.3",
-    "importlib-metadata>=4.8; python_version < \"3.10\"",
-    "packaging>=21.0",
-    "requests>=2.25.0",
-    "snowballstemmer>=2.0",
-    "sphinxcontrib-applehelp",
-    "sphinxcontrib-devhelp",
-    "sphinxcontrib-htmlhelp>=2.0.0",
-    "sphinxcontrib-jsmath",
-    "sphinxcontrib-qthelp",
-    "sphinxcontrib-serializinghtml>=1.1.9",
-]
-files = [
-    {file = "sphinx-7.2.6-py3-none-any.whl", hash = "sha256:1e09160a40b956dc623c910118fa636da93bd3ca0b9876a7b3df90f07d691560"},
-    {file = "sphinx-7.2.6.tar.gz", hash = "sha256:9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5"},
-]
-
-[[package]]
-name = "sphinx-rtd-theme"
-version = "1.3.0"
-requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
-summary = "Read the Docs theme for Sphinx"
-dependencies = [
-    "docutils<0.19",
-    "sphinx<8,>=1.6",
-    "sphinxcontrib-jquery<5,>=4",
-]
-files = [
-    {file = "sphinx_rtd_theme-1.3.0-py2.py3-none-any.whl", hash = "sha256:46ddef89cc2416a81ecfbeaceab1881948c014b1b6e4450b815311a89fb977b0"},
-    {file = "sphinx_rtd_theme-1.3.0.tar.gz", hash = "sha256:590b030c7abb9cf038ec053b95e5380b5c70d61591eb0b552063fbe7c41f0931"},
-]
-
-[[package]]
-name = "sphinxcontrib-applehelp"
-version = "1.0.7"
-requires_python = ">=3.9"
-summary = "sphinxcontrib-applehelp is a Sphinx extension which outputs Apple help books"
-dependencies = [
-    "Sphinx>=5",
-]
-files = [
-    {file = "sphinxcontrib_applehelp-1.0.7-py3-none-any.whl", hash = "sha256:094c4d56209d1734e7d252f6e0b3ccc090bd52ee56807a5d9315b19c122ab15d"},
-    {file = "sphinxcontrib_applehelp-1.0.7.tar.gz", hash = "sha256:39fdc8d762d33b01a7d8f026a3b7d71563ea3b72787d5f00ad8465bd9d6dfbfa"},
-]
-
-[[package]]
-name = "sphinxcontrib-devhelp"
-version = "1.0.5"
-requires_python = ">=3.9"
-summary = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp documents"
-dependencies = [
-    "Sphinx>=5",
-]
-files = [
-    {file = "sphinxcontrib_devhelp-1.0.5-py3-none-any.whl", hash = "sha256:fe8009aed765188f08fcaadbb3ea0d90ce8ae2d76710b7e29ea7d047177dae2f"},
-    {file = "sphinxcontrib_devhelp-1.0.5.tar.gz", hash = "sha256:63b41e0d38207ca40ebbeabcf4d8e51f76c03e78cd61abe118cf4435c73d4212"},
-]
-
-[[package]]
-name = "sphinxcontrib-htmlhelp"
-version = "2.0.4"
-requires_python = ">=3.9"
-summary = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files"
-dependencies = [
-    "Sphinx>=5",
-]
-files = [
-    {file = "sphinxcontrib_htmlhelp-2.0.4-py3-none-any.whl", hash = "sha256:8001661c077a73c29beaf4a79968d0726103c5605e27db92b9ebed8bab1359e9"},
-    {file = "sphinxcontrib_htmlhelp-2.0.4.tar.gz", hash = "sha256:6c26a118a05b76000738429b724a0568dbde5b72391a688577da08f11891092a"},
-]
-
-[[package]]
-name = "sphinxcontrib-jquery"
-version = "4.1"
-requires_python = ">=2.7"
-summary = "Extension to include jQuery on newer Sphinx releases"
-dependencies = [
-    "Sphinx>=1.8",
-]
-files = [
-    {file = "sphinxcontrib-jquery-4.1.tar.gz", hash = "sha256:1620739f04e36a2c779f1a131a2dfd49b2fd07351bf1968ced074365933abc7a"},
-    {file = "sphinxcontrib_jquery-4.1-py2.py3-none-any.whl", hash = "sha256:f936030d7d0147dd026a4f2b5a57343d233f1fc7b363f68b3d4f1cb0993878ae"},
-]
-
-[[package]]
-name = "sphinxcontrib-jsmath"
-version = "1.0.1"
-requires_python = ">=3.5"
-summary = "A sphinx extension which renders display math in HTML via JavaScript"
-files = [
-    {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"},
-    {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"},
-]
-
-[[package]]
-name = "sphinxcontrib-qthelp"
-version = "1.0.6"
-requires_python = ">=3.9"
-summary = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp documents"
-dependencies = [
-    "Sphinx>=5",
-]
-files = [
-    {file = "sphinxcontrib_qthelp-1.0.6-py3-none-any.whl", hash = "sha256:bf76886ee7470b934e363da7a954ea2825650013d367728588732c7350f49ea4"},
-    {file = "sphinxcontrib_qthelp-1.0.6.tar.gz", hash = "sha256:62b9d1a186ab7f5ee3356d906f648cacb7a6bdb94d201ee7adf26db55092982d"},
-]
-
-[[package]]
-name = "sphinxcontrib-serializinghtml"
-version = "1.1.9"
-requires_python = ">=3.9"
-summary = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)"
-dependencies = [
-    "Sphinx>=5",
-]
-files = [
-    {file = "sphinxcontrib_serializinghtml-1.1.9-py3-none-any.whl", hash = "sha256:9b36e503703ff04f20e9675771df105e58aa029cfcbc23b8ed716019b7416ae1"},
-    {file = "sphinxcontrib_serializinghtml-1.1.9.tar.gz", hash = "sha256:0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54"},
-]
-
 [[package]]
 name = "sqlparse"
 version = "0.4.4"
@@ -1532,72 +750,24 @@ files = [
     {file = "stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9"},
 ]
 
-[[package]]
-name = "tomli"
-version = "2.0.1"
-requires_python = ">=3.7"
-summary = "A lil' TOML parser"
-files = [
-    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
-    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
-]
-
-[[package]]
-name = "tomlkit"
-version = "0.12.2"
-requires_python = ">=3.7"
-summary = "Style preserving TOML library"
-files = [
-    {file = "tomlkit-0.12.2-py3-none-any.whl", hash = "sha256:eeea7ac7563faeab0a1ed8fe12c2e5a51c61f933f2502f7e9db0241a65163ad0"},
-    {file = "tomlkit-0.12.2.tar.gz", hash = "sha256:df32fab589a81f0d7dc525a4267b6d7a64ee99619cbd1eeb0fae32c1dd426977"},
-]
-
 [[package]]
 name = "traitlets"
-version = "5.13.0"
+version = "5.14.0"
 requires_python = ">=3.8"
 summary = "Traitlets Python configuration system"
 files = [
-    {file = "traitlets-5.13.0-py3-none-any.whl", hash = "sha256:baf991e61542da48fe8aef8b779a9ea0aa38d8a54166ee250d5af5ecf4486619"},
-    {file = "traitlets-5.13.0.tar.gz", hash = "sha256:9b232b9430c8f57288c1024b34a8f0251ddcc47268927367a0dd3eeaca40deb5"},
-]
-
-[[package]]
-name = "truststore"
-version = "0.8.0"
-requires_python = ">= 3.10"
-summary = "Verify certificates using native system trust stores"
-files = [
-    {file = "truststore-0.8.0-py3-none-any.whl", hash = "sha256:e37a5642ae9fc48caa8f120b6283d77225d600d224965a672c9e8ef49ce4bb4c"},
-    {file = "truststore-0.8.0.tar.gz", hash = "sha256:dc70da89634944a579bfeec70a7a4523c53ffdb3cf52d1bb4a431fda278ddb96"},
-]
-
-[[package]]
-name = "types-pytz"
-version = "2023.3.1.1"
-summary = "Typing stubs for pytz"
-files = [
-    {file = "types-pytz-2023.3.1.1.tar.gz", hash = "sha256:cc23d0192cd49c8f6bba44ee0c81e4586a8f30204970fc0894d209a6b08dab9a"},
-    {file = "types_pytz-2023.3.1.1-py3-none-any.whl", hash = "sha256:1999a123a3dc0e39a2ef6d19f3f8584211de9e6a77fe7a0259f04a524e90a5cf"},
-]
-
-[[package]]
-name = "types-pyyaml"
-version = "6.0.12.12"
-summary = "Typing stubs for PyYAML"
-files = [
-    {file = "types-PyYAML-6.0.12.12.tar.gz", hash = "sha256:334373d392fde0fdf95af5c3f1661885fa10c52167b14593eb856289e1855062"},
-    {file = "types_PyYAML-6.0.12.12-py3-none-any.whl", hash = "sha256:c05bc6c158facb0676674b7f11fe3960db4f389718e19e62bd2b84d6205cfd24"},
+    {file = "traitlets-5.14.0-py3-none-any.whl", hash = "sha256:f14949d23829023013c47df20b4a76ccd1a85effb786dc060f34de7948361b33"},
+    {file = "traitlets-5.14.0.tar.gz", hash = "sha256:fcdaa8ac49c04dfa0ed3ee3384ef6dfdb5d6f3741502be247279407679296772"},
 ]
 
 [[package]]
 name = "typing-extensions"
-version = "4.8.0"
+version = "4.9.0"
 requires_python = ">=3.8"
 summary = "Backported and Experimental Type Hints for Python 3.8+"
 files = [
-    {file = "typing_extensions-4.8.0-py3-none-any.whl", hash = "sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0"},
-    {file = "typing_extensions-4.8.0.tar.gz", hash = "sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef"},
+    {file = "typing_extensions-4.9.0-py3-none-any.whl", hash = "sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd"},
+    {file = "typing_extensions-4.9.0.tar.gz", hash = "sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783"},
 ]
 
 [[package]]
@@ -1623,20 +793,6 @@ files = [
     {file = "tzlocal-5.2.tar.gz", hash = "sha256:8d399205578f1a9342816409cc1e46a93ebd5755e39ea2d85334bea911bf0e6e"},
 ]
 
-[[package]]
-name = "unearth"
-version = "0.12.1"
-requires_python = ">=3.7"
-summary = "A utility to fetch and download python packages"
-dependencies = [
-    "packaging>=20",
-    "requests>=2.25",
-]
-files = [
-    {file = "unearth-0.12.1-py3-none-any.whl", hash = "sha256:a5a5c51ca44965cbe3618116bd592bb0bbe3705af5fe14e5792660d904aad7c8"},
-    {file = "unearth-0.12.1.tar.gz", hash = "sha256:4caad941b60f51e50fdc109866234d407910aef77f1233aa1b6b5d168c7427ee"},
-]
-
 [[package]]
 name = "urllib3"
 version = "2.1.0"
@@ -1647,21 +803,6 @@ files = [
     {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"},
 ]
 
-[[package]]
-name = "virtualenv"
-version = "20.24.6"
-requires_python = ">=3.7"
-summary = "Virtual Python Environment builder"
-dependencies = [
-    "distlib<1,>=0.3.7",
-    "filelock<4,>=3.12.2",
-    "platformdirs<4,>=3.9.1",
-]
-files = [
-    {file = "virtualenv-20.24.6-py3-none-any.whl", hash = "sha256:520d056652454c5098a00c0f073611ccbea4c79089331f60bf9d7ba247bb7381"},
-    {file = "virtualenv-20.24.6.tar.gz", hash = "sha256:02ece4f56fbf939dbbc33c0715159951d6bf14aaf5457b092e4548e1382455af"},
-]
-
 [[package]]
 name = "w3lib"
 version = "2.1.2"
@@ -1674,11 +815,11 @@ files = [
 
 [[package]]
 name = "wcwidth"
-version = "0.2.10"
+version = "0.2.12"
 summary = "Measures the displayed width of unicode strings in a terminal"
 files = [
-    {file = "wcwidth-0.2.10-py2.py3-none-any.whl", hash = "sha256:aec5179002dd0f0d40c456026e74a729661c9d468e1ed64405e3a6c2176ca36f"},
-    {file = "wcwidth-0.2.10.tar.gz", hash = "sha256:390c7454101092a6a5e43baad8f83de615463af459201709556b6e4b1c861f97"},
+    {file = "wcwidth-0.2.12-py2.py3-none-any.whl", hash = "sha256:f26ec43d96c8cbfed76a5075dac87680124fa84e0855195a6184da9c187f133c"},
+    {file = "wcwidth-0.2.12.tar.gz", hash = "sha256:f01c104efdf57971bcb756f054dd58ddec5204dd15fa31d6503ea57947d97c02"},
 ]
 
 [[package]]
@@ -1750,40 +891,22 @@ files = [
     {file = "websockets-12.0.tar.gz", hash = "sha256:81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b"},
 ]
 
-[[package]]
-name = "wheel"
-version = "0.41.3"
-requires_python = ">=3.7"
-summary = "A built-package format for Python"
-files = [
-    {file = "wheel-0.41.3-py3-none-any.whl", hash = "sha256:488609bc63a29322326e05560731bf7bfea8e48ad646e1f5e40d366607de0942"},
-    {file = "wheel-0.41.3.tar.gz", hash = "sha256:4d4987ce51a49370ea65c0bfd2234e8ce80a12780820d9dc462597a6e60d0841"},
-]
-
 [[package]]
 name = "yt-dlp"
-version = "2023.10.13"
+version = "2023.11.16"
 requires_python = ">=3.7"
 summary = "A youtube-dl fork with additional features and patches"
 dependencies = [
-    "brotli; platform_python_implementation == \"CPython\"",
-    "brotlicffi; platform_python_implementation != \"CPython\"",
+    "brotli; implementation_name == \"cpython\"",
+    "brotlicffi; implementation_name != \"cpython\"",
     "certifi",
     "mutagen",
     "pycryptodomex",
+    "requests<3,>=2.31.0",
+    "urllib3<3,>=1.26.17",
     "websockets",
 ]
 files = [
-    {file = "yt-dlp-2023.10.13.tar.gz", hash = "sha256:e026ea1c435ff36eef1215bc4c5bb8c479938b90054997ba99f63a4541fe63b4"},
-    {file = "yt_dlp-2023.10.13-py2.py3-none-any.whl", hash = "sha256:2b069f22675532eebacdfd6372b1825651a751fef848de9ae6efe6491b2dc38a"},
-]
-
-[[package]]
-name = "zipp"
-version = "3.17.0"
-requires_python = ">=3.8"
-summary = "Backport of pathlib-compatible object wrapper for zip files"
-files = [
-    {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"},
-    {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"},
+    {file = "yt-dlp-2023.11.16.tar.gz", hash = "sha256:f0ccdaf12e08b15902601a4671c7ab12906d7b11de3ae75fa6506811c24ec5da"},
+    {file = "yt_dlp-2023.11.16-py2.py3-none-any.whl", hash = "sha256:0322ba85aa4afdb75f8641ed550e5958964daff034aeb477abb15031fd9a51ed"},
 ]
diff --git a/requirements.txt b/requirements.txt
index aa1cd8b6..b3c21b49 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,35 +1,41 @@
 # This file is @generated by PDM.
 # Please do not edit it manually.
 
-appnope==0.1.3
 asgiref==3.7.2
 asttokens==2.4.1
-brotli==1.1.0
-certifi==2023.7.22
+brotli==1.1.0; implementation_name == "cpython"
+brotlicffi==1.1.0.0; implementation_name != "cpython"
+certifi==2023.11.17
+cffi==1.16.0; implementation_name != "cpython"
 charset-normalizer==3.3.2
+colorama==0.4.6; sys_platform == "win32"
 croniter==2.0.1
-dateparser==1.1.8
+dateparser==1.2.0
 decorator==5.1.1
 django==3.1.14
+django-auth-ldap==4.1.0
 django-extensions==3.1.5
+exceptiongroup==1.2.0; python_version < "3.11"
 executing==2.0.1
-idna==3.4
-ipython==8.17.2
+idna==3.6
+ipython==8.18.1
 jedi==0.19.1
 matplotlib-inline==0.1.6
 mutagen==1.47.0
 mypy-extensions==1.0.0
 parso==0.8.3
-pexpect==4.8.0
-prompt-toolkit==3.0.40
-ptyprocess==0.7.0
+pexpect==4.9.0; sys_platform != "win32"
+prompt-toolkit==3.0.43
+ptyprocess==0.7.0; sys_platform != "win32"
 pure-eval==0.2.2
-pyasn1==0.5.0
+pyasn1==0.5.1
 pyasn1-modules==0.3.0
+pycparser==2.21; implementation_name != "cpython"
 pycryptodomex==3.19.0
-pygments==2.16.1
+pygments==2.17.2
 python-crontab==3.0.0
 python-dateutil==2.8.2
+python-ldap==3.4.4
 pytz==2023.3.post1
 regex==2023.10.3
 requests==2.31.0
@@ -37,10 +43,12 @@ six==1.16.0
 sonic-client==1.0.0
 sqlparse==0.4.4
 stack-data==0.6.3
-traitlets==5.13.0
+traitlets==5.14.0
+typing-extensions==4.9.0; python_version < "3.11"
+tzdata==2023.3; platform_system == "Windows"
 tzlocal==5.2
 urllib3==2.1.0
 w3lib==2.1.2
-wcwidth==0.2.10
+wcwidth==0.2.12
 websockets==12.0
-yt-dlp==2023.11.14
+yt-dlp==2023.11.16

From 1ce228e9bb8567bb8f7ed9ea135500cbc20facaa Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 17:51:36 -0800
Subject: [PATCH 055/126] fix /browsers/* does not exist chown error

---
 bin/docker_entrypoint.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index c2abd8e8..70699b2a 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -74,8 +74,10 @@ chown $PUID:$PGID "$DATA_DIR"/*
 PLAYWRIGHT_BROWSERS_PATH="${PLAYWRIGHT_BROWSERS_PATH:-/browsers}"
 mkdir -p "$PLAYWRIGHT_BROWSERS_PATH"
 chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"
+touch "$PLAYWRIGHT_BROWSERS_PATH"/.permissions_test_safe_to_delete
 chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/*
 
+
 # (this check is written in blood, QEMU silently breaks things in ways that are not obvious)
 export IN_QEMU="$(pmap 1 | grep qemu | wc -l | grep -E '^0$' >/dev/null && echo 'False' || echo 'True')"
 if [[ "$IN_QEMU" == 'True' ]]; then

From b82297a61a60b26653114d12e7b1ef74d51a3309 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 17:55:35 -0800
Subject: [PATCH 056/126] bump python versions supported in pyproject.toml

---
 pyproject.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index a7a6f461..75227234 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,9 @@ classifiers = [
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Indexing/Search",
     "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",

From c259b3f2fd3f8d001307b16922f10e1915f20c64 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 17:59:10 -0800
Subject: [PATCH 057/126] fix browsers chown on startup again

---
 bin/docker_entrypoint.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index 70699b2a..d2509cc9 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -75,7 +75,8 @@ PLAYWRIGHT_BROWSERS_PATH="${PLAYWRIGHT_BROWSERS_PATH:-/browsers}"
 mkdir -p "$PLAYWRIGHT_BROWSERS_PATH"
 chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"
 touch "$PLAYWRIGHT_BROWSERS_PATH"/.permissions_test_safe_to_delete
-chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/*
+chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/*.*
+rm -f "$PLAYWRIGHT_BROWSERS_PATH"/.permissions_test_safe_to_delete
 
 
 # (this check is written in blood, QEMU silently breaks things in ways that are not obvious)
@@ -86,6 +87,7 @@ if [[ "$IN_QEMU" == 'True' ]]; then
     echo -e "    See here for more info: https://github.com/microsoft/playwright/issues/17395#issuecomment-1250830493\n" >&2
 fi
 
+
 # Drop permissions to run commands as the archivebox user
 if [[ "$1" == /* || "$1" == "bash" || "$1" == "sh" || "$1" == "echo" || "$1" == "cat" || "$1" == "archivebox" ]]; then
     # handle "docker run archivebox /some/non-archivebox/command --with=some args" by passing args directly to bash -c

From 6d2c4f9e390ee6101d13fd01a5af167e4e0dab2f Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 21:02:16 -0800
Subject: [PATCH 058/126] dont include docs in docker builds

---
 .dockerignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.dockerignore b/.dockerignore
index d870390d..f4c91a47 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -16,6 +16,7 @@ venv/
 .docker-venv/
 node_modules/
 
+docs/
 build/
 dist/
 brew_dist/

From b021a23b7bb8c8f398be8cbb74bd9b4e9860ea55 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 21:02:42 -0800
Subject: [PATCH 059/126] dont install C compiler for final pip install
 archivebox in Dockerfile

---
 Dockerfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4889cfd0..391b0101 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,7 +73,8 @@ COPY --chown=root:root --chmod=755 package.json "$CODE_DIR/"
 RUN grep '"version": ' "${CODE_DIR}/package.json" | awk -F'"' '{print $4}' > /VERSION.txt
 
 # Force apt to leave downloaded binaries in /var/cache/apt (massively speeds up Docker builds)
-RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
+RUN echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
+    && rm -f /etc/apt/apt.conf.d/docker-clean
 
 # Print debug info about build and save it to disk, for human eyes only, not used by anything else
 RUN (echo "[i] Docker build for ArchiveBox $(cat /VERSION.txt) starting..." \
@@ -123,7 +124,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$T
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$TARGETVARIANT --mount=type=cache,target=/root/.npm,sharing=locked,id=npm-$TARGETARCH$TARGETVARIANT \
     echo "[+] Installing Node $NODE_VERSION environment in $NODE_MODULES..." \
     && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_VERSION}.x nodistro main" >> /etc/apt/sources.list.d/nodejs.list \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && curl -fsSL "https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key" | gpg --dearmor | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
     && apt-get update -qq \
     && apt-get install -qq -y -t bookworm-backports --no-install-recommends \
         nodejs libatomic1 python3-minimal \
@@ -246,15 +247,15 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$T
 COPY --chown=root:root --chmod=755 "." "$CODE_DIR/"
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$TARGETVARIANT --mount=type=cache,target=/root/.cache/pip,sharing=locked,id=pip-$TARGETARCH$TARGETVARIANT \
     echo "[*] Installing PIP ArchiveBox package from $CODE_DIR..." \
-    && apt-get update -qq \
+    # && apt-get update -qq \
     # install C compiler to build deps on platforms that dont have 32-bit wheels available on pypi
-    && apt-get install -qq -y -t bookworm-backports --no-install-recommends \
-        build-essential  \
+    # && apt-get install -qq -y -t bookworm-backports --no-install-recommends \
+    #     build-essential  \
     # INSTALL ARCHIVEBOX python package globally from CODE_DIR, with all optional dependencies
     && pip install -e "$CODE_DIR"[sonic,ldap] \
     # save docker image size and always remove compilers / build tools after building is complete
-    && apt-get purge -y build-essential \
-    && apt-get autoremove -y \
+    # && apt-get purge -y build-essential \
+    # && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
 ####################################################

From 7410fddacf939126adab8dcfcd9fc6399f88370a Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 21:03:01 -0800
Subject: [PATCH 060/126] improve entrypoint error handling and color coding

---
 archivebox/config.py     |  4 ++-
 bin/docker_entrypoint.sh | 64 ++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 29f1a265..087b89a6 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -1126,10 +1126,12 @@ def check_system_config(config: ConfigDict=CONFIG) -> None:
         if config['IN_DOCKER']:
             attempted_command = ' '.join(sys.argv[:3])
             stderr('')
-            stderr('    {lightred}Hint{reset}: When using Docker, you must run commands with {green}docker run{reset} instead of {lightyellow}docker exec{reset}, e.g.:')
+            stderr('    {lightred}Hint{reset}: When using Docker, you must run commands with {green}docker run{reset} instead of {lightyellow}docker exec{reset}, e.g.:'.format(**config['ANSI']))
             stderr(f'        docker compose run archivebox {attempted_command}')
+            stderr(f'        docker compose exec --user=archivebox archivebox {attempted_command}')
             stderr('        or')
             stderr(f'        docker run -it -v ... -p ... archivebox/archivebox {attempted_command}')
+            stderr(f'        docker exec -it --user=archivebox <container id> /bin/bash')
         
         raise SystemExit(2)
 
diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index d2509cc9..bccaa808 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -1,15 +1,28 @@
 #!/bin/bash
 
-### Bash Environment Setup
+# This Docker ENTRYPOINT script is called by `docker run archivebox ...` or `docker compose run archivebox ...`.
+# It takes a CMD as $* shell arguments and runs it following these setup steps:
+
+# - Set the archivebox user to use the correct PUID & PGID
+#     1. highest precedence is for valid PUID and PGID env vars passsed in explicitly
+#     2. fall back to DETECTED_PUID of files found within existing data dir
+#     3. fall back to DEFAULT_PUID if no data dir or its owned by root
+# - Create a new /data dir if necessary and set the correct ownership on it
+# - Create a new /browsers dir if necessary and set the correct ownership on it
+# - Check whether we're running inside QEMU emulation and show a warning if so.
+# - Drop down to archivebox user permisisons and execute passed CMD command.
+
+# Bash Environment Setup
 # http://redsymbol.net/articles/unofficial-bash-strict-mode/
 # https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 # set -o xtrace
+# set -o nounset
 set -o errexit
 set -o errtrace
 set -o pipefail
-IFS=$'\n'
+# IFS=$'\n'
 
-# Load global config (set by Dockerfile during image build time, not intended to be customized by users at runtime)
+# Load global invariants (set by Dockerfile during image build time, not intended to be customized by users at runtime)
 export DATA_DIR="${DATA_DIR:-/data}"
 export ARCHIVEBOX_USER="${ARCHIVEBOX_USER:-archivebox}"
 
@@ -19,10 +32,10 @@ export DEFAULT_PGID=911
 
 # If user tires to set PUID and PGID to root values manually, catch and reject because root is not allowed
 if [[ "$PUID" == "0" ]] || [[ "$PGID" == "0" ]]; then
-    echo -e "\n[X] Error: Got PUID=$PUID and PGID=$PGID but ArchiveBox is not allowed to be run as root, please change or unset PUID & PGID and try again." >&2
-    echo -e "    Hint: some NFS/SMB/FUSE/etc. filesystems force-remap all permissions, leave PUID/PGID blank" >&2
-    echo -e "          or set PUID/PGID to the same value as the user/group they remap to (e.g. $DEFAULT_PUID:$DEFAULT_PGID)." >&2
-    echo -e "    https://linux.die.net/man/8/mount.cifs#:~:text=does%20not%20provide%20unix%20ownership" >&2
+    echo -e "\n[X] Error: Got PUID=$PUID and PGID=$PGID but ArchiveBox is not allowed to be run as root, please change or unset PUID & PGID and try again." > /dev/stderr
+    echo -e "    Hint: some NFS/SMB/FUSE/etc. filesystems force-remap all permissions, leave PUID/PGID blank" > /dev/stderr
+    echo -e "          or set PUID/PGID to the same value as the user/group they remap to (e.g. $DEFAULT_PUID:$DEFAULT_PGID)." > /dev/stderr
+    echo -e "    https://linux.die.net/man/8/mount.cifs#:~:text=does%20not%20provide%20unix%20ownership" > /dev/stderr
     exit 3
 fi
 
@@ -34,9 +47,7 @@ export DETECTED_PGID="$(stat -c '%g' "$DATA_DIR/logs/errors.log" 2>/dev/null ||
 [[ "$DETECTED_PUID" == "0" ]] && export DETECTED_PUID="$DEFAULT_PUID"
 [[ "$DETECTED_PGID" == "0" ]] && export DETECTED_PGID="$DEFAULT_PGID"
 
-
-# Set the archivebox user to use the configured UID & GID
-# prefer PUID and PGID env vars passsed in explicitly, falls back to autodetected values or global defaults
+# Set archivebox user and group ids to desired PUID/PGID
 usermod -o -u "${PUID:-$DETECTED_PUID}" "$ARCHIVEBOX_USER" > /dev/null 2>&1
 groupmod -o -g "${PGID:-$DETECTED_PGID}" "$ARCHIVEBOX_USER" > /dev/null 2>&1
 
@@ -54,10 +65,10 @@ if [[ -d "$DATA_DIR/archive" ]]; then
     else
      # the only time this fails is if the host filesystem doesn't allow us to write as root (e.g. some NFS mapall/maproot problems, connection issues, drive dissapeared, etc.)
         echo -e "\n[X] Error: archivebox user (PUID=$PUID) is not able to write to your ./data dir (currently owned by $(stat -c '%u' "$DATA_DIR"):$(stat -c '%g' "$DATA_DIR")." >&2
-        echo -e "    Change ./data to be owned by PUID=$PUID PGID=$PGID on the host and retry:" >&2
-        echo -e "       \$ chown -R $PUID:$PGID ./data\n" >&2
-        echo -e "    Configure the PUID & PGID environment variables to change the desired owner:" >&2
-        echo -e "       https://docs.linuxserver.io/general/understanding-puid-and-pgid\n" >&2
+        echo -e "    Change ./data to be owned by PUID=$PUID PGID=$PGID on the host and retry:" > /dev/stderr
+        echo -e "       \$ chown -R $PUID:$PGID ./data\n" > /dev/stderr
+        echo -e "    Configure the PUID & PGID environment variables to change the desired owner:" > /dev/stderr
+        echo -e "       https://docs.linuxserver.io/general/understanding-puid-and-pgid\n" > /dev/stderr
         exit 3
     fi
 else
@@ -72,32 +83,33 @@ chown $PUID:$PGID "$DATA_DIR"/*
 
 # also chown BROWSERS_DIR because otherwise 'archivebox setup' wont be able to install chrome at runtime
 PLAYWRIGHT_BROWSERS_PATH="${PLAYWRIGHT_BROWSERS_PATH:-/browsers}"
-mkdir -p "$PLAYWRIGHT_BROWSERS_PATH"
+mkdir -p "$PLAYWRIGHT_BROWSERS_PATH/permissions_test_safe_to_delete"
 chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"
-touch "$PLAYWRIGHT_BROWSERS_PATH"/.permissions_test_safe_to_delete
-chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/*.*
-rm -f "$PLAYWRIGHT_BROWSERS_PATH"/.permissions_test_safe_to_delete
+chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/*
+rm -Rf "$PLAYWRIGHT_BROWSERS_PATH/permissions_test_safe_to_delete"
 
 
 # (this check is written in blood, QEMU silently breaks things in ways that are not obvious)
-export IN_QEMU="$(pmap 1 | grep qemu | wc -l | grep -E '^0$' >/dev/null && echo 'False' || echo 'True')"
-if [[ "$IN_QEMU" == 'True' ]]; then
-    echo -e "\n[!] Warning: Running $(uname -m) emulated container in QEMU, some things will break!" >&2
-    echo -e "    chromium (screenshot, pdf, dom), singlefile, and any dependencies that rely on inotify will not run in QEMU." >&2
-    echo -e "    See here for more info: https://github.com/microsoft/playwright/issues/17395#issuecomment-1250830493\n" >&2
+export IN_QEMU="$(pmap 1 | grep qemu >/dev/null && echo 'True' || echo 'False')"
+if [[ "$IN_QEMU" == "True" ]]; then
+    echo -e "\n[!] Warning: Running $(uname -m) docker image using QEMU emulation, some things will break!" > /dev/stderr
+    echo -e "    chromium (screenshot, pdf, dom), singlefile, and any dependencies that rely on inotify will not run in QEMU." > /dev/stderr
+    echo -e "    See here for more info: https://github.com/microsoft/playwright/issues/17395#issuecomment-1250830493\n" > /dev/stderr
 fi
 
 
 # Drop permissions to run commands as the archivebox user
 if [[ "$1" == /* || "$1" == "bash" || "$1" == "sh" || "$1" == "echo" || "$1" == "cat" || "$1" == "archivebox" ]]; then
     # handle "docker run archivebox /some/non-archivebox/command --with=some args" by passing args directly to bash -c
-    # e.g. "docker run archivebox /venv/bin/archivebox-alt init"
+    # e.g. "docker run archivebox archivebox init:
+    #      "docker run archivebox /venv/bin/archivebox-alt init"
     #      "docker run archivebox /bin/bash -c '...'"
-    #      "docker run archivebox echo test"
+    #      "docker run archivebox cat /VERSION.txt"
     exec gosu "$PUID" bash -c "$*"
 else
     # handle "docker run archivebox add some subcommand --with=args abc" by calling archivebox to run as args as CLI subcommand
-    # e.g. "docker run archivebox add --depth=1 https://example.com"
+    # e.g. "docker run archivebox help"
+    #      "docker run archivebox add --depth=1 https://example.com"
     #      "docker run archivebox manage createsupseruser"
     #      "docker run archivebox server 0.0.0.0:8000"
     exec gosu "$PUID" bash -c "archivebox $*"

From 78ad83a510a7555ea16fa551eec4e7ef26636c86 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 21:18:16 -0800
Subject: [PATCH 061/126] Update docker.yml

---
 .github/workflows/docker.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9840f7ae..8a9a6bf8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,8 +11,7 @@ on:
 
 env:
   DOCKER_IMAGE: archivebox-ci
-
-
+      
 jobs:
   buildx:
     runs-on: ubuntu-latest
@@ -78,8 +77,18 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
           platforms: linux/amd64,linux/arm64,linux/arm/v7
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
+       
+      # This ugly bit is necessary if you don't want your cache to grow forever
+      # until it hits GitHub's limit of 5GB.
+      # Temp fix
+      # https://github.com/docker/build-push-action/issues/252
+      # https://github.com/moby/buildkit/issues/1896
+      - name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

From 6ec7114033b9c0256843a752fad8d91af31ea0b5 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 21:48:38 -0800
Subject: [PATCH 062/126] also build GIT_SHA version of images

---
 bin/release_docker.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/release_docker.sh b/bin/release_docker.sh
index 15e1b666..1aaaeac5 100755
--- a/bin/release_docker.sh
+++ b/bin/release_docker.sh
@@ -18,6 +18,7 @@ SUPPORTED_PLATFORMS="linux/amd64,linux/arm64,linux/arm/v7"
 TAG_NAME="${1:-$(git rev-parse --abbrev-ref HEAD)}"
 VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
 SHORT_VERSION="$(echo "$VERSION" | perl -pe 's/(\d+)\.(\d+)\.(\d+)/$1.$2/g')"
+GIT_SHA=sha-"$(git rev-parse --short HEAD)"
 SELECTED_PLATFORMS="${2:-$SUPPORTED_PLATFORMS}"
 
 
@@ -26,7 +27,7 @@ SELECTED_PLATFORMS="${2:-$SUPPORTED_PLATFORMS}"
 # docker login ghcr.io --username=pirate
 
 echo "[^] Building docker image"
-./bin/build_docker.sh "$TAG_NAME" "$SELECTED_PLATFORMS"
+./bin/build_docker.sh "$TAG_NAME" "$GIT_SHA" "$SELECTED_PLATFORMS"
 
 echo "[^] Uploading docker image"
 docker buildx build --platform "$SELECTED_PLATFORMS" --push . \
@@ -34,12 +35,16 @@ docker buildx build --platform "$SELECTED_PLATFORMS" --push . \
                -t archivebox/archivebox:$TAG_NAME \
                -t archivebox/archivebox:$VERSION \
                -t archivebox/archivebox:$SHORT_VERSION \
+               -t archivebox/archivebox:$GIT_SHA \
                -t archivebox/archivebox:latest \
                -t nikisweeting/archivebox \
                -t nikisweeting/archivebox:$TAG_NAME \
                -t nikisweeting/archivebox:$VERSION \
                -t nikisweeting/archivebox:$SHORT_VERSION \
+               -t nikisweeting/archivebox:$GIT_SHA \
                -t nikisweeting/archivebox:latest \
                -t ghcr.io/archivebox/archivebox/archivebox:$TAG_NAME \
                -t ghcr.io/archivebox/archivebox/archivebox:$VERSION \
-               -t ghcr.io/archivebox/archivebox/archivebox:$SHORT_VERSION
\ No newline at end of file
+               -t ghcr.io/archivebox/archivebox/archivebox:$SHORT_VERSION \
+               -t ghcr.io/archivebox/archivebox/archivebox:$GIT_SHA
+

From 25a505f668770a96961507e7264292460b8d2eb1 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 21:51:04 -0800
Subject: [PATCH 063/126] fix GIT_SHA tagging during build

---
 bin/build_docker.sh   | 7 ++++++-
 bin/release_docker.sh | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/build_docker.sh b/bin/build_docker.sh
index c88ed54c..dd5d4d18 100755
--- a/bin/build_docker.sh
+++ b/bin/build_docker.sh
@@ -23,6 +23,7 @@ SUPPORTED_PLATFORMS="linux/amd64,linux/arm64,linux/arm/v7"
 TAG_NAME="${1:-$(git rev-parse --abbrev-ref HEAD)}"
 VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
 SHORT_VERSION="$(echo "$VERSION" | perl -pe 's/(\d+)\.(\d+)\.(\d+)/$1.$2/g')"
+GIT_SHA=sha-"$(git rev-parse --short HEAD)"
 SELECTED_PLATFORMS="${2:-$SUPPORTED_PLATFORMS}"
 
 echo "[+] Building Docker image: tag=$TAG_NAME version=$SHORT_VERSION arch=$SELECTED_PLATFORMS"
@@ -83,12 +84,16 @@ docker buildx build --platform "$SELECTED_PLATFORMS" --load . \
                -t archivebox/archivebox:$TAG_NAME \
                -t archivebox/archivebox:$VERSION \
                -t archivebox/archivebox:$SHORT_VERSION \
+               -t archivebox/archivebox:$GIT_SHA \
                -t archivebox/archivebox:latest \
                -t nikisweeting/archivebox \
                -t nikisweeting/archivebox:$TAG_NAME \
                -t nikisweeting/archivebox:$VERSION \
                -t nikisweeting/archivebox:$SHORT_VERSION \
+               -t nikisweeting/archivebox:$GIT_SHA \
                -t nikisweeting/archivebox:latest \
                -t ghcr.io/archivebox/archivebox/archivebox:$TAG_NAME \
                -t ghcr.io/archivebox/archivebox/archivebox:$VERSION \
-               -t ghcr.io/archivebox/archivebox/archivebox:$SHORT_VERSION
+               -t ghcr.io/archivebox/archivebox/archivebox:$SHORT_VERSION \
+               -t ghcr.io/archivebox/archivebox/archivebox:$GIT_SHA \
+               -t ghcr.io/archivebox/archivebox/archivebox:latest
diff --git a/bin/release_docker.sh b/bin/release_docker.sh
index 1aaaeac5..137c1b53 100755
--- a/bin/release_docker.sh
+++ b/bin/release_docker.sh
@@ -27,7 +27,7 @@ SELECTED_PLATFORMS="${2:-$SUPPORTED_PLATFORMS}"
 # docker login ghcr.io --username=pirate
 
 echo "[^] Building docker image"
-./bin/build_docker.sh "$TAG_NAME" "$GIT_SHA" "$SELECTED_PLATFORMS"
+./bin/build_docker.sh "$TAG_NAME" "$SELECTED_PLATFORMS"
 
 echo "[^] Uploading docker image"
 docker buildx build --platform "$SELECTED_PLATFORMS" --push . \

From 5881a643538d134c53ef9aa314cd3bcb52bdf68e Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 22:11:13 -0800
Subject: [PATCH 064/126] fallback to alternative way of getting chrome version
 if needed

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 391b0101..b569a1a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -203,7 +203,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$T
     && chown -R $ARCHIVEBOX_USER "$PLAYWRIGHT_BROWSERS_PATH" \
     # Save version info
     && ( \
-        which chromium-browser && /usr/bin/chromium-browser --version \
+        which chromium-browser && /usr/bin/chromium-browser --version || /usr/lib/chromium/chromium --version \
         && echo -e '\n\n' \
     ) | tee -a /VERSION.txt
 

From 93b5e0d9e54395e100b7daf9da5d9862b697cfe7 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sun, 17 Dec 2023 22:56:09 -0800
Subject: [PATCH 065/126] Update docker.yml

---
 .github/workflows/docker.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8a9a6bf8..1cdddd6f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -59,13 +59,11 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: archivebox/archivebox,nikisweeting/archivebox
-          flavor: |
-              latest=auto
           tags: |
               type=ref,event=branch
               type=semver,pattern={{version}}
               type=semver,pattern={{major}}.{{minor}}
-              type=sha
+              type=raw,value=latest,enable={{is_default_branch}}
       
       - name: Build and push
         id: docker_build

From 7d068364438c039a3bbf1f86bcb36ed6498f4599 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 18 Dec 2023 19:24:18 -0800
Subject: [PATCH 066/126] add WIP comment

---
 archivebox/core/admin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py
index ce4612a7..50319804 100644
--- a/archivebox/core/admin.py
+++ b/archivebox/core/admin.py
@@ -48,6 +48,7 @@ class TagInline(admin.TabularInline):
 from django.contrib.admin.helpers import ActionForm
 from django.contrib.admin.widgets import AutocompleteSelectMultiple
 
+# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
 # class AutocompleteTags:
 #     model = Tag
 #     search_fields = ['name']

From 7d5a7f80ca8f6da7419aa6646a90c836142519b6 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 18 Dec 2023 19:24:48 -0800
Subject: [PATCH 067/126] Update admin.py

---
 archivebox/core/admin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py
index 50319804..e2104e83 100644
--- a/archivebox/core/admin.py
+++ b/archivebox/core/admin.py
@@ -62,6 +62,7 @@ class SnapshotActionForm(ActionForm):
     tags = forms.ModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         required=False,
+        # WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
         # widget=AutocompleteSelectMultiple(
         #     # AutocompleteTags(),
         #     # AutocompleteTagsAdminStub(),

From 5805e18380ef51521b9d03d752fd087c3d48ea9f Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 18 Dec 2023 19:25:08 -0800
Subject: [PATCH 068/126] Update settings.py

---
 archivebox/core/settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py
index 8334c39b..6a52641d 100644
--- a/archivebox/core/settings.py
+++ b/archivebox/core/settings.py
@@ -268,6 +268,7 @@ AUTH_PASSWORD_VALIDATORS = [
     {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
 ]
 
+# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
 # DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
 
 ################################################################################

From 487e560e321c595a2e3f428e3665acf00e0a0aac Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 18 Dec 2023 19:27:52 -0800
Subject: [PATCH 069/126] Update config.py to use fallback git head method

---
 archivebox/config.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 90186b1c..1716036f 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -398,7 +398,14 @@ def get_commit_hash(config) -> Optional[str]:
         commit_hash = git_dir.joinpath(ref).read_text().strip()
         return commit_hash
     except Exception:
-        return None
+        pass
+
+    try:
+        return list((config['PACKAGE_DIR'] / '../.git/refs/heads/').glob('*'))[0].read_text().strip()
+    except Exception:
+        pass
+    
+    return None
 
 def get_build_time(config) -> str:
     if config['IN_DOCKER']:

From 480eff52db6dc0f9e6c8c2a0109b6a48a38bc474 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 09:58:15 -0800
Subject: [PATCH 070/126] Update urls.py

---
 archivebox/core/urls.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 1520710c..8746083d 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -12,6 +12,8 @@ from config import VERSION, VERSION_RELEASES, CAN_UPGRADE
 
 # print('DEBUG', settings.DEBUG)
 
+GLOBAL_CONTEXT = {'VERSION': VERSION, 'VERSIONS_AVAILABLE': VERSIONS_AVAILABLE, 'CAN_UPGRADE': CAN_UPGRADE}
+
 urlpatterns = [
     path('public/', PublicIndexView.as_view(), name='public-index'),
 
@@ -31,7 +33,7 @@ urlpatterns = [
 
 
     path('accounts/', include('django.contrib.auth.urls')),
-    path('admin/', admin.site.urls, {'extra_context': {'VERSION': VERSION, 'VERSION_RELEASES': VERSION_RELEASES, 'CAN_UPGRADE': CAN_UPGRADE}}),
+    path('admin/', admin.site.urls, {'extra_context': GLOBAL_CONTEXT}),
 
     path('health/', HealthCheckView.as_view(), name='healthcheck'),
     path('error/', lambda _: 1/0),

From 168cdac2c4acc36a99598c0f8e0ef90587764561 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 09:58:42 -0800
Subject: [PATCH 071/126] rename VERSION_RELEASES to VERSIONS_AVAILABLE

---
 archivebox/core/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 8746083d..1f3732d5 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -8,7 +8,7 @@ from django.views.generic.base import RedirectView
 
 from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView
 
-from config import VERSION, VERSION_RELEASES, CAN_UPGRADE
+from config import VERSION, VERSIONS_AVAILABLE, CAN_UPGRADE
 
 # print('DEBUG', settings.DEBUG)
 

From 42dad5e0b3999f82100a75c64fb2284094df8488 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 10:01:08 -0800
Subject: [PATCH 072/126] rename VERSION_RELEASES to VERSIONS_AVAILABLE

---
 archivebox/main.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/archivebox/main.py b/archivebox/main.py
index e47d20fe..d80203b2 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -99,7 +99,7 @@ from .config import (
     check_data_folder,
     write_config_file,
     VERSION,
-    VERSION_RELEASES,
+    VERSIONS_AVAILABLE,
     CAN_UPGRADE,
     COMMIT_HASH,
     BUILD_TIME,
@@ -695,8 +695,7 @@ def add(urls: Union[str, List[str]],
         # print(f'    √ Tagged {len(imported_links)} Snapshots with {len(tags)} tags {tags_str}')
 
     if CAN_UPGRADE:
-        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSION_RELEASES['upgrade_version']['tag_name']} ({VERSION_RELEASES['upgrade_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
-
+        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSIONS_AVAILABLE['recommended_version']['tag_name']} ({VERSIONS_AVAILABLE['recommended_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
 
     return all_links
 
@@ -1287,7 +1286,7 @@ def schedule(add: bool=False,
                 raise SystemExit(1)
 
     if CAN_UPGRADE:
-        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSION_RELEASES['upgrade_version']['tag_name']} ({VERSION_RELEASES['upgrade_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
+        hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSIONS_AVAILABLE['recommended_version']['tag_name']} ({VERSIONS_AVAILABLE['recommended_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
 
     
 @enforce_types

From bfebc23f42c9250a56b27d1784f7c5714cf8d8b6 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 10:02:28 -0800
Subject: [PATCH 073/126] Rename VERSION_RELEASES to VERSIONS_AVAILABLE

---
 archivebox/templates/admin/base.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 7c31d83a..9d2601af 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -144,10 +144,10 @@
         <script>
             {% if user.is_authenticated and CAN_UPGRADE %}
             if (!localStorage.getItem("bannerDismissed")) {
-                const upgradeVersionTag = "{{VERSION_RELEASES.upgrade_version.tag_name}}"
-                const upgradeVersionURL = "{{VERSION_RELEASES.upgrade_version.html_url}}"
+                const upgradeVersionTag = "{{VERSIONS_AVAILABLE.recommended_version.tag_name}}"
+                const upgradeVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"
                 const currentVersionTag = "{{VERSION}}"
-                const currentVersionURL = "{{VERSION_RELEASES.current_version.html_url}}"
+                const currentVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"
 
                 createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
             }
@@ -159,7 +159,7 @@
                     <p>There's a new version of ArchiveBox available!</p>
                     Your version: <a href=${currentVersionURL}>${currentVersionTag}</a> | New version: <a href=${upgradeVersionURL}>${upgradeVersionTag}</a>
                     <p>
-                    <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrading</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
+                    <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrade Instructions</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
                     </p>
                     <button id="dismiss-btn">Dismiss</button>
                 `

From bfcff2f78f6c0c11742a37cb99f1b0b3fbc0ce7d Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 19 Dec 2023 10:03:04 -0800
Subject: [PATCH 074/126] make sure user is a superuser before showing upgrade
 notification

---
 archivebox/templates/admin/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index 9d2601af..c905884c 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -142,7 +142,7 @@
         </div>
 
         <script>
-            {% if user.is_authenticated and CAN_UPGRADE %}
+            {% if user.is_authenticated and user.is_superuser and CAN_UPGRADE %}
             if (!localStorage.getItem("bannerDismissed")) {
                 const upgradeVersionTag = "{{VERSIONS_AVAILABLE.recommended_version.tag_name}}"
                 const upgradeVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"

From 6584f300d6047f7721016620ff6062a3b91eb4c4 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 18 Dec 2023 22:04:11 -0800
Subject: [PATCH 075/126] add better comments

---
 .github/workflows/docker.yml |  1 +
 archivebox/config.py         | 45 ++++++++++++++++++++++++------------
 bin/docker_entrypoint.sh     | 15 +++++++-----
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1cdddd6f..75c7658c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -63,6 +63,7 @@ jobs:
               type=ref,event=branch
               type=semver,pattern={{version}}
               type=semver,pattern={{major}}.{{minor}}
+              type=sha
               type=raw,value=latest,enable={{is_default_branch}}
       
       - name: Build and push
diff --git a/archivebox/config.py b/archivebox/config.py
index 9389dbb4..234f1fc9 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -470,6 +470,8 @@ def can_upgrade(config):
 
 ALLOWDENYLIST_REGEX_FLAGS: int = re.IGNORECASE | re.UNICODE | re.MULTILINE
 
+# These are derived/computed values calculated *after* all user-provided config values are ingested
+# they appear in `archivebox config` output and are intended to be read-only for the user
 DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
     'TERM_WIDTH':               {'default': lambda c: lambda: shutil.get_terminal_size((100, 10)).columns},
     'USER':                     {'default': lambda c: SYSTEM_USER},
@@ -488,13 +490,13 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
     'CHROME_USER_DATA_DIR':     {'default': lambda c: find_chrome_data_dir() if c['CHROME_USER_DATA_DIR'] is None else (Path(c['CHROME_USER_DATA_DIR']).resolve() if c['CHROME_USER_DATA_DIR'] else None)},   # None means unset, so we autodetect it with find_chrome_Data_dir(), but emptystring '' means user manually set it to '', and we should store it as None
     'URL_DENYLIST_PTN':         {'default': lambda c: c['URL_DENYLIST'] and re.compile(c['URL_DENYLIST'] or '', ALLOWDENYLIST_REGEX_FLAGS)},
     'URL_ALLOWLIST_PTN':        {'default': lambda c: c['URL_ALLOWLIST'] and re.compile(c['URL_ALLOWLIST'] or '', ALLOWDENYLIST_REGEX_FLAGS)},
-    'DIR_OUTPUT_PERMISSIONS':   {'default': lambda c: c['OUTPUT_PERMISSIONS'].replace('6', '7').replace('4', '5')},
+    'DIR_OUTPUT_PERMISSIONS':   {'default': lambda c: c['OUTPUT_PERMISSIONS'].replace('6', '7').replace('4', '5')},  # exec is always needed to list directories
 
     'ARCHIVEBOX_BINARY':        {'default': lambda c: sys.argv[0] or bin_path('archivebox')},
 
-    'VERSION':                  {'default': lambda c: get_version(c).split('+', 1)[0]},
-    'COMMIT_HASH':              {'default': lambda c: get_commit_hash(c)},
-    'BUILD_TIME':               {'default': lambda c: get_build_time(c)},
+    'VERSION':                  {'default': lambda c: get_version(c).split('+', 1)[0]},     # remove +editable from user-displayed version string
+    'COMMIT_HASH':              {'default': lambda c: get_commit_hash(c)},                  # short git commit hash of codebase HEAD commit
+    'BUILD_TIME':               {'default': lambda c: get_build_time(c)},                   # docker build completed time or python src last modified time
     
     'VERSIONS_AVAILABLE':       {'default': lambda c: get_versions_available_on_github(c)},
     'CAN_UPGRADE':              {'default': lambda c: can_upgrade(c)},
@@ -583,47 +585,60 @@ def load_config_val(key: str,
                     config_file_vars: Optional[Dict[str, str]]=None) -> ConfigValue:
     """parse bool, int, and str key=value pairs from env"""
 
+    assert isinstance(config, dict)
 
+    is_read_only = type is None
+    if is_read_only:
+        if callable(default):
+            return default(config)
+        return default
+
+    # get value from environment variables or config files
     config_keys_to_check = (key, *(aliases or ()))
+    val = None
     for key in config_keys_to_check:
         if env_vars:
             val = env_vars.get(key)
             if val:
                 break
+
         if config_file_vars:
             val = config_file_vars.get(key)
             if val:
                 break
 
-    if type is None or val is None:
+    is_unset = val is None
+    if is_unset:
         if callable(default):
-            assert isinstance(config, dict)
             return default(config)
-
         return default
 
-    elif type is bool:
-        if val.lower() in ('true', 'yes', '1'):
+    # calculate value based on expected type
+    BOOL_TRUEIES = ('true', 'yes', '1')
+    BOOL_FALSEIES = ('false', 'no', '0')
+
+    if type is bool:
+        if val.lower() in BOOL_TRUEIES:
             return True
-        elif val.lower() in ('false', 'no', '0'):
+        elif val.lower() in BOOL_FALSEIES:
             return False
         else:
             raise ValueError(f'Invalid configuration option {key}={val} (expected a boolean: True/False)')
 
     elif type is str:
-        if val.lower() in ('true', 'false', 'yes', 'no', '1', '0'):
-            raise ValueError(f'Invalid configuration option {key}={val} (expected a string)')
+        if val.lower() in (*BOOL_TRUEIES, *BOOL_FALSEIES):
+            raise ValueError(f'Invalid configuration option {key}={val} (expected a string, but value looks like a boolean)')
         return val.strip()
 
     elif type is int:
-        if not val.isdigit():
+        if not val.strip().isdigit():
             raise ValueError(f'Invalid configuration option {key}={val} (expected an integer)')
-        return int(val)
+        return int(val.strip())
 
     elif type is list or type is dict:
         return json.loads(val)
 
-    raise Exception('Config values can only be str, bool, int or json')
+    raise Exception('Config values can only be str, bool, int, or json')
 
 
 def load_config_file(out_dir: str=None) -> Optional[Dict[str, str]]:
diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index bccaa808..700105b5 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -33,9 +33,9 @@ export DEFAULT_PGID=911
 # If user tires to set PUID and PGID to root values manually, catch and reject because root is not allowed
 if [[ "$PUID" == "0" ]] || [[ "$PGID" == "0" ]]; then
     echo -e "\n[X] Error: Got PUID=$PUID and PGID=$PGID but ArchiveBox is not allowed to be run as root, please change or unset PUID & PGID and try again." > /dev/stderr
-    echo -e "    Hint: some NFS/SMB/FUSE/etc. filesystems force-remap all permissions, leave PUID/PGID blank" > /dev/stderr
-    echo -e "          or set PUID/PGID to the same value as the user/group they remap to (e.g. $DEFAULT_PUID:$DEFAULT_PGID)." > /dev/stderr
-    echo -e "    https://linux.die.net/man/8/mount.cifs#:~:text=does%20not%20provide%20unix%20ownership" > /dev/stderr
+    echo -e "    Hint: some NFS/SMB/FUSE/etc. filesystems force-remap/ignore all permissions," > /dev/stderr
+        echo -e "          leave PUID/PGID unset, or use values the filesystem prefers (defaults to $DEFAULT_PUID:$DEFAULT_PGID)" > /dev/stderr
+        echo -e "    https://linux.die.net/man/8/mount.cifs#:~:text=does%20not%20provide%20unix%20ownership" > /dev/stderr
     exit 3
 fi
 
@@ -69,6 +69,9 @@ if [[ -d "$DATA_DIR/archive" ]]; then
         echo -e "       \$ chown -R $PUID:$PGID ./data\n" > /dev/stderr
         echo -e "    Configure the PUID & PGID environment variables to change the desired owner:" > /dev/stderr
         echo -e "       https://docs.linuxserver.io/general/understanding-puid-and-pgid\n" > /dev/stderr
+        echo -e "    Hint: some NFS/SMB/FUSE/etc. filesystems force-remap/ignore all permissions," > /dev/stderr
+        echo -e "          leave PUID/PGID unset, or use values the filesystem prefers (defaults to $DEFAULT_PUID:$DEFAULT_PGID)" > /dev/stderr
+        echo -e "    https://linux.die.net/man/8/mount.cifs#:~:text=does%20not%20provide%20unix%20ownership" > /dev/stderr
         exit 3
     fi
 else
@@ -89,7 +92,7 @@ chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/*
 rm -Rf "$PLAYWRIGHT_BROWSERS_PATH/permissions_test_safe_to_delete"
 
 
-# (this check is written in blood, QEMU silently breaks things in ways that are not obvious)
+# (this check is written in blood in 2023, QEMU silently breaks things in ways that are not obvious)
 export IN_QEMU="$(pmap 1 | grep qemu >/dev/null && echo 'True' || echo 'False')"
 if [[ "$IN_QEMU" == "True" ]]; then
     echo -e "\n[!] Warning: Running $(uname -m) docker image using QEMU emulation, some things will break!" > /dev/stderr
@@ -100,9 +103,9 @@ fi
 
 # Drop permissions to run commands as the archivebox user
 if [[ "$1" == /* || "$1" == "bash" || "$1" == "sh" || "$1" == "echo" || "$1" == "cat" || "$1" == "archivebox" ]]; then
-    # handle "docker run archivebox /some/non-archivebox/command --with=some args" by passing args directly to bash -c
+    # handle "docker run archivebox /bin/somecommand --with=some args" by passing args directly to bash -c
     # e.g. "docker run archivebox archivebox init:
-    #      "docker run archivebox /venv/bin/archivebox-alt init"
+    #      "docker run archivebox /venv/bin/ipython3"
     #      "docker run archivebox /bin/bash -c '...'"
     #      "docker run archivebox cat /VERSION.txt"
     exec gosu "$PUID" bash -c "$*"

From a0c16ecae02f86d281583873ae42e86c44778908 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Mon, 18 Dec 2023 22:04:36 -0800
Subject: [PATCH 076/126] bump dependency versions

---
 Dockerfile        |   2 +-
 package-lock.json | 332 ++++++++++++++++++++++++++++++----------------
 package.json      |   4 +-
 3 files changed, 223 insertions(+), 115 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b569a1a6..97fd1770 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,7 @@ ENV TZ=UTC \
 
 # Version config
 ENV PYTHON_VERSION=3.11 \
-    NODE_VERSION=21
+    NODE_VERSION=20
 
 # User config
 ENV ARCHIVEBOX_USER="archivebox" \
diff --git a/package-lock.json b/package-lock.json
index bf024723..fe79d2bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,14 +15,14 @@
       "license": "MIT",
       "dependencies": {
         "@postlight/parser": "^2.2.3",
-        "readability-extractor": "git+https://github.com/ArchiveBox/readability-extractor.git",
-        "single-file-cli": "^1.1.12"
+        "readability-extractor": "github:ArchiveBox/readability-extractor",
+        "single-file-cli": "^1.1.45"
       }
     },
     "node_modules/@babel/runtime-corejs2": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.23.2.tgz",
-      "integrity": "sha512-lTwRWGcAUBANnxD0A4c5/wKQ0eLhgdAy9kdY2rzTmmliumBQ8u8awykMnaQAnZR3PC47jLRjGoj+hozZqy9Bww==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.23.6.tgz",
+      "integrity": "sha512-k8QKC2DmBqkwJDOLa4biAZjoCGPQIaAoA1HvHtZ+gR2E9AauudikJOB34h4ETEavN5UG21X0KPdM3IvBRxM0CA==",
       "dependencies": {
         "core-js": "^2.6.12",
         "regenerator-runtime": "^0.14.0"
@@ -32,9 +32,9 @@
       }
     },
     "node_modules/@mozilla/readability": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.4.tgz",
-      "integrity": "sha512-MCgZyANpJ6msfvVMi6+A0UAsvZj//4OHREYUB9f2087uXHVoU+H+SWhuihvb1beKpM323bReQPRio0WNk2+V6g==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@mozilla/readability/-/readability-0.5.0.tgz",
+      "integrity": "sha512-Z+CZ3QaosfFaTqvhQsIktyGrjFjSC0Fa4EMph4mqKnWhmyoGICsV/8QK+8HpXut6zV7zwfWwqDmEjtk1Qf6EgQ==",
       "engines": {
         "node": ">=14.0.0"
       }
@@ -240,9 +240,9 @@
     },
 <<<<<<< HEAD
     "node_modules/@puppeteer/browsers": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.7.1.tgz",
-      "integrity": "sha512-nIb8SOBgDEMFY2iS2MdnUZOg2ikcYchRrBoF+wtdjieRFKR2uGRipHY/oFLo+2N6anDualyClPzGywTHRGrLfw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.8.0.tgz",
+      "integrity": "sha512-TkRHIV6k2D8OlUe8RtG+5jgOF/H98Myx0M6AOafC8DdNVOFiBSFa5cpRDtpm8LXOa9sVwe0+e6Q3FC56X/DZfg==",
       "dependencies": {
         "debug": "4.3.4",
         "extract-zip": "2.0.1",
@@ -250,7 +250,7 @@
         "proxy-agent": "6.3.1",
         "tar-fs": "3.0.4",
         "unbzip2-stream": "1.4.3",
-        "yargs": "17.7.1"
+        "yargs": "17.7.2"
       },
       "bin": {
         "browsers": "lib/cjs/main-cli.js"
@@ -259,31 +259,6 @@
         "node": ">=16.3.0"
       }
     },
-    "node_modules/@puppeteer/browsers/node_modules/yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -298,18 +273,18 @@
       "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
     },
     "node_modules/@types/node": {
-      "version": "20.8.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz",
-      "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==",
+      "version": "20.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz",
+      "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==",
       "optional": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@types/yauzl": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz",
-      "integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "optional": true,
       "dependencies": {
 =======
@@ -340,7 +315,8 @@
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "deprecated": "Use your platform's native atob() and btoa() methods instead"
     },
     "node_modules/acorn": {
 <<<<<<< HEAD
@@ -370,9 +346,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
-      "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz",
+      "integrity": "sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -551,9 +527,9 @@
     },
 <<<<<<< HEAD
     "node_modules/basic-ftp": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz",
-      "integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.4.tgz",
+      "integrity": "sha512-8PzkB0arJFV4jJWSGOYR+OEic6aeKMu/osRhBULN6RY0ykby6LKhbmuQ5ublvaas5BOwboah5D87nrHyuh8PPA==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -699,11 +675,12 @@
     },
 <<<<<<< HEAD
     "node_modules/chromium-bidi": {
-      "version": "0.4.26",
-      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.26.tgz",
-      "integrity": "sha512-lukBGfogAI4T0y3acc86RaacqgKQve47/8pV2c+Hr1PjcICj2K4OkL3qfX3qrqxxnd4ddurFC0WBA3VCQqYeUQ==",
+      "version": "0.4.33",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.33.tgz",
+      "integrity": "sha512-IxoFM5WGQOIAd95qrSXzJUv4eXIrh+RvU3rwwqIiwYuvfE7U/Llj4fejbsJnjJMUYCuGtVQsY2gv7oGl4aTNSQ==",
       "dependencies": {
-        "mitt": "3.0.1"
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "9.0.0"
       },
       "peerDependencies": {
         "devtools-protocol": "*"
@@ -985,6 +962,7 @@
       }
     },
     "node_modules/devtools-protocol": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "version": "0.0.1159816",
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1159816.tgz",
@@ -994,6 +972,11 @@
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
       "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg=="
 >>>>>>> 46b944b (wip pre-0.7.1 side fixes)
+=======
+      "version": "0.0.1203626",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1203626.tgz",
+      "integrity": "sha512-nEzHZteIUZfGCZtTiS1fRpC8UZmsfD1SiyPvaUNvS13dvKf666OAm8YTi0+Ca3n1nLEyu49Cy4+dPWpaHFJk9g=="
+>>>>>>> 0b70a9a (bump dependency versions)
     },
     "node_modules/difflib": {
       "version": "0.2.6",
@@ -1025,6 +1008,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
       "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "deprecated": "Use your platform's native DOMException instead",
       "dependencies": {
         "webidl-conversions": "^7.0.0"
       },
@@ -2517,26 +2501,32 @@
       }
     },
     "node_modules/puppeteer-core": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "version": "21.2.1",
       "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.2.1.tgz",
       "integrity": "sha512-+I8EjpWFeeFKScpQiTEnC4jGve2Wr4eA9qUMoa8S317DJPm9h7wzrT4YednZK2TQZMyPtPQ2Disb/Tg02+4Naw==",
+=======
+      "version": "21.5.2",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.5.2.tgz",
+      "integrity": "sha512-v4T0cWnujSKs+iEfmb8ccd7u4/x8oblEyKqplqKnJ582Kw8PewYAWvkH4qUWhitN3O2q9RF7dzkvjyK5HbzjLA==",
+>>>>>>> 0b70a9a (bump dependency versions)
       "dependencies": {
-        "@puppeteer/browsers": "1.7.1",
-        "chromium-bidi": "0.4.26",
+        "@puppeteer/browsers": "1.8.0",
+        "chromium-bidi": "0.4.33",
         "cross-fetch": "4.0.0",
         "debug": "4.3.4",
-        "devtools-protocol": "0.0.1159816",
-        "ws": "8.14.1"
+        "devtools-protocol": "0.0.1203626",
+        "ws": "8.14.2"
       },
       "engines": {
-        "node": ">=16.3.0"
+        "node": ">=16.13.2"
       }
     },
     "node_modules/puppeteer-core/node_modules/ws": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz",
-      "integrity": "sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A==",
+      "version": "8.14.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
+      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -2638,13 +2628,13 @@
       "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
     },
     "node_modules/readability-extractor": {
-      "version": "0.0.9",
-      "resolved": "git+ssh://git@github.com/ArchiveBox/readability-extractor.git#e614ba08c4e024db75f8c746b8f4634f16ae2f50",
+      "version": "0.0.10",
+      "resolved": "git+ssh://git@github.com/ArchiveBox/readability-extractor.git#be5c3222990d4f0459b21e74802565309bdd1d52",
       "license": "MIT",
       "dependencies": {
-        "@mozilla/readability": "^0.4.4",
-        "dompurify": "^2.4.4",
-        "jsdom": "^21.1.0"
+        "@mozilla/readability": "^0.5.0",
+        "dompurify": "^2.4.7",
+        "jsdom": "^21.1.2"
       },
       "bin": {
         "readability-extractor": "readability-extractor"
@@ -2947,6 +2937,7 @@
       }
     },
     "node_modules/regenerator-runtime": {
+<<<<<<< HEAD
       "version": "0.13.11",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
@@ -2988,6 +2979,11 @@
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
       "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+=======
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+>>>>>>> 0b70a9a (bump dependency versions)
     },
 =======
     "node_modules/request-promise": {
@@ -3157,13 +3153,13 @@
       }
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.12.0.tgz",
-      "integrity": "sha512-zvPzmTsky6WfO6+BGMj2mCJsw7qKnfQONur2b+pGn8jeTiC+WAUOthZOnaK+HkX5wiU6L4uoMF+JIcOVstp25A==",
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.15.0.tgz",
+      "integrity": "sha512-BNG1bq+KWiBGHcJ/wULi0eKY0yaDqFIbEmtbsYJmfaEghdCkXBsx1akgOorhNwjBipOr0uwpvNXqT6/nzl+zjg==",
       "dependencies": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",
-        "ws": ">=8.13.0"
+        "ws": ">=8.14.2"
       },
       "engines": {
         "node": ">= 14.20.0"
@@ -3203,16 +3199,16 @@
     },
 <<<<<<< HEAD
     "node_modules/single-file-cli": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.18.tgz",
-      "integrity": "sha512-M60Mm385w2dvESNdGrFlrJoK3Cln011y8n3g3myRH7XQcuiuBQB2hVP1DDlpqOGRePDpayVFgDflSnRMMf0klQ==",
+      "version": "1.1.45",
+      "resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.45.tgz",
+      "integrity": "sha512-ALpNbsRKXj8fIcoLJ63sISuCK9v69Ar2T1uozknQoyllJSPYoKgw/xP1MSVyTaBOpfVgYi8nN4kJQQvFOYdgTw==",
       "dependencies": {
         "file-url": "3.0.0",
         "iconv-lite": "0.6.3",
-        "jsdom": "22.1.0",
-        "puppeteer-core": "21.2.1",
-        "selenium-webdriver": "4.12.0",
-        "single-file-core": "1.2.22",
+        "jsdom": "23.0.0",
+        "puppeteer-core": "21.5.2",
+        "selenium-webdriver": "4.15.0",
+        "single-file-core": "1.3.14",
         "strong-data-uri": "1.0.6",
         "yargs": "17.7.2"
       },
@@ -3220,6 +3216,64 @@
         "single-file": "single-file"
       }
     },
+    "node_modules/single-file-cli/node_modules/agent-base": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/single-file-cli/node_modules/data-urls": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
+      "dependencies": {
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/single-file-cli/node_modules/html-encoding-sniffer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
+      "dependencies": {
+        "whatwg-encoding": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/single-file-cli/node_modules/http-proxy-agent": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/single-file-cli/node_modules/https-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/single-file-cli/node_modules/iconv-lite": {
 =======
     "node_modules/single-file": {
@@ -3399,35 +3453,34 @@
     },
 <<<<<<< HEAD
     "node_modules/single-file-cli/node_modules/jsdom": {
-      "version": "22.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
-      "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
+      "version": "23.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.0.tgz",
+      "integrity": "sha512-cbL/UCtohJguhFC7c2/hgW6BeZCNvP7URQGnx9tSJRYKCdnfbfWOrtuLTMfiB2VxKsx5wPHVsh/J0aBy9lIIhQ==",
       "dependencies": {
-        "abab": "^2.0.6",
         "cssstyle": "^3.0.0",
-        "data-urls": "^4.0.0",
+        "data-urls": "^5.0.0",
         "decimal.js": "^10.4.3",
-        "domexception": "^4.0.0",
         "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
+        "html-encoding-sniffer": "^4.0.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.4",
+        "nwsapi": "^2.2.7",
         "parse5": "^7.1.2",
         "rrweb-cssom": "^0.6.0",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
+        "tough-cookie": "^4.1.3",
+        "w3c-xmlserializer": "^5.0.0",
         "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.1",
-        "ws": "^8.13.0",
-        "xml-name-validator": "^4.0.0"
+        "whatwg-encoding": "^3.1.1",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0",
+        "ws": "^8.14.2",
+        "xml-name-validator": "^5.0.0"
       },
       "engines": {
+<<<<<<< HEAD
         "node": ">=16"
 =======
     "node_modules/single-file/node_modules/jsdom": {
@@ -3466,9 +3519,12 @@
       "engines": {
         "node": ">=10"
 >>>>>>> 46b944b (wip pre-0.7.1 side fixes)
+=======
+        "node": ">=18"
+>>>>>>> 0b70a9a (bump dependency versions)
       },
       "peerDependencies": {
-        "canvas": "^2.5.0"
+        "canvas": "^3.0.0"
       },
       "peerDependenciesMeta": {
         "canvas": {
@@ -3478,32 +3534,70 @@
     },
 <<<<<<< HEAD
     "node_modules/single-file-cli/node_modules/tr46": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
+      "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
       "dependencies": {
-        "punycode": "^2.3.0"
+        "punycode": "^2.3.1"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
+      }
+    },
+    "node_modules/single-file-cli/node_modules/w3c-xmlserializer": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
+      "dependencies": {
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/single-file-cli/node_modules/whatwg-encoding": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/single-file-cli/node_modules/whatwg-mimetype": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/single-file-cli/node_modules/whatwg-url": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
+      "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
       "dependencies": {
-        "tr46": "^4.1.1",
+        "tr46": "^5.0.0",
         "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
+      }
+    },
+    "node_modules/single-file-cli/node_modules/xml-name-validator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/single-file-core": {
-      "version": "1.2.22",
-      "resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.2.22.tgz",
-      "integrity": "sha512-2XDxfZFWkUf391vx4R6FwIJcwTJKCBg+g8EKzp9a9ef8JZgomWeO4WwPhE7N9+aYBE15pzR9gcHRvVieI8/2FA=="
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.3.14.tgz",
+      "integrity": "sha512-ynYvJpgQUPhGOm2tZdzZLxkTImz8X/qqd0203umWUhVTx4PqgLO9pqjy90Mlh2Ldp8jug2sZQkXaD80pPmFewA=="
     },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
@@ -3689,9 +3783,9 @@
     },
 <<<<<<< HEAD
     "node_modules/streamx": {
-      "version": "2.15.2",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.2.tgz",
-      "integrity": "sha512-b62pAV/aeMjUoRN2C/9F0n+G8AfcJjNC0zw/ZmOHeFsIe4m4GzjVW9m6VHXVjk536NbdU9JRwKMJRfkc+zUFTg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.6.tgz",
+      "integrity": "sha512-q+vQL4AAz+FdfT137VF69Cc/APqUbxy+MDOImRrMvchJpigHj9GksgDU2LYbO9rx7RX6osWgxJB2WxhYv4SZAw==",
       "dependencies": {
         "fast-fifo": "^1.1.0",
         "queue-tick": "^1.0.1"
@@ -3971,6 +4065,7 @@
       }
     },
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     "node_modules/url/node_modules/punycode": {
       "version": "1.3.2",
@@ -3978,6 +4073,13 @@
       "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
     },
 >>>>>>> 46b944b (wip pre-0.7.1 side fixes)
+=======
+    "node_modules/urlpattern-polyfill": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz",
+      "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g=="
+    },
+>>>>>>> 0b70a9a (bump dependency versions)
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -4165,10 +4267,16 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "version": "8.14.2",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
       "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+=======
+      "version": "8.15.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz",
+      "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==",
+>>>>>>> 0b70a9a (bump dependency versions)
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/package.json b/package.json
index 9f903598..995d60c9 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "dependencies": {
     "@postlight/parser": "^2.2.3",
-    "readability-extractor": "git+https://github.com/ArchiveBox/readability-extractor.git",
-    "single-file-cli": "^1.1.12"
+    "readability-extractor": "github:ArchiveBox/readability-extractor",
+    "single-file-cli": "^1.1.45"
   }
 }

From 73993d26c06629638e455633fbaa7a5a15ec1fd8 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 2 Jan 2024 17:09:31 -0800
Subject: [PATCH 077/126] move SYSTEM_USER call to get_system_user func

---
 archivebox/config.py | 52 +++++++++++++++++++++++---------------------
 docker-compose.yml   |  3 ++-
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 234f1fc9..fd073566 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -52,26 +52,6 @@ from .config_stubs import (
 )
 
 
-### Pre-Fetch Minimal System Config
-
-TIMEZONE = 'UTC'
-SYSTEM_USER = getpass.getuser() or os.getlogin()
-
-try:
-    import pwd
-    SYSTEM_USER = pwd.getpwuid(os.geteuid()).pw_name or SYSTEM_USER
-except KeyError:
-    # Process' UID might not map to a user in cases such as running the Docker image
-    # (where `archivebox` is 999) as a different UID.
-    pass
-except ModuleNotFoundError:
-    # pwd is only needed for some linux systems, doesn't exist on windows
-    pass
-except Exception:
-    # this should never happen, uncomment to debug
-    # raise
-    pass
-
 ############################### Config Schema ##################################
 
 CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = {
@@ -377,7 +357,32 @@ ALLOWED_IN_OUTPUT_DIR = {
     'static_index.json',
 }
 
-def get_version(config) -> str:
+
+ALLOWDENYLIST_REGEX_FLAGS: int = re.IGNORECASE | re.UNICODE | re.MULTILINE
+
+
+############################## Version Config ##################################
+
+def get_system_user():
+    SYSTEM_USER = getpass.getuser() or os.getlogin()
+    try:
+        import pwd
+        return pwd.getpwuid(os.geteuid()).pw_name or SYSTEM_USER
+    except KeyError:
+        # Process' UID might not map to a user in cases such as running the Docker image
+        # (where `archivebox` is 999) as a different UID.
+        pass
+    except ModuleNotFoundError:
+        # pwd doesn't exist on windows
+        pass
+    except Exception:
+        # this should never happen, uncomment to debug
+        # raise
+        pass
+
+    return SYSTEM_USER
+
+def get_version(config):
     try:
         return importlib.metadata.version(__package__ or 'archivebox')
     except importlib.metadata.PackageNotFoundError:
@@ -467,14 +472,11 @@ def can_upgrade(config):
 
 ############################## Derived Config ##################################
 
-
-ALLOWDENYLIST_REGEX_FLAGS: int = re.IGNORECASE | re.UNICODE | re.MULTILINE
-
 # These are derived/computed values calculated *after* all user-provided config values are ingested
 # they appear in `archivebox config` output and are intended to be read-only for the user
 DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
     'TERM_WIDTH':               {'default': lambda c: lambda: shutil.get_terminal_size((100, 10)).columns},
-    'USER':                     {'default': lambda c: SYSTEM_USER},
+    'USER':                     {'default': lambda c: get_system_user()},
     'ANSI':                     {'default': lambda c: DEFAULT_CLI_COLORS if c['USE_COLOR'] else {k: '' for k in DEFAULT_CLI_COLORS.keys()}},
 
     'PACKAGE_DIR':              {'default': lambda c: Path(__file__).resolve().parent},
diff --git a/docker-compose.yml b/docker-compose.yml
index 6eff7736..c2d3d0a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,8 @@ version: '3.9'
 
 services:
     archivebox:
-        image: ${DOCKER_IMAGE:-archivebox/archivebox:dev}
+        #image: ${DOCKER_IMAGE:-archivebox/archivebox:dev}
+        image: archivebox:dev
         command: server --quick-init 0.0.0.0:8000
         ports:
             - 8000:8000

From 8ee2981957b7f2827ac2836546e308a0827c4b57 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 2 Jan 2024 17:17:35 -0800
Subject: [PATCH 078/126] fix check-for-update fetching code

---
 archivebox/config.py                 |  8 ++--
 archivebox/templates/admin/base.html | 65 ++++++++++++++--------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index fd073566..ecdc46be 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -429,7 +429,7 @@ def get_versions_available_on_github(config):
     
     # we only want to perform the (relatively expensive) check for new versions
     # when its most relevant, e.g. when the user runs a long-running command
-    subcommand_run_by_user = sys.argv[3]
+    subcommand_run_by_user = sys.argv[3] if len(sys.argv) > 3 else 'help'
     long_running_commands = ('add', 'schedule', 'update', 'status', 'server')
     if subcommand_run_by_user not in long_running_commands:
         return None
@@ -446,7 +446,7 @@ def get_versions_available_on_github(config):
     # find current version or nearest older version (to link to)
     current_version = None
     for idx, release in enumerate(all_releases):
-        release_version = parse_version_string(release["tag_name"])
+        release_version = parse_version_string(release['tag_name'])
         if release_version <= installed_version:
             current_version = release
             break
@@ -460,7 +460,7 @@ def get_versions_available_on_github(config):
     except IndexError:
         recommended_version = None
 
-    return {"recommended_version": recommended_version, "current_version": current_version}
+    return {'recommended_version': recommended_version, 'current_version': current_version}
 
 def can_upgrade(config):
     if config['VERSIONS_AVAILABLE'] and config['VERSIONS_AVAILABLE']['recommended_version']:
@@ -783,7 +783,7 @@ def load_config(defaults: ConfigDefaultDict,
     return extended_config
 
 
-def parse_version_string(version: str) -> Tuple[int, int int]:
+def parse_version_string(version: str) -> Tuple[int, int, int]:
     """parses a version tag string formatted like 'vx.x.x' into (major, minor, patch) ints"""
     base = v.split('+')[0].split('v')[-1] # remove 'v' prefix and '+editable' suffix
     return tuple(int(part) for part in base.split('.'))[:3]
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index c905884c..a29df4f5 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -141,42 +141,43 @@
             {% block footer %}<div id="footer"></div>{% endblock %}
         </div>
 
-        <script>
-            {% if user.is_authenticated and user.is_superuser and CAN_UPGRADE %}
-            if (!localStorage.getItem("bannerDismissed")) {
-                const upgradeVersionTag = "{{VERSIONS_AVAILABLE.recommended_version.tag_name}}"
-                const upgradeVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"
-                const currentVersionTag = "{{VERSION}}"
-                const currentVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"
+        {% if user.is_authenticated and user.is_superuser and CAN_UPGRADE %}
+            <script>
+                if (!localStorage.getItem("bannerDismissed")) {
+                    const upgradeVersionTag = "{{VERSIONS_AVAILABLE.recommended_version.tag_name}}"
+                    const upgradeVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"
+                    const currentVersionTag = "{{VERSION}}"
+                    const currentVersionURL = "{{VERSIONS_AVAILABLE.recommended_version.html_url}}"
 
-                createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
-            }
-
-            function createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL) {
-                const banner = document.createElement('div')
-                banner.setAttribute('id', 'upgrade-banner');
-                banner.innerHTML = `
-                    <p>There's a new version of ArchiveBox available!</p>
-                    Your version: <a href=${currentVersionURL}>${currentVersionTag}</a> | New version: <a href=${upgradeVersionURL}>${upgradeVersionTag}</a>
-                    <p>
-                    <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrade Instructions</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
-                    </p>
-                    <button id="dismiss-btn">Dismiss</button>
-                `
-                document.body.appendChild(banner);
-                const dismissButton = document.querySelector("#dismiss-btn")
-                if (dismissButton) {
-                    dismissButton.addEventListener("click", dismissBanner)
+                    createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL)
                 }
-            }
 
-            function dismissBanner() {
-                const banner = document.getElementById("upgrade-banner")
-                banner.style.display = "none"
-                localStorage.setItem("bannerDismissed", "true")
-            }
-            {% endif %}
+                function createBanner(currentVersionTag, currentVersionURL, upgradeVersionTag, upgradeVersionURL) {
+                    const banner = document.createElement('div')
+                    banner.setAttribute('id', 'upgrade-banner');
+                    banner.innerHTML = `
+                        <p>There's a new version of ArchiveBox available!</p>
+                        Your version: <a href=${currentVersionURL}>${currentVersionTag}</a> | New version: <a href=${upgradeVersionURL}>${upgradeVersionTag}</a>
+                        <p>
+                        <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives>Upgrade Instructions</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/releases>Changelog</a> | <a href=https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap>Roadmap</a> 
+                        </p>
+                        <button id="dismiss-btn">Dismiss</button>
+                    `
+                    document.body.appendChild(banner);
+                    const dismissButton = document.querySelector("#dismiss-btn")
+                    if (dismissButton) {
+                        dismissButton.addEventListener("click", dismissBanner)
+                    }
+                }
 
+                function dismissBanner() {
+                    const banner = document.getElementById("upgrade-banner")
+                    banner.style.display = "none"
+                    localStorage.setItem("bannerDismissed", "true")
+                }
+            </script>
+        {% endif %}
+        <script>
             $ = django.jQuery;
             $.fn.reverse = [].reverse;
 

From 1316607262008da0dc79d119cf77dc826fae934b Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 2 Jan 2024 17:19:09 -0800
Subject: [PATCH 079/126] fix dependency versions

---
 package-lock.json | 1771 ---------------------------------------------
 1 file changed, 1771 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe79d2bf..f8c3863d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,11 @@
 {
   "name": "archivebox",
-<<<<<<< HEAD
   "version": "0.7.1",
-=======
-  "version": "0.7.0",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "archivebox",
-<<<<<<< HEAD
       "version": "0.7.1",
       "license": "MIT",
       "dependencies": {
@@ -39,36 +34,6 @@
         "node": ">=14.0.0"
       }
     },
-=======
-      "version": "0.7.0",
-      "license": "MIT",
-      "dependencies": {
-        "@postlight/mercury-parser": "git+https://github.com/postlight/mercury-parser.git",
-        "readability-extractor": "git+https://github.com/ArchiveBox/readability-extractor.git",
-        "single-file": "git+https://github.com/gildas-lormeau/SingleFile.git"
-      }
-    },
-    "node_modules/@babel/runtime-corejs2": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.20.7.tgz",
-      "integrity": "sha512-SrtIxfjwLkUFljufH1GeqYlIYzdyxP2IoCb3tVjcrTdMyB7RQyRCdkyMzvw3k/h+CStnSf2SvvQicS1Rf/fuGQ==",
-      "dependencies": {
-        "core-js": "^2.6.12",
-        "regenerator-runtime": "^0.13.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@mozilla/readability": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.2.tgz",
-      "integrity": "sha512-48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw==",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/@postlight/ci-failed-test-reporter": {
       "version": "1.0.26",
       "resolved": "https://registry.npmjs.org/@postlight/ci-failed-test-reporter/-/ci-failed-test-reporter-1.0.26.tgz",
@@ -81,26 +46,15 @@
         "ciftr": "cli.js"
       }
     },
-<<<<<<< HEAD
     "node_modules/@postlight/parser": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@postlight/parser/-/parser-2.2.3.tgz",
       "integrity": "sha512-4/syRvqJARgLN4yH8qtl634WO0+KINjkijU/SmhCJqqh8/aOfv5uQf+SquFpA+JwsAsbGzYQkIxSum29riOreg==",
-=======
-    "node_modules/@postlight/mercury-parser": {
-      "version": "2.2.1",
-      "resolved": "git+ssh://git@github.com/postlight/mercury-parser.git#9cd9662bcbfea00b773fad691a4f6e53394ff543",
-      "integrity": "sha512-nTyjg98Zpe2anZVjl16QzC3b9nThISzhzw59aoRMCW7gqjDb8VFU1bXrFlt9dEkxxey1ysuJ109hdCJI17TVVg==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "bundleDependencies": [
         "jquery",
         "moment-timezone",
         "browser-request"
       ],
-<<<<<<< HEAD
-=======
-      "license": "MIT",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "@babel/runtime-corejs2": "^7.2.0",
         "@postlight/ci-failed-test-reporter": "^1.0",
@@ -121,18 +75,13 @@
         "yargs-parser": "^15.0.1"
       },
       "bin": {
-<<<<<<< HEAD
         "mercury-parser": "cli.js",
         "postlight-parser": "cli.js"
-=======
-        "mercury-parser": "cli.js"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "engines": {
         "node": ">=10"
       }
     },
-<<<<<<< HEAD
     "node_modules/@postlight/parser/node_modules/browser-request": {
       "version": "0.3.2",
       "engines": [
@@ -158,28 +107,14 @@
     },
     "node_modules/@postlight/parser/node_modules/moment": {
       "version": "2.29.4",
-=======
-    "node_modules/@postlight/mercury-parser/node_modules/jquery": {
-      "version": "3.4.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/@postlight/mercury-parser/node_modules/moment": {
-      "version": "2.23.0",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "inBundle": true,
       "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
-<<<<<<< HEAD
     "node_modules/@postlight/parser/node_modules/moment-timezone": {
       "version": "0.5.37",
-=======
-    "node_modules/@postlight/mercury-parser/node_modules/moment-timezone": {
-      "version": "0.5.26",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -189,14 +124,11 @@
         "node": "*"
       }
     },
-<<<<<<< HEAD
     "node_modules/@postlight/parser/node_modules/next-line": {
       "version": "1.1.0",
       "inBundle": true,
       "license": "MIT"
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/@postman/form-data": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.1.tgz",
@@ -210,7 +142,6 @@
         "node": ">= 6"
       }
     },
-<<<<<<< HEAD
     "node_modules/@postman/tough-cookie": {
       "version": "4.1.3-postman.1",
       "resolved": "https://registry.npmjs.org/@postman/tough-cookie/-/tough-cookie-4.1.3-postman.1.tgz",
@@ -225,8 +156,6 @@
         "node": ">=6"
       }
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/@postman/tunnel-agent": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/@postman/tunnel-agent/-/tunnel-agent-0.6.3.tgz",
@@ -238,7 +167,6 @@
         "node": "*"
       }
     },
-<<<<<<< HEAD
     "node_modules/@puppeteer/browsers": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.8.0.tgz",
@@ -287,28 +215,6 @@
       "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "optional": true,
       "dependencies": {
-=======
-    "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "18.11.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz",
-      "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==",
-      "optional": true
-    },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-      "optional": true,
-      "dependencies": {
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
         "@types/node": "*"
       }
     },
@@ -319,21 +225,14 @@
       "deprecated": "Use your platform's native atob() and btoa() methods instead"
     },
     "node_modules/acorn": {
-<<<<<<< HEAD
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
       "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
-=======
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "bin": {
         "acorn": "bin/acorn"
       },
       "engines": {
         "node": ">=0.4.0"
-<<<<<<< HEAD
       }
     },
     "node_modules/acorn-globals": {
@@ -353,38 +252,6 @@
         "node": ">=0.4.0"
       }
     },
-=======
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
-      "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
-      "dependencies": {
-        "acorn": "^6.0.1",
-        "acorn-walk": "^6.0.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -433,14 +300,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA=="
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -457,7 +316,6 @@
         "node": ">=0.8"
       }
     },
-<<<<<<< HEAD
     "node_modules/ast-types": {
       "version": "0.13.4",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
@@ -468,12 +326,6 @@
       "engines": {
         "node": ">=4"
       }
-=======
-    "node_modules/async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -493,14 +345,11 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
     },
-<<<<<<< HEAD
     "node_modules/b4a": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
       "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -525,7 +374,6 @@
         }
       ]
     },
-<<<<<<< HEAD
     "node_modules/basic-ftp": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.4.tgz",
@@ -534,8 +382,6 @@
         "node": ">=10.0.0"
       }
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -544,19 +390,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/bluebird": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
@@ -584,25 +417,6 @@
         "base64-js": "^1.1.2"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
-    },
-    "node_modules/browser-request": {
-      "version": "0.3.2",
-      "resolved": "git+ssh://git@github.com/postlight/browser-request.git#38faa5b85741aabfca61aa37d1ef044d68969ddf",
-      "integrity": "sha512-TOvTWJ0BrWcB8Ach1AvdSBuczm2fsJdBlmo8D4N8fei7xfboW9VEk67zfriCiBo3/19Xe1waSstCEcLFUeBCjA==",
-      "engines": [
-        "node"
-      ],
-      "dependencies": {
-        "http-headers": "^3.0.1"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -673,7 +487,6 @@
         "node": ">= 0.6"
       }
     },
-<<<<<<< HEAD
     "node_modules/chromium-bidi": {
       "version": "0.4.33",
       "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.33.tgz",
@@ -690,17 +503,6 @@
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-=======
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -754,7 +556,6 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
-<<<<<<< HEAD
     "node_modules/cross-fetch": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
@@ -763,8 +564,6 @@
         "node-fetch": "^2.6.12"
       }
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
@@ -782,7 +581,6 @@
       "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
       "engines": {
         "node": "*"
-<<<<<<< HEAD
       }
     },
     "node_modules/cssstyle": {
@@ -796,23 +594,6 @@
         "node": ">=14"
       }
     },
-=======
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "node_modules/cssstyle": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
-      "dependencies": {
-        "cssom": "0.3.x"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -822,7 +603,6 @@
       },
       "engines": {
         "node": ">=0.10"
-<<<<<<< HEAD
       }
     },
     "node_modules/data-uri-to-buffer": {
@@ -867,41 +647,6 @@
       },
       "engines": {
         "node": ">=14"
-=======
-      }
-    },
-    "node_modules/data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
-      "dependencies": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
-      }
-    },
-    "node_modules/data-urls/node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/data-urls/node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/debug": {
@@ -933,7 +678,6 @@
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
-<<<<<<< HEAD
     "node_modules/degenerator": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
@@ -946,12 +690,6 @@
       "engines": {
         "node": ">= 14"
       }
-=======
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
@@ -962,29 +700,13 @@
       }
     },
     "node_modules/devtools-protocol": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-      "version": "0.0.1159816",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1159816.tgz",
-      "integrity": "sha512-2cZlHxC5IlgkIWe2pSDmCrDiTzbSJWywjbDDnupOImEBcG31CQgBLV8wWE+5t+C4rimcjHsbzy7CBzf9oFjboA=="
-=======
-      "version": "0.0.818844",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
-      "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg=="
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
-=======
       "version": "0.0.1203626",
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1203626.tgz",
       "integrity": "sha512-nEzHZteIUZfGCZtTiS1fRpC8UZmsfD1SiyPvaUNvS13dvKf666OAm8YTi0+Ca3n1nLEyu49Cy4+dPWpaHFJk9g=="
->>>>>>> 0b70a9a (bump dependency versions)
     },
     "node_modules/difflib": {
       "version": "0.2.6",
       "resolved": "git+ssh://git@github.com/postlight/difflib.js.git#32e8e38c7fcd935241b9baab71bb432fd9b166ed",
-<<<<<<< HEAD
-=======
-      "integrity": "sha512-uFNs7czGYLWdMP22WQhD/vlFen/CuKzC+KiajNCj+ik2Ah/I9i2AFyMWkBjFgbVFGhv95kBHOtx7tgF6IVngqA==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "heap": ">= 0.2.0"
       }
@@ -1004,7 +726,6 @@
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
     },
     "node_modules/domexception": {
-<<<<<<< HEAD
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
       "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
@@ -1016,20 +737,6 @@
         "node": ">=12"
       }
     },
-=======
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
-      "dependencies": {
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
@@ -1038,7 +745,6 @@
         "domelementtype": "1"
       }
     },
-<<<<<<< HEAD
     "node_modules/domino": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz",
@@ -1049,13 +755,6 @@
       "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz",
       "integrity": "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ=="
     },
-=======
-    "node_modules/dompurify": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz",
-      "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ=="
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/domutils": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
@@ -1114,7 +813,6 @@
       }
     },
     "node_modules/escodegen": {
-<<<<<<< HEAD
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
       "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
@@ -1122,27 +820,13 @@
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
         "esutils": "^2.0.2"
-=======
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "bin": {
         "escodegen": "bin/escodegen.js",
         "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
-<<<<<<< HEAD
         "node": ">=6.0"
-=======
-        "node": ">=4.0"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "optionalDependencies": {
         "source-map": "~0.6.1"
@@ -1161,15 +845,9 @@
       }
     },
     "node_modules/estraverse": {
-<<<<<<< HEAD
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-=======
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "engines": {
         "node": ">=4.0"
       }
@@ -1219,27 +897,16 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
-<<<<<<< HEAD
     "node_modules/fast-fifo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
       "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
-<<<<<<< HEAD
-=======
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -1254,21 +921,6 @@
       "integrity": "sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA==",
       "engines": {
         "node": ">=8"
-<<<<<<< HEAD
-=======
-      }
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/forever-agent": {
@@ -1277,7 +929,6 @@
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "engines": {
         "node": "*"
-<<<<<<< HEAD
       }
     },
     "node_modules/form-data": {
@@ -1314,28 +965,6 @@
         "node": ">= 4.0.0"
       }
     },
-=======
-      }
-    },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -1363,7 +992,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-<<<<<<< HEAD
     "node_modules/get-uri": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz",
@@ -1378,8 +1006,6 @@
         "node": ">= 14"
       }
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -1407,14 +1033,11 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-<<<<<<< HEAD
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -1442,7 +1065,6 @@
       "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="
     },
     "node_modules/html-encoding-sniffer": {
-<<<<<<< HEAD
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
@@ -1451,13 +1073,6 @@
       },
       "engines": {
         "node": ">=12"
-=======
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
-      "dependencies": {
-        "whatwg-encoding": "^1.0.1"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/htmlparser2": {
@@ -1473,29 +1088,12 @@
         "readable-stream": "^3.1.1"
       }
     },
-<<<<<<< HEAD
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dependencies": {
         "@tootallnate/once": "2",
-=======
-    "node_modules/http-headers": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/http-headers/-/http-headers-3.0.2.tgz",
-      "integrity": "sha512-87E1I+2Wg4dxxz4rcxElo3dxO/w1ZtgL1yA0Sb6vH3qU16vRKq1NjWQv9SCY3ly2OQROcoxHZOUpmelS+k6wOw==",
-      "dependencies": {
-        "next-line": "^1.1.0"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dependencies": {
-        "@tootallnate/once": "1",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
         "agent-base": "6",
         "debug": "4"
       },
@@ -1577,14 +1175,11 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-<<<<<<< HEAD
     "node_modules/ip": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
       "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -1613,21 +1208,12 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
     },
-<<<<<<< HEAD
-=======
-    "node_modules/jquery": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
-      "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
     },
     "node_modules/jsdom": {
-<<<<<<< HEAD
       "version": "21.1.2",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.2.tgz",
       "integrity": "sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ==",
@@ -1692,61 +1278,6 @@
       },
       "engines": {
         "node": ">=14"
-=======
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
-      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
-      "dependencies": {
-        "abab": "^2.0.0",
-        "acorn": "^5.5.3",
-        "acorn-globals": "^4.1.0",
-        "array-equal": "^1.0.0",
-        "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": "^1.0.0",
-        "data-urls": "^1.0.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.9.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "left-pad": "^1.3.0",
-        "nwsapi": "^2.0.7",
-        "parse5": "4.0.0",
-        "pn": "^1.1.0",
-        "request": "^2.87.0",
-        "request-promise-native": "^1.0.5",
-        "sax": "^1.2.4",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^2.3.4",
-        "w3c-hr-time": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.3",
-        "whatwg-mimetype": "^2.1.0",
-        "whatwg-url": "^6.4.1",
-        "ws": "^5.2.0",
-        "xml-name-validator": "^3.0.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/json-schema": {
@@ -1764,7 +1295,6 @@
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
     },
-<<<<<<< HEAD
     "node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -1773,8 +1303,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/jsprim": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
@@ -1798,7 +1326,6 @@
         "pako": "~1.0.2",
         "readable-stream": "~2.3.6",
         "setimmediate": "^1.0.5"
-<<<<<<< HEAD
       }
     },
     "node_modules/jszip/node_modules/readable-stream": {
@@ -1815,29 +1342,10 @@
         "util-deprecate": "~1.0.1"
       }
     },
-=======
-      }
-    },
-    "node_modules/jszip/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/jszip/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-<<<<<<< HEAD
     },
     "node_modules/jszip/node_modules/string_decoder": {
       "version": "1.1.1",
@@ -1845,33 +1353,6 @@
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dependencies": {
         "safe-buffer": "~5.1.0"
-=======
-    },
-    "node_modules/jszip/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/left-pad": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
-      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
-      "deprecated": "use String.prototype.padStart()"
-    },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/lie": {
@@ -1882,20 +1363,6 @@
         "immediate": "~3.0.5"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -1961,7 +1428,6 @@
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
       "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ=="
     },
-<<<<<<< HEAD
     "node_modules/lru-cache": {
       "version": "7.18.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@@ -1969,12 +1435,6 @@
       "engines": {
         "node": ">=12"
       }
-=======
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
@@ -2006,55 +1466,26 @@
         "node": "*"
       }
     },
-<<<<<<< HEAD
     "node_modules/mitt": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
-<<<<<<< HEAD
-=======
-    "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "engines": {
-        "node": "*"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/moment-parseformat": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/moment-parseformat/-/moment-parseformat-3.0.0.tgz",
       "integrity": "sha512-dVgXe6b6DLnv4CHG7a1zUe5mSXaIZ3c6lSHm/EKeVeQI2/4pwe0VRde8OyoCE1Ro2lKT5P6uT9JElF7KDLV+jw=="
     },
-<<<<<<< HEAD
-=======
-    "node_modules/moment-timezone": {
-      "version": "0.5.26",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz",
-      "integrity": "sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==",
-      "dependencies": {
-        "moment": ">= 2.9.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-<<<<<<< HEAD
     "node_modules/netmask": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
@@ -2082,32 +1513,6 @@
         }
       }
     },
-=======
-    "node_modules/next-line": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz",
-      "integrity": "sha512-+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ=="
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
@@ -2117,15 +1522,9 @@
       }
     },
     "node_modules/nwsapi": {
-<<<<<<< HEAD
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
       "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
-=======
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/oauth-sign": {
       "version": "0.9.0",
@@ -2143,7 +1542,6 @@
         "wrappy": "1"
       }
     },
-<<<<<<< HEAD
     "node_modules/pac-proxy-agent": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
@@ -2210,72 +1608,12 @@
         "node": ">= 14"
       }
     },
-=======
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
       "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
     },
     "node_modules/parse5": {
-<<<<<<< HEAD
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
       "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
@@ -2295,18 +1633,6 @@
       },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
-=======
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/path-is-absolute": {
@@ -2327,33 +1653,10 @@
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
     },
-<<<<<<< HEAD
     "node_modules/postman-request": {
       "version": "2.88.1-postman.33",
       "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.33.tgz",
       "integrity": "sha512-uL9sCML4gPH6Z4hreDWbeinKU0p0Ke261nU7OvII95NU22HN6Dk7T/SaVPaj6T4TsQqGKIFw6/woLZnH7ugFNA==",
-=======
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
-    },
-    "node_modules/postman-request": {
-      "version": "2.88.1-postman.31",
-      "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.31.tgz",
-      "integrity": "sha512-OJbYqP7ItxQ84yHyuNpDywCZB0HYbpHJisMQ9lb1cSL3N5H3Td6a2+3l/a74UMd3u82BiGC5yQyYmdOIETP/nQ==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "@postman/form-data": "~3.1.1",
         "@postman/tough-cookie": "~4.1.3-postman.1",
@@ -2376,28 +1679,12 @@
         "qs": "~6.5.3",
         "safe-buffer": "^5.1.2",
         "stream-length": "^1.0.2",
-<<<<<<< HEAD
         "uuid": "^8.3.2"
-=======
-        "tough-cookie": "~2.5.0",
-        "uuid": "^3.3.2"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "engines": {
         "node": ">= 6"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -2411,7 +1698,6 @@
         "node": ">=0.4.0"
       }
     },
-<<<<<<< HEAD
     "node_modules/proxy-agent": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
@@ -2465,8 +1751,6 @@
         "node": ">= 14"
       }
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -2487,30 +1771,17 @@
       }
     },
     "node_modules/punycode": {
-<<<<<<< HEAD
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-=======
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/puppeteer-core": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-      "version": "21.2.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.2.1.tgz",
-      "integrity": "sha512-+I8EjpWFeeFKScpQiTEnC4jGve2Wr4eA9qUMoa8S317DJPm9h7wzrT4YednZK2TQZMyPtPQ2Disb/Tg02+4Naw==",
-=======
       "version": "21.5.2",
       "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.5.2.tgz",
       "integrity": "sha512-v4T0cWnujSKs+iEfmb8ccd7u4/x8oblEyKqplqKnJ582Kw8PewYAWvkH4qUWhitN3O2q9RF7dzkvjyK5HbzjLA==",
->>>>>>> 0b70a9a (bump dependency versions)
       "dependencies": {
         "@puppeteer/browsers": "1.8.0",
         "chromium-bidi": "0.4.33",
@@ -2533,59 +1804,6 @@
       "peerDependencies": {
         "bufferutil": "^4.0.1",
         "utf-8-validate": ">=5.0.2"
-=======
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-5.5.0.tgz",
-      "integrity": "sha512-tlA+1n+ziW/Db03hVV+bAecDKse8ihFRXYiEypBe9IlLRvOCzYFG6qrCMBYK34HO/Q/Ecjc+tvkHRAfLVH+NgQ==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "devtools-protocol": "0.0.818844",
-        "extract-zip": "^2.0.0",
-        "https-proxy-agent": "^4.0.0",
-        "node-fetch": "^2.6.1",
-        "pkg-dir": "^4.2.0",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^3.0.2",
-        "tar-fs": "^2.0.0",
-        "unbzip2-stream": "^1.3.3",
-        "ws": "^7.2.3"
-      },
-      "engines": {
-        "node": ">=10.18.1"
-      }
-    },
-    "node_modules/puppeteer-core/node_modules/agent-base": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
-      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/puppeteer-core/node_modules/https-proxy-agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
-      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
-      "dependencies": {
-        "agent-base": "5",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/puppeteer-core/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -2604,24 +1822,11 @@
         "node": ">=0.6"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
-<<<<<<< HEAD
     "node_modules/queue-tick": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
@@ -2644,431 +1849,20 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-=======
-    "node_modules/readability-extractor": {
-      "version": "0.0.2",
-      "resolved": "git+ssh://git@github.com/ArchiveBox/readability-extractor.git#42b243843c724a5d7a6b364d23985ff6acaeb55a",
-      "integrity": "sha512-B+oZuG4FwPYg5hxEafuhrwNOS8uiv/gYKlLKbIaeXXHlyznARYOqHpkHumiLMU6vkbZ3VAC7WucnWwh5jVOaBQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@mozilla/readability": "^0.4.1",
-        "dompurify": "^2.2.7",
-        "jsdom": "^16.5.2"
-      },
-      "bin": {
-        "readability-extractor": "readability-extractor"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
-    },
-    "node_modules/readability-extractor/node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "node_modules/readability-extractor/node_modules/data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-      "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-      "dependencies": {
-        "webidl-conversions": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-      "dependencies": {
-        "whatwg-encoding": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/readability-extractor/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-    },
-    "node_modules/readability-extractor/node_modules/tough-cookie": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-      "engines": {
-        "node": ">=10.4"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-      "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/readability-extractor/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
         "util-deprecate": "^1.0.1"
-<<<<<<< HEAD
-=======
       },
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/regenerator-runtime": {
-<<<<<<< HEAD
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-<<<<<<< HEAD
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
-=======
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
->>>>>>> 0b70a9a (bump dependency versions)
     },
-=======
-    "node_modules/request-promise": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz",
-      "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==",
-      "deprecated": "request-promise has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "bluebird": "^3.5.0",
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-core": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-      "dependencies": {
-        "lodash": "^4.17.19"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise/node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
-    "node_modules/request/node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
-    "node_modules/request/node_modules/jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -3096,14 +1890,11 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-<<<<<<< HEAD
     "node_modules/rrweb-cssom": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
       "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw=="
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -3128,27 +1919,14 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
-<<<<<<< HEAD
     "node_modules/saxes": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
       "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
-=======
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
       "engines": {
-<<<<<<< HEAD
         "node": ">=v12.22.7"
       }
     },
@@ -3163,33 +1941,6 @@
       },
       "engines": {
         "node": ">= 14.20.0"
-=======
-        "node": ">=10"
-      }
-    },
-    "node_modules/selenium-webdriver": {
-      "version": "4.0.0-alpha.7",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.7.tgz",
-      "integrity": "sha512-D4qnTsyTr91jT8f7MfN+OwY0IlU5+5FmlO5xlgRUV6hDEV8JyYx2NerdTEqDDkNq7RZDYc4VoPALk8l578RBHw==",
-      "dependencies": {
-        "jszip": "^3.2.2",
-        "rimraf": "^2.7.1",
-        "tmp": "0.0.30"
-      },
-      "engines": {
-        "node": ">= 10.15.0"
-      }
-    },
-    "node_modules/selenium-webdriver/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/setimmediate": {
@@ -3197,7 +1948,6 @@
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
     },
-<<<<<<< HEAD
     "node_modules/single-file-cli": {
       "version": "1.1.45",
       "resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.45.tgz",
@@ -3275,172 +2025,6 @@
       }
     },
     "node_modules/single-file-cli/node_modules/iconv-lite": {
-=======
-    "node_modules/single-file": {
-      "version": "0.3.16",
-      "resolved": "git+ssh://git@github.com/gildas-lormeau/SingleFile.git#ec9dbc7c2272bff0dc2415a44d6cdfb2b48aa7d2",
-      "integrity": "sha512-NwwtloJdZlPG2zKrTAlcPRowIcwQx+1U39wcyPnfsbpVZKi6FAyLpo+CV0/xVJmvdOO0DSTvimuZtnc8/gJfTw==",
-      "license": "AGPL-3.0-or-later",
-      "dependencies": {
-        "file-url": "^3.0.0",
-        "iconv-lite": "^0.6.2",
-        "jsdom": "^16.4.0",
-        "puppeteer-core": "^5.3.0",
-        "selenium-webdriver": "4.0.0-alpha.7",
-        "strong-data-uri": "^1.0.6",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "single-file": "cli/single-file"
-      }
-    },
-    "node_modules/single-file/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/single-file/node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/single-file/node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/single-file/node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/single-file/node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
-    },
-    "node_modules/single-file/node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/single-file/node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "node_modules/single-file/node_modules/data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-      "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/single-file/node_modules/domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-      "dependencies": {
-        "webidl-conversions": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/single-file/node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/single-file/node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/single-file/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/single-file/node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/single-file/node_modules/html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-      "dependencies": {
-        "whatwg-encoding": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/single-file/node_modules/iconv-lite": {
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
@@ -3451,7 +2035,6 @@
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
     "node_modules/single-file-cli/node_modules/jsdom": {
       "version": "23.0.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.0.tgz",
@@ -3480,48 +2063,7 @@
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
-<<<<<<< HEAD
-        "node": ">=16"
-=======
-    "node_modules/single-file/node_modules/jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
-=======
         "node": ">=18"
->>>>>>> 0b70a9a (bump dependency versions)
       },
       "peerDependencies": {
         "canvas": "^3.0.0"
@@ -3532,7 +2074,6 @@
         }
       }
     },
-<<<<<<< HEAD
     "node_modules/single-file-cli/node_modules/tr46": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
@@ -3650,79 +2191,6 @@
       "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
       "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
     },
-=======
-    "node_modules/single-file/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-    },
-    "node_modules/single-file/node_modules/tough-cookie": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/single-file/node_modules/tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/single-file/node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-      "engines": {
-        "node": ">=10.4"
-      }
-    },
-    "node_modules/single-file/node_modules/whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-      "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/single-file/node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -3733,15 +2201,9 @@
       }
     },
     "node_modules/sshpk": {
-<<<<<<< HEAD
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
-=======
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -3762,17 +2224,6 @@
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/stream-length": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz",
@@ -3781,7 +2232,6 @@
         "bluebird": "^2.6.2"
       }
     },
-<<<<<<< HEAD
     "node_modules/streamx": {
       "version": "2.15.6",
       "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.6.tgz",
@@ -3791,8 +2241,6 @@
         "queue-tick": "^1.0.1"
       }
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -3847,25 +2295,16 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "node_modules/tar-fs": {
-<<<<<<< HEAD
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
       "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
       "dependencies": {
-=======
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "dependencies": {
-        "chownr": "^1.1.1",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
         "tar-stream": "^3.1.5"
       }
     },
     "node_modules/tar-stream": {
-<<<<<<< HEAD
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
       "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
@@ -3873,20 +2312,6 @@
         "b4a": "^1.6.4",
         "fast-fifo": "^1.2.0",
         "streamx": "^2.15.0"
-=======
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/through": {
@@ -3895,7 +2320,6 @@
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
     },
     "node_modules/tmp": {
-<<<<<<< HEAD
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
       "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
@@ -3918,28 +2342,6 @@
       },
       "engines": {
         "node": ">=6"
-=======
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
-      "integrity": "sha512-HXdTB7lvMwcb55XFfrTM8CPr/IYREk4hVBFaQ4b/6nInrluSL86hfHm7vu0luYKCfyBZp2trCjpc8caC3vVM3w==",
-      "dependencies": {
-        "os-tmpdir": "~1.0.1"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/tr46": {
@@ -3953,7 +2355,6 @@
       "integrity": "sha512-em3E3SUDONOjTBcZ36DTm3RvDded3IRU9rX32oHwwXNt3rJD5MVaFlJTQvs8tJoHRoeYP36OuQ1eL/Q7bNEWIQ==",
       "engines": {
         "node": "*"
-<<<<<<< HEAD
       }
     },
     "node_modules/tslib": {
@@ -3967,27 +2368,6 @@
       "integrity": "sha512-ntI9R7fcUKjqBP6QU8rBK2Ehyt8LAzt3UBT9JR9tgo6GtuKvyUzpayWmeMKJw1DPdXzktvtIT8m2mVXz+bL/Qg==",
       "dependencies": {
         "domino": "^2.1.6"
-=======
-      }
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/turndown": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/turndown/-/turndown-5.0.3.tgz",
-      "integrity": "sha512-popfGXEiedpq6F5saRIAThKxq/bbEPVFnsDnUdjaDGIre9f3/OL9Yi/yPbPcZ7RYUDpekghr666bBfZPrwNnhQ==",
-      "dependencies": {
-        "jsdom": "^11.9.0"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/tweetnacl": {
@@ -3995,20 +2375,6 @@
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
     },
-<<<<<<< HEAD
-=======
-    "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/unbzip2-stream": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
@@ -4018,15 +2384,12 @@
         "through": "^2.3.8"
       }
     },
-<<<<<<< HEAD
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "optional": true
     },
-=======
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/universalify": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
@@ -4043,18 +2406,6 @@
         "punycode": "^2.1.0"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -4064,42 +2415,22 @@
         "requires-port": "^1.0.0"
       }
     },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
-=======
     "node_modules/urlpattern-polyfill": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz",
       "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g=="
     },
->>>>>>> 0b70a9a (bump dependency versions)
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/uuid": {
-<<<<<<< HEAD
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "bin": {
         "uuid": "dist/bin/uuid"
-=======
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/valid-url": {
@@ -4120,7 +2451,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-<<<<<<< HEAD
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
@@ -4170,57 +2500,6 @@
         "node": ">=12"
       }
     },
-=======
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-      "dependencies": {
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dependencies": {
-        "iconv-lite": "0.4.24"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
-    },
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     "node_modules/whatwg-url": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
@@ -4230,20 +2509,10 @@
         "webidl-conversions": "^3.0.0"
       }
     },
-<<<<<<< HEAD
     "node_modules/whatwg-url/node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-=======
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
@@ -4267,16 +2536,9 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-      "version": "8.14.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
-=======
       "version": "8.15.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz",
       "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==",
->>>>>>> 0b70a9a (bump dependency versions)
       "engines": {
         "node": ">=10.0.0"
       },
@@ -4291,13 +2553,6 @@
         "utf-8-validate": {
           "optional": true
         }
-=======
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
-      "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==",
-      "dependencies": {
-        "async-limiter": "~1.0.0"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/wuzzy": {
@@ -4309,18 +2564,12 @@
       }
     },
     "node_modules/xml-name-validator": {
-<<<<<<< HEAD
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
       "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "engines": {
         "node": ">=12"
       }
-=======
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
@@ -4336,19 +2585,11 @@
       }
     },
     "node_modules/yargs": {
-<<<<<<< HEAD
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dependencies": {
         "cliui": "^8.0.1",
-=======
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dependencies": {
-        "cliui": "^7.0.2",
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
@@ -4357,11 +2598,7 @@
         "yargs-parser": "^21.1.1"
       },
       "engines": {
-<<<<<<< HEAD
         "node": ">=12"
-=======
-        "node": ">=10"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/yargs-parser": {
@@ -4374,19 +2611,11 @@
       }
     },
     "node_modules/yargs/node_modules/yargs-parser": {
-<<<<<<< HEAD
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "engines": {
         "node": ">=12"
-=======
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "engines": {
-        "node": ">=10"
->>>>>>> 46b944b (wip pre-0.7.1 side fixes)
       }
     },
     "node_modules/yauzl": {

From 1f71fedff7ddf2e2e5649f32d4eb5cfbf50899a9 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 2 Jan 2024 17:22:54 -0800
Subject: [PATCH 080/126] dont check for PGID=0 anymore

---
 bin/docker_entrypoint.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index 700105b5..5a80012b 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -31,7 +31,7 @@ export DEFAULT_PUID=911
 export DEFAULT_PGID=911
 
 # If user tires to set PUID and PGID to root values manually, catch and reject because root is not allowed
-if [[ "$PUID" == "0" ]] || [[ "$PGID" == "0" ]]; then
+if [[ "$PUID" == "0" ]]; then
     echo -e "\n[X] Error: Got PUID=$PUID and PGID=$PGID but ArchiveBox is not allowed to be run as root, please change or unset PUID & PGID and try again." > /dev/stderr
     echo -e "    Hint: some NFS/SMB/FUSE/etc. filesystems force-remap/ignore all permissions," > /dev/stderr
         echo -e "          leave PUID/PGID unset, or use values the filesystem prefers (defaults to $DEFAULT_PUID:$DEFAULT_PGID)" > /dev/stderr
@@ -45,7 +45,6 @@ export DETECTED_PGID="$(stat -c '%g' "$DATA_DIR/logs/errors.log" 2>/dev/null ||
 
 # If data directory exists but is owned by root, use defaults instead of root because root is not allowed
 [[ "$DETECTED_PUID" == "0" ]] && export DETECTED_PUID="$DEFAULT_PUID"
-[[ "$DETECTED_PGID" == "0" ]] && export DETECTED_PGID="$DEFAULT_PGID"
 
 # Set archivebox user and group ids to desired PUID/PGID
 usermod -o -u "${PUID:-$DETECTED_PUID}" "$ARCHIVEBOX_USER" > /dev/null 2>&1

From 2c54e55697ec9c0cddd1ee4fd61d0e462a1d8fab Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 2 Jan 2024 19:50:56 -0800
Subject: [PATCH 081/126] prefer dom dump to singlefile for generating
 readability output

---
 archivebox/extractors/readability.py |   2 +-
 package-lock.json                    | 456 +++++++--------------------
 package.json                         |   2 +-
 pdm.lock                             | 190 +++++------
 requirements.txt                     |  10 +-
 5 files changed, 217 insertions(+), 443 deletions(-)

diff --git a/archivebox/extractors/readability.py b/archivebox/extractors/readability.py
index e6e5e061..f849d909 100644
--- a/archivebox/extractors/readability.py
+++ b/archivebox/extractors/readability.py
@@ -99,7 +99,7 @@ def save_readability(link: Link, out_dir: Optional[str]=None, timeout: int=TIMEO
     except (Exception, OSError) as err:
         status = 'failed'
         output = err
-        cmd = [cmd[0], './{singlefile,dom}.html']
+        cmd = [cmd[0], './{dom,singlefile}.html']
     finally:
         timer.end()
 
diff --git a/package-lock.json b/package-lock.json
index f8c3863d..d289c7fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,13 +11,13 @@
       "dependencies": {
         "@postlight/parser": "^2.2.3",
         "readability-extractor": "github:ArchiveBox/readability-extractor",
-        "single-file-cli": "^1.1.45"
+        "single-file-cli": "^1.1.46"
       }
     },
     "node_modules/@babel/runtime-corejs2": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.23.6.tgz",
-      "integrity": "sha512-k8QKC2DmBqkwJDOLa4biAZjoCGPQIaAoA1HvHtZ+gR2E9AauudikJOB34h4ETEavN5UG21X0KPdM3IvBRxM0CA==",
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.23.7.tgz",
+      "integrity": "sha512-JmMk2t1zGDNkvsY2MsLLksocjY+ufGzSk8UlcNcxzfrzAPu4nMx0HRFakzIg2bhcqQq6xBI2nUaW/sHoaYIHdQ==",
       "dependencies": {
         "core-js": "^2.6.12",
         "regenerator-runtime": "^0.14.0"
@@ -187,23 +187,15 @@
         "node": ">=16.3.0"
       }
     },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@tootallnate/quickjs-emscripten": {
       "version": "0.23.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
       "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
     },
     "node_modules/@types/node": {
-      "version": "20.10.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz",
-      "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==",
+      "version": "20.10.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz",
+      "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==",
       "optional": true,
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -218,49 +210,15 @@
         "@types/node": "*"
       }
     },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "deprecated": "Use your platform's native atob() and btoa() methods instead"
-    },
-    "node_modules/acorn": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
-      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
-      "dependencies": {
-        "acorn": "^8.1.0",
-        "acorn-walk": "^8.0.2"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz",
-      "integrity": "sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
       "dependencies": {
-        "debug": "4"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/ajv": {
@@ -614,39 +572,38 @@
       }
     },
     "node_modules/data-urls": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
       "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.0"
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/data-urls/node_modules/tr46": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
+      "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
       "dependencies": {
-        "punycode": "^2.3.0"
+        "punycode": "^2.3.1"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
+      "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
       "dependencies": {
-        "tr46": "^4.1.1",
+        "tr46": "^5.0.0",
         "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/debug": {
@@ -725,18 +682,6 @@
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
     },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "deprecated": "Use your platform's native DOMException instead",
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
@@ -751,9 +696,9 @@
       "integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="
     },
     "node_modules/dompurify": {
-      "version": "2.4.7",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz",
-      "integrity": "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz",
+      "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w=="
     },
     "node_modules/domutils": {
       "version": "1.5.1",
@@ -1065,14 +1010,14 @@
       "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="
     },
     "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
       "dependencies": {
-        "whatwg-encoding": "^2.0.0"
+        "whatwg-encoding": "^3.1.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/htmlparser2": {
@@ -1089,16 +1034,15 @@
       }
     },
     "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
       "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/http-signature": {
@@ -1115,15 +1059,15 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^7.0.2",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/iconv-lite": {
@@ -1214,42 +1158,37 @@
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
     },
     "node_modules/jsdom": {
-      "version": "21.1.2",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.2.tgz",
-      "integrity": "sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ==",
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.1.tgz",
+      "integrity": "sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==",
       "dependencies": {
-        "abab": "^2.0.6",
-        "acorn": "^8.8.2",
-        "acorn-globals": "^7.0.0",
         "cssstyle": "^3.0.0",
-        "data-urls": "^4.0.0",
+        "data-urls": "^5.0.0",
         "decimal.js": "^10.4.3",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
         "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
+        "html-encoding-sniffer": "^4.0.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.2",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.4",
+        "nwsapi": "^2.2.7",
         "parse5": "^7.1.2",
         "rrweb-cssom": "^0.6.0",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
+        "tough-cookie": "^4.1.3",
+        "w3c-xmlserializer": "^5.0.0",
         "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.1",
-        "ws": "^8.13.0",
-        "xml-name-validator": "^4.0.0"
+        "whatwg-encoding": "^3.1.1",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0",
+        "ws": "^8.14.2",
+        "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "canvas": "^2.5.0"
+        "canvas": "^2.11.2"
       },
       "peerDependenciesMeta": {
         "canvas": {
@@ -1258,26 +1197,26 @@
       }
     },
     "node_modules/jsdom/node_modules/tr46": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
+      "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
       "dependencies": {
-        "punycode": "^2.3.0"
+        "punycode": "^2.3.1"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
+      "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
       "dependencies": {
-        "tr46": "^4.1.1",
+        "tr46": "^5.0.0",
         "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/json-schema": {
@@ -1476,6 +1415,14 @@
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/moment-parseformat": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/moment-parseformat/-/moment-parseformat-3.0.0.tgz",
@@ -1560,41 +1507,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/pac-proxy-agent/node_modules/agent-base": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/pac-resolver": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz",
@@ -1716,41 +1628,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/proxy-agent/node_modules/agent-base": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -1833,13 +1710,13 @@
       "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
     },
     "node_modules/readability-extractor": {
-      "version": "0.0.10",
-      "resolved": "git+ssh://git@github.com/ArchiveBox/readability-extractor.git#be5c3222990d4f0459b21e74802565309bdd1d52",
+      "version": "0.0.11",
+      "resolved": "git+ssh://git@github.com/ArchiveBox/readability-extractor.git#2fb4689a65c6433036453dcbee7a268840604eb9",
       "license": "MIT",
       "dependencies": {
         "@mozilla/readability": "^0.5.0",
-        "dompurify": "^2.4.7",
-        "jsdom": "^21.1.2"
+        "dompurify": "^3.0.6",
+        "jsdom": "^23.0.1"
       },
       "bin": {
         "readability-extractor": "readability-extractor"
@@ -1949,16 +1826,16 @@
       "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
     },
     "node_modules/single-file-cli": {
-      "version": "1.1.45",
-      "resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.45.tgz",
-      "integrity": "sha512-ALpNbsRKXj8fIcoLJ63sISuCK9v69Ar2T1uozknQoyllJSPYoKgw/xP1MSVyTaBOpfVgYi8nN4kJQQvFOYdgTw==",
+      "version": "1.1.46",
+      "resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.46.tgz",
+      "integrity": "sha512-+vFj0a5Y4ESqpMwH0T6738pg8ZA9KVhhl6OlIOsicamGNU9DnMa+q9dL1S2KnLWHoauKjU0BThhR/YKUleJSxw==",
       "dependencies": {
         "file-url": "3.0.0",
         "iconv-lite": "0.6.3",
         "jsdom": "23.0.0",
         "puppeteer-core": "21.5.2",
         "selenium-webdriver": "4.15.0",
-        "single-file-core": "1.3.14",
+        "single-file-core": "1.3.15",
         "strong-data-uri": "1.0.6",
         "yargs": "17.7.2"
       },
@@ -1966,64 +1843,6 @@
         "single-file": "single-file"
       }
     },
-    "node_modules/single-file-cli/node_modules/agent-base": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/single-file-cli/node_modules/data-urls": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
-      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
-      "dependencies": {
-        "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^14.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/single-file-cli/node_modules/html-encoding-sniffer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
-      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
-      "dependencies": {
-        "whatwg-encoding": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/single-file-cli/node_modules/http-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/single-file-cli/node_modules/https-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/single-file-cli/node_modules/iconv-lite": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
@@ -2085,36 +1904,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/single-file-cli/node_modules/w3c-xmlserializer": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
-      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
-      "dependencies": {
-        "xml-name-validator": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/single-file-cli/node_modules/whatwg-encoding": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
-      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/single-file-cli/node_modules/whatwg-mimetype": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
-      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/single-file-cli/node_modules/whatwg-url": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
@@ -2127,18 +1916,10 @@
         "node": ">=18"
       }
     },
-    "node_modules/single-file-cli/node_modules/xml-name-validator": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
-      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/single-file-core": {
-      "version": "1.3.14",
-      "resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.3.14.tgz",
-      "integrity": "sha512-ynYvJpgQUPhGOm2tZdzZLxkTImz8X/qqd0203umWUhVTx4PqgLO9pqjy90Mlh2Ldp8jug2sZQkXaD80pPmFewA=="
+      "version": "1.3.15",
+      "resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.3.15.tgz",
+      "integrity": "sha512-/YNpHBwASWNxmSmZXz0xRolmXf0+PGAbwpVrwn6A8tYeuAdezxxde5RYTTQ7V4Zv68+H4JMhE2DwCRV0sVUGNA=="
     },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
@@ -2175,17 +1956,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/socks-proxy-agent/node_modules/agent-base": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/socks/node_modules/ip": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
@@ -2452,14 +2222,14 @@
       }
     },
     "node_modules/w3c-xmlserializer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
       "dependencies": {
-        "xml-name-validator": "^4.0.0"
+        "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/webidl-conversions": {
@@ -2471,14 +2241,14 @@
       }
     },
     "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/whatwg-encoding/node_modules/iconv-lite": {
@@ -2493,11 +2263,11 @@
       }
     },
     "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/whatwg-url": {
@@ -2536,9 +2306,9 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
-      "version": "8.15.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz",
-      "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -2564,11 +2334,11 @@
       }
     },
     "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/xmlchars": {
diff --git a/package.json b/package.json
index 995d60c9..caa99e79 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,6 @@
   "dependencies": {
     "@postlight/parser": "^2.2.3",
     "readability-extractor": "github:ArchiveBox/readability-extractor",
-    "single-file-cli": "^1.1.45"
+    "single-file-cli": "^1.1.46"
   }
 }
diff --git a/pdm.lock b/pdm.lock
index 1f70acc9..c39fcfab 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -540,31 +540,31 @@ files = [
 
 [[package]]
 name = "pycryptodomex"
-version = "3.19.0"
+version = "3.19.1"
 requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 summary = "Cryptographic library for Python"
 files = [
-    {file = "pycryptodomex-3.19.0-cp35-abi3-macosx_10_9_universal2.whl", hash = "sha256:a77b79852175064c822b047fee7cf5a1f434f06ad075cc9986aa1c19a0c53eb0"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:5b883e1439ab63af976656446fb4839d566bb096f15fc3c06b5a99cde4927188"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a3866d68e2fc345162b1b9b83ef80686acfe5cec0d134337f3b03950a0a8bf56"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c74eb1f73f788facece7979ce91594dc177e1a9b5d5e3e64697dd58299e5cb4d"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7cb51096a6a8d400724104db8a7e4f2206041a1f23e58924aa3d8d96bcb48338"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:a588a1cb7781da9d5e1c84affd98c32aff9c89771eac8eaa659d2760666f7139"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-musllinux_1_1_i686.whl", hash = "sha256:d4dd3b381ff5a5907a3eb98f5f6d32c64d319a840278ceea1dcfcc65063856f3"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:263de9a96d2fcbc9f5bd3a279f14ea0d5f072adb68ebd324987576ec25da084d"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-win32.whl", hash = "sha256:67c8eb79ab33d0fbcb56842992298ddb56eb6505a72369c20f60bc1d2b6fb002"},
-    {file = "pycryptodomex-3.19.0-cp35-abi3-win_amd64.whl", hash = "sha256:09c9401dc06fb3d94cb1ec23b4ea067a25d1f4c6b7b118ff5631d0b5daaab3cc"},
-    {file = "pycryptodomex-3.19.0-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:edbe083c299835de7e02c8aa0885cb904a75087d35e7bab75ebe5ed336e8c3e2"},
-    {file = "pycryptodomex-3.19.0-pp27-pypy_73-win32.whl", hash = "sha256:136b284e9246b4ccf4f752d435c80f2c44fc2321c198505de1d43a95a3453b3c"},
-    {file = "pycryptodomex-3.19.0-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5d73e9fa3fe830e7b6b42afc49d8329b07a049a47d12e0ef9225f2fd220f19b2"},
-    {file = "pycryptodomex-3.19.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b2f1982c5bc311f0aab8c293524b861b485d76f7c9ab2c3ac9a25b6f7655975"},
-    {file = "pycryptodomex-3.19.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bfb040b5dda1dff1e197d2ef71927bd6b8bfcb9793bc4dfe0bb6df1e691eaacb"},
-    {file = "pycryptodomex-3.19.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:800a2b05cfb83654df80266692f7092eeefe2a314fa7901dcefab255934faeec"},
-    {file = "pycryptodomex-3.19.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:c01678aee8ac0c1a461cbc38ad496f953f9efcb1fa19f5637cbeba7544792a53"},
-    {file = "pycryptodomex-3.19.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2126bc54beccbede6eade00e647106b4f4c21e5201d2b0a73e9e816a01c50905"},
-    {file = "pycryptodomex-3.19.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b801216c48c0886742abf286a9a6b117e248ca144d8ceec1f931ce2dd0c9cb40"},
-    {file = "pycryptodomex-3.19.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:50cb18d4dd87571006fd2447ccec85e6cec0136632a550aa29226ba075c80644"},
-    {file = "pycryptodomex-3.19.0.tar.gz", hash = "sha256:af83a554b3f077564229865c45af0791be008ac6469ef0098152139e6bd4b5b6"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-macosx_10_9_universal2.whl", hash = "sha256:ed3bdda44cc05dd13eee697ab9bea6928531bb7b218e68e66d0d3eb2ebab043e"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:ae75eea2e908383fd4c659fdcfe9621a72869e3e3ee73904227e93b7f7b80b54"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:371bbe0be17b4dd8cc0c2f378d75ea33f00d5a39884c09a672016ac40145a5fa"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96000b837bcd8e3bf86b419924a056c978e45027281e4318650c81c25a3ef6cc"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:011e859026ecbd15b8e720e8992361186e582cf726c50bde6ff8c0c05e820ddf"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:76414d39df6b45bcc4f38cf1ba2031e0f4b8e99d1ba3c2eee31ffe1b9f039733"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-musllinux_1_1_i686.whl", hash = "sha256:1c04cfff163c05d033bf28e3c4429d8222796738c7b6c1638b9d7090b904611e"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:de5a43901e47e7a6938490fc5de3074f6e35c8b481a75b227c0d24d6099bd41d"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-win32.whl", hash = "sha256:f24f49fc6bd706d87048654d6be6c7c967d6836d4879e3a7c439275fab9948ad"},
+    {file = "pycryptodomex-3.19.1-cp35-abi3-win_amd64.whl", hash = "sha256:f8b3d9e7c17c1ffc1fa5b11c0bbab8a5df3de8596bb32ad30281b21e5ede4bf5"},
+    {file = "pycryptodomex-3.19.1-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:ac562e239d98cfef763866c0aee4586affb0d58c592202f06c87241af99db241"},
+    {file = "pycryptodomex-3.19.1-pp27-pypy_73-win32.whl", hash = "sha256:39eb1f82ac3ba3e39d866f38e480e8fa53fcdd22260340f05f54a8188d47d510"},
+    {file = "pycryptodomex-3.19.1-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0bc4b7bfaac56e6dfd62044847443a3d110c7abea7fcb0d68c1aea64ed3a6697"},
+    {file = "pycryptodomex-3.19.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8dffe067d5fff14dba4d18ff7d459cc2a47576d82dafbff13a8f1199c3353e41"},
+    {file = "pycryptodomex-3.19.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aab7941c2ff53eb63cb26252770e4f14386d79ce07baeffbf98a1323c1646545"},
+    {file = "pycryptodomex-3.19.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:3f3c58971784fba0e014bc3f8aed1197b86719631e1b597d36d7354be5598312"},
+    {file = "pycryptodomex-3.19.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5ca98de2e5ac100e57a7116309723360e8f799f722509e376dc396cdf65eec9c"},
+    {file = "pycryptodomex-3.19.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8a97b1acd36e9ce9d4067d94a8be99c458f0eb8070828639302a95cfcf0770b"},
+    {file = "pycryptodomex-3.19.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62f51a63d73153482729904381dd2de86800b0733a8814ee8f072fa73e5c92fb"},
+    {file = "pycryptodomex-3.19.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:9919a1edd2a83c4dfb69f1d8a4c0c5efde7147ef15b07775633372b80c90b5d8"},
+    {file = "pycryptodomex-3.19.1.tar.gz", hash = "sha256:0b7154aff2272962355f8941fd514104a88cb29db2d8f43a29af900d6398eb1c"},
 ]
 
 [[package]]
@@ -626,69 +626,73 @@ files = [
 
 [[package]]
 name = "regex"
-version = "2023.10.3"
+version = "2023.12.25"
 requires_python = ">=3.7"
 summary = "Alternative regular expression module, to replace re."
 files = [
-    {file = "regex-2023.10.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4c34d4f73ea738223a094d8e0ffd6d2c1a1b4c175da34d6b0de3d8d69bee6bcc"},
-    {file = "regex-2023.10.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a8f4e49fc3ce020f65411432183e6775f24e02dff617281094ba6ab079ef0915"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4cd1bccf99d3ef1ab6ba835308ad85be040e6a11b0977ef7ea8c8005f01a3c29"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:81dce2ddc9f6e8f543d94b05d56e70d03a0774d32f6cca53e978dc01e4fc75b8"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c6b4d23c04831e3ab61717a707a5d763b300213db49ca680edf8bf13ab5d91b"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c15ad0aee158a15e17e0495e1e18741573d04eb6da06d8b84af726cfc1ed02ee"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6239d4e2e0b52c8bd38c51b760cd870069f0bdf99700a62cd509d7a031749a55"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4a8bf76e3182797c6b1afa5b822d1d5802ff30284abe4599e1247be4fd6b03be"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9c727bbcf0065cbb20f39d2b4f932f8fa1631c3e01fcedc979bd4f51fe051c5"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3ccf2716add72f80714b9a63899b67fa711b654be3fcdd34fa391d2d274ce767"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:107ac60d1bfdc3edb53be75e2a52aff7481b92817cfdddd9b4519ccf0e54a6ff"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:00ba3c9818e33f1fa974693fb55d24cdc8ebafcb2e4207680669d8f8d7cca79a"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f0a47efb1dbef13af9c9a54a94a0b814902e547b7f21acb29434504d18f36e3a"},
-    {file = "regex-2023.10.3-cp310-cp310-win32.whl", hash = "sha256:36362386b813fa6c9146da6149a001b7bd063dabc4d49522a1f7aa65b725c7ec"},
-    {file = "regex-2023.10.3-cp310-cp310-win_amd64.whl", hash = "sha256:c65a3b5330b54103e7d21cac3f6bf3900d46f6d50138d73343d9e5b2900b2353"},
-    {file = "regex-2023.10.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:90a79bce019c442604662d17bf69df99090e24cdc6ad95b18b6725c2988a490e"},
-    {file = "regex-2023.10.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c7964c2183c3e6cce3f497e3a9f49d182e969f2dc3aeeadfa18945ff7bdd7051"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ef80829117a8061f974b2fda8ec799717242353bff55f8a29411794d635d964"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5addc9d0209a9afca5fc070f93b726bf7003bd63a427f65ef797a931782e7edc"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c148bec483cc4b421562b4bcedb8e28a3b84fcc8f0aa4418e10898f3c2c0eb9b"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d1f21af4c1539051049796a0f50aa342f9a27cde57318f2fc41ed50b0dbc4ac"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0b9ac09853b2a3e0d0082104036579809679e7715671cfbf89d83c1cb2a30f58"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ebedc192abbc7fd13c5ee800e83a6df252bec691eb2c4bedc9f8b2e2903f5e2a"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d8a993c0a0ffd5f2d3bda23d0cd75e7086736f8f8268de8a82fbc4bd0ac6791e"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:be6b7b8d42d3090b6c80793524fa66c57ad7ee3fe9722b258aec6d0672543fd0"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4023e2efc35a30e66e938de5aef42b520c20e7eda7bb5fb12c35e5d09a4c43f6"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0d47840dc05e0ba04fe2e26f15126de7c755496d5a8aae4a08bda4dd8d646c54"},
-    {file = "regex-2023.10.3-cp311-cp311-win32.whl", hash = "sha256:9145f092b5d1977ec8c0ab46e7b3381b2fd069957b9862a43bd383e5c01d18c2"},
-    {file = "regex-2023.10.3-cp311-cp311-win_amd64.whl", hash = "sha256:b6104f9a46bd8743e4f738afef69b153c4b8b592d35ae46db07fc28ae3d5fb7c"},
-    {file = "regex-2023.10.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:bff507ae210371d4b1fe316d03433ac099f184d570a1a611e541923f78f05037"},
-    {file = "regex-2023.10.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:be5e22bbb67924dea15039c3282fa4cc6cdfbe0cbbd1c0515f9223186fc2ec5f"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a992f702c9be9c72fa46f01ca6e18d131906a7180950958f766c2aa294d4b41"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7434a61b158be563c1362d9071358f8ab91b8d928728cd2882af060481244c9e"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c2169b2dcabf4e608416f7f9468737583ce5f0a6e8677c4efbf795ce81109d7c"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9e908ef5889cda4de038892b9accc36d33d72fb3e12c747e2799a0e806ec841"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:12bd4bc2c632742c7ce20db48e0d99afdc05e03f0b4c1af90542e05b809a03d9"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bc72c231f5449d86d6c7d9cc7cd819b6eb30134bb770b8cfdc0765e48ef9c420"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:bce8814b076f0ce5766dc87d5a056b0e9437b8e0cd351b9a6c4e1134a7dfbda9"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:ba7cd6dc4d585ea544c1412019921570ebd8a597fabf475acc4528210d7c4a6f"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b0c7d2f698e83f15228ba41c135501cfe7d5740181d5903e250e47f617eb4292"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5a8f91c64f390ecee09ff793319f30a0f32492e99f5dc1c72bc361f23ccd0a9a"},
-    {file = "regex-2023.10.3-cp312-cp312-win32.whl", hash = "sha256:ad08a69728ff3c79866d729b095872afe1e0557251da4abb2c5faff15a91d19a"},
-    {file = "regex-2023.10.3-cp312-cp312-win_amd64.whl", hash = "sha256:39cdf8d141d6d44e8d5a12a8569d5a227f645c87df4f92179bd06e2e2705e76b"},
-    {file = "regex-2023.10.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2c54e23836650bdf2c18222c87f6f840d4943944146ca479858404fedeb9f9af"},
-    {file = "regex-2023.10.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:69c0771ca5653c7d4b65203cbfc5e66db9375f1078689459fe196fe08b7b4930"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ac965a998e1388e6ff2e9781f499ad1eaa41e962a40d11c7823c9952c77123e"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1c0e8fae5b27caa34177bdfa5a960c46ff2f78ee2d45c6db15ae3f64ecadde14"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6c56c3d47da04f921b73ff9415fbaa939f684d47293f071aa9cbb13c94afc17d"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ef1e014eed78ab650bef9a6a9cbe50b052c0aebe553fb2881e0453717573f52"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d29338556a59423d9ff7b6eb0cb89ead2b0875e08fe522f3e068b955c3e7b59b"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9c6d0ced3c06d0f183b73d3c5920727268d2201aa0fe6d55c60d68c792ff3588"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:994645a46c6a740ee8ce8df7911d4aee458d9b1bc5639bc968226763d07f00fa"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:66e2fe786ef28da2b28e222c89502b2af984858091675044d93cb50e6f46d7af"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:11175910f62b2b8c055f2b089e0fedd694fe2be3941b3e2633653bc51064c528"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:06e9abc0e4c9ab4779c74ad99c3fc10d3967d03114449acc2c2762ad4472b8ca"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:fb02e4257376ae25c6dd95a5aec377f9b18c09be6ebdefa7ad209b9137b73d48"},
-    {file = "regex-2023.10.3-cp39-cp39-win32.whl", hash = "sha256:3b2c3502603fab52d7619b882c25a6850b766ebd1b18de3df23b2f939360e1bd"},
-    {file = "regex-2023.10.3-cp39-cp39-win_amd64.whl", hash = "sha256:adbccd17dcaff65704c856bd29951c58a1bd4b2b0f8ad6b826dbd543fe740988"},
-    {file = "regex-2023.10.3.tar.gz", hash = "sha256:3fef4f844d2290ee0ba57addcec17eec9e3df73f10a2748485dfd6a3a188cc0f"},
+    {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0694219a1d54336fd0445ea382d49d36882415c0134ee1e8332afd1529f0baa5"},
+    {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b014333bd0217ad3d54c143de9d4b9a3ca1c5a29a6d0d554952ea071cff0f1f8"},
+    {file = "regex-2023.12.25-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d865984b3f71f6d0af64d0d88f5733521698f6c16f445bb09ce746c92c97c586"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e0eabac536b4cc7f57a5f3d095bfa557860ab912f25965e08fe1545e2ed8b4c"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c25a8ad70e716f96e13a637802813f65d8a6760ef48672aa3502f4c24ea8b400"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9b6d73353f777630626f403b0652055ebfe8ff142a44ec2cf18ae470395766e"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9cc99d6946d750eb75827cb53c4371b8b0fe89c733a94b1573c9dd16ea6c9e4"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88d1f7bef20c721359d8675f7d9f8e414ec5003d8f642fdfd8087777ff7f94b5"},
+    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cb3fe77aec8f1995611f966d0c656fdce398317f850d0e6e7aebdfe61f40e1cd"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7aa47c2e9ea33a4a2a05f40fcd3ea36d73853a2aae7b4feab6fc85f8bf2c9704"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:df26481f0c7a3f8739fecb3e81bc9da3fcfae34d6c094563b9d4670b047312e1"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c40281f7d70baf6e0db0c2f7472b31609f5bc2748fe7275ea65a0b4601d9b392"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d94a1db462d5690ebf6ae86d11c5e420042b9898af5dcf278bd97d6bda065423"},
+    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ba1b30765a55acf15dce3f364e4928b80858fa8f979ad41f862358939bdd1f2f"},
+    {file = "regex-2023.12.25-cp310-cp310-win32.whl", hash = "sha256:150c39f5b964e4d7dba46a7962a088fbc91f06e606f023ce57bb347a3b2d4630"},
+    {file = "regex-2023.12.25-cp310-cp310-win_amd64.whl", hash = "sha256:09da66917262d9481c719599116c7dc0c321ffcec4b1f510c4f8a066f8768105"},
+    {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:1b9d811f72210fa9306aeb88385b8f8bcef0dfbf3873410413c00aa94c56c2b6"},
+    {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d902a43085a308cef32c0d3aea962524b725403fd9373dea18110904003bac97"},
+    {file = "regex-2023.12.25-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d166eafc19f4718df38887b2bbe1467a4f74a9830e8605089ea7a30dd4da8887"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7ad32824b7f02bb3c9f80306d405a1d9b7bb89362d68b3c5a9be53836caebdb"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:636ba0a77de609d6510235b7f0e77ec494d2657108f777e8765efc060094c98c"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0fda75704357805eb953a3ee15a2b240694a9a514548cd49b3c5124b4e2ad01b"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f72cbae7f6b01591f90814250e636065850c5926751af02bb48da94dfced7baa"},
+    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db2a0b1857f18b11e3b0e54ddfefc96af46b0896fb678c85f63fb8c37518b3e7"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7502534e55c7c36c0978c91ba6f61703faf7ce733715ca48f499d3dbbd7657e0"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e8c7e08bb566de4faaf11984af13f6bcf6a08f327b13631d41d62592681d24fe"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:283fc8eed679758de38fe493b7d7d84a198b558942b03f017b1f94dda8efae80"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f44dd4d68697559d007462b0a3a1d9acd61d97072b71f6d1968daef26bc744bd"},
+    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:67d3ccfc590e5e7197750fcb3a2915b416a53e2de847a728cfa60141054123d4"},
+    {file = "regex-2023.12.25-cp311-cp311-win32.whl", hash = "sha256:68191f80a9bad283432385961d9efe09d783bcd36ed35a60fb1ff3f1ec2efe87"},
+    {file = "regex-2023.12.25-cp311-cp311-win_amd64.whl", hash = "sha256:7d2af3f6b8419661a0c421584cfe8aaec1c0e435ce7e47ee2a97e344b98f794f"},
+    {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8a0ccf52bb37d1a700375a6b395bff5dd15c50acb745f7db30415bae3c2b0715"},
+    {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c3c4a78615b7762740531c27cf46e2f388d8d727d0c0c739e72048beb26c8a9d"},
+    {file = "regex-2023.12.25-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ad83e7545b4ab69216cef4cc47e344d19622e28aabec61574b20257c65466d6a"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7a635871143661feccce3979e1727c4e094f2bdfd3ec4b90dfd4f16f571a87a"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d498eea3f581fbe1b34b59c697512a8baef88212f92e4c7830fcc1499f5b45a5"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:43f7cd5754d02a56ae4ebb91b33461dc67be8e3e0153f593c509e21d219c5060"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51f4b32f793812714fd5307222a7f77e739b9bc566dc94a18126aba3b92b98a3"},
+    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba99d8077424501b9616b43a2d208095746fb1284fc5ba490139651f971d39d9"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4bfc2b16e3ba8850e0e262467275dd4d62f0d045e0e9eda2bc65078c0110a11f"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8c2c19dae8a3eb0ea45a8448356ed561be843b13cbc34b840922ddf565498c1c"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:60080bb3d8617d96f0fb7e19796384cc2467447ef1c491694850ebd3670bc457"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b77e27b79448e34c2c51c09836033056a0547aa360c45eeeb67803da7b0eedaf"},
+    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:518440c991f514331f4850a63560321f833979d145d7d81186dbe2f19e27ae3d"},
+    {file = "regex-2023.12.25-cp312-cp312-win32.whl", hash = "sha256:e2610e9406d3b0073636a3a2e80db05a02f0c3169b5632022b4e81c0364bcda5"},
+    {file = "regex-2023.12.25-cp312-cp312-win_amd64.whl", hash = "sha256:cc37b9aeebab425f11f27e5e9e6cf580be7206c6582a64467a14dda211abc232"},
+    {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f7bc09bc9c29ebead055bcba136a67378f03d66bf359e87d0f7c759d6d4ffa31"},
+    {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e14b73607d6231f3cc4622809c196b540a6a44e903bcfad940779c80dffa7be7"},
+    {file = "regex-2023.12.25-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9eda5f7a50141291beda3edd00abc2d4a5b16c29c92daf8d5bd76934150f3edc"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc6bb9aa69aacf0f6032c307da718f61a40cf970849e471254e0e91c56ffca95"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:298dc6354d414bc921581be85695d18912bea163a8b23cac9a2562bbcd5088b1"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2f4e475a80ecbd15896a976aa0b386c5525d0ed34d5c600b6d3ebac0a67c7ddf"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:531ac6cf22b53e0696f8e1d56ce2396311254eb806111ddd3922c9d937151dae"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22f3470f7524b6da61e2020672df2f3063676aff444db1daa283c2ea4ed259d6"},
+    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:89723d2112697feaa320c9d351e5f5e7b841e83f8b143dba8e2d2b5f04e10923"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0ecf44ddf9171cd7566ef1768047f6e66975788258b1c6c6ca78098b95cf9a3d"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:905466ad1702ed4acfd67a902af50b8db1feeb9781436372261808df7a2a7bca"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:4558410b7a5607a645e9804a3e9dd509af12fb72b9825b13791a37cd417d73a5"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:7e316026cc1095f2a3e8cc012822c99f413b702eaa2ca5408a513609488cb62f"},
+    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3b1de218d5375cd6ac4b5493e0b9f3df2be331e86520f23382f216c137913d20"},
+    {file = "regex-2023.12.25-cp39-cp39-win32.whl", hash = "sha256:11a963f8e25ab5c61348d090bf1b07f1953929c13bd2309a0662e9ff680763c9"},
+    {file = "regex-2023.12.25-cp39-cp39-win_amd64.whl", hash = "sha256:e693e233ac92ba83a87024e1d32b5f9ab15ca55ddd916d878146f4e3406b5c91"},
+    {file = "regex-2023.12.25.tar.gz", hash = "sha256:29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5"},
 ]
 
 [[package]]
@@ -752,12 +756,12 @@ files = [
 
 [[package]]
 name = "traitlets"
-version = "5.14.0"
+version = "5.14.1"
 requires_python = ">=3.8"
 summary = "Traitlets Python configuration system"
 files = [
-    {file = "traitlets-5.14.0-py3-none-any.whl", hash = "sha256:f14949d23829023013c47df20b4a76ccd1a85effb786dc060f34de7948361b33"},
-    {file = "traitlets-5.14.0.tar.gz", hash = "sha256:fcdaa8ac49c04dfa0ed3ee3384ef6dfdb5d6f3741502be247279407679296772"},
+    {file = "traitlets-5.14.1-py3-none-any.whl", hash = "sha256:2e5a030e6eff91737c643231bfcf04a65b0132078dad75e4936700b213652e74"},
+    {file = "traitlets-5.14.1.tar.gz", hash = "sha256:8585105b371a04b8316a43d5ce29c098575c2e477850b62b848b964f1444527e"},
 ]
 
 [[package]]
@@ -772,12 +776,12 @@ files = [
 
 [[package]]
 name = "tzdata"
-version = "2023.3"
+version = "2023.4"
 requires_python = ">=2"
 summary = "Provider of IANA time zone data"
 files = [
-    {file = "tzdata-2023.3-py2.py3-none-any.whl", hash = "sha256:7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda"},
-    {file = "tzdata-2023.3.tar.gz", hash = "sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a"},
+    {file = "tzdata-2023.4-py2.py3-none-any.whl", hash = "sha256:aa3ace4329eeacda5b7beb7ea08ece826c28d761cda36e747cfbf97996d39bf3"},
+    {file = "tzdata-2023.4.tar.gz", hash = "sha256:dd54c94f294765522c77399649b4fefd95522479a664a0cec87f41bebc6148c9"},
 ]
 
 [[package]]
@@ -893,8 +897,8 @@ files = [
 
 [[package]]
 name = "yt-dlp"
-version = "2023.11.16"
-requires_python = ">=3.7"
+version = "2023.12.30"
+requires_python = ">=3.8"
 summary = "A youtube-dl fork with additional features and patches"
 dependencies = [
     "brotli; implementation_name == \"cpython\"",
@@ -904,9 +908,9 @@ dependencies = [
     "pycryptodomex",
     "requests<3,>=2.31.0",
     "urllib3<3,>=1.26.17",
-    "websockets",
+    "websockets>=12.0",
 ]
 files = [
-    {file = "yt-dlp-2023.11.16.tar.gz", hash = "sha256:f0ccdaf12e08b15902601a4671c7ab12906d7b11de3ae75fa6506811c24ec5da"},
-    {file = "yt_dlp-2023.11.16-py2.py3-none-any.whl", hash = "sha256:0322ba85aa4afdb75f8641ed550e5958964daff034aeb477abb15031fd9a51ed"},
+    {file = "yt-dlp-2023.12.30.tar.gz", hash = "sha256:a11862e57721b0a0f0883dfeb5a4d79ba213a2d4c45e1880e9fd70f8e6570c38"},
+    {file = "yt_dlp-2023.12.30-py2.py3-none-any.whl", hash = "sha256:c00d9a71d64472ad441bcaa1ec0c3797d6e60c9f934f270096a96fe51657e7b3"},
 ]
diff --git a/requirements.txt b/requirements.txt
index b3c21b49..a7e46acc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,24 +31,24 @@ pure-eval==0.2.2
 pyasn1==0.5.1
 pyasn1-modules==0.3.0
 pycparser==2.21; implementation_name != "cpython"
-pycryptodomex==3.19.0
+pycryptodomex==3.19.1
 pygments==2.17.2
 python-crontab==3.0.0
 python-dateutil==2.8.2
 python-ldap==3.4.4
 pytz==2023.3.post1
-regex==2023.10.3
+regex==2023.12.25
 requests==2.31.0
 six==1.16.0
 sonic-client==1.0.0
 sqlparse==0.4.4
 stack-data==0.6.3
-traitlets==5.14.0
+traitlets==5.14.1
 typing-extensions==4.9.0; python_version < "3.11"
-tzdata==2023.3; platform_system == "Windows"
+tzdata==2023.4; platform_system == "Windows"
 tzlocal==5.2
 urllib3==2.1.0
 w3lib==2.1.2
 wcwidth==0.2.12
 websockets==12.0
-yt-dlp==2023.11.16
+yt-dlp==2023.12.30

From d2281cabd6d913d6350d794994d4da87bb31e049 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 16:04:29 -0800
Subject: [PATCH 082/126] remove moment.js

---
 package-lock.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d289c7fa..ff0bfb07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1415,14 +1415,6 @@
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
-    "node_modules/moment": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/moment-parseformat": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/moment-parseformat/-/moment-parseformat-3.0.0.tgz",

From 4af9beedd137dd898ebb75c941e9e374dacb81ef Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 16:11:27 -0800
Subject: [PATCH 083/126] disable GLOBAL_CONTEXT used by version upgrade banner
 as not all admin views accept extra_context kwarg

---
 archivebox/core/urls.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py
index 1f3732d5..f89273ff 100644
--- a/archivebox/core/urls.py
+++ b/archivebox/core/urls.py
@@ -8,12 +8,13 @@ from django.views.generic.base import RedirectView
 
 from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView
 
-from config import VERSION, VERSIONS_AVAILABLE, CAN_UPGRADE
+# GLOBAL_CONTEXT doesn't work as-is, disabled for now: https://github.com/ArchiveBox/ArchiveBox/discussions/1306
+# from config import VERSION, VERSIONS_AVAILABLE, CAN_UPGRADE
+# GLOBAL_CONTEXT = {'VERSION': VERSION, 'VERSIONS_AVAILABLE': VERSIONS_AVAILABLE, 'CAN_UPGRADE': CAN_UPGRADE}
+
 
 # print('DEBUG', settings.DEBUG)
 
-GLOBAL_CONTEXT = {'VERSION': VERSION, 'VERSIONS_AVAILABLE': VERSIONS_AVAILABLE, 'CAN_UPGRADE': CAN_UPGRADE}
-
 urlpatterns = [
     path('public/', PublicIndexView.as_view(), name='public-index'),
 
@@ -33,7 +34,10 @@ urlpatterns = [
 
 
     path('accounts/', include('django.contrib.auth.urls')),
-    path('admin/', admin.site.urls, {'extra_context': GLOBAL_CONTEXT}),
+    path('admin/', admin.site.urls),
+    
+    # do not add extra_context like this as not all admin views (e.g. ModelAdmin.autocomplete_view accept extra kwargs)
+    # path('admin/', admin.site.urls, {'extra_context': GLOBAL_CONTEXT}),
 
     path('health/', HealthCheckView.as_view(), name='healthcheck'),
     path('error/', lambda _: 1/0),

From b0da3867935f089a43aab0577c78daa066c03ecb Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 18:59:45 -0800
Subject: [PATCH 084/126] include git refs and HEAD file in docker images to
 allow GIT_SHA of builds to show in version output

---
 .dockerignore        | 4 +++-
 archivebox/config.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index f4c91a47..08408d22 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,10 +5,12 @@ __pycache__/
 .mypy_cache/
 .pytest_cache/
 .github/
-.git/
 .pdm-build/
 .pdm-python
 .eggs/
+.git/
+!.git/HEAD
+!.git/refs/heads/*
 
 venv/
 .venv/
diff --git a/archivebox/config.py b/archivebox/config.py
index ecdc46be..f32034ce 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -399,7 +399,7 @@ def get_version(config):
 
 def get_commit_hash(config) -> Optional[str]:
     try:
-        git_dir = config['PACKAGE_DIR'] / '../'
+        git_dir = config['PACKAGE_DIR'] / '../.git'
         ref = (git_dir / 'HEAD').read_text().strip().split(' ')[-1]
         commit_hash = git_dir.joinpath(ref).read_text().strip()
         return commit_hash

From fcdc41a1ab021e7ae34b77378a7416cc50f9f3e0 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 19:00:07 -0800
Subject: [PATCH 085/126] re-enable autocomplete tag field for now as its
 breaking action buttons display

---
 archivebox/core/admin.py    | 24 ++++++++++++------------
 archivebox/core/apps.py     |  3 ++-
 archivebox/core/settings.py |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py
index e2104e83..c4974c3a 100644
--- a/archivebox/core/admin.py
+++ b/archivebox/core/admin.py
@@ -48,25 +48,25 @@ class TagInline(admin.TabularInline):
 from django.contrib.admin.helpers import ActionForm
 from django.contrib.admin.widgets import AutocompleteSelectMultiple
 
-# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-# class AutocompleteTags:
-#     model = Tag
-#     search_fields = ['name']
-#     name = 'tags'
+# WIP: broken by Django 3.1.2 -> 4.0 migration
+class AutocompleteTags:
+    model = Tag
+    search_fields = ['name']
+    name = 'tags'
 
-# class AutocompleteTagsAdminStub:
-#     name = 'admin'
+class AutocompleteTagsAdminStub:
+    name = 'admin'
 
 
 class SnapshotActionForm(ActionForm):
     tags = forms.ModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         required=False,
-        # WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-        # widget=AutocompleteSelectMultiple(
-        #     # AutocompleteTags(),
-        #     # AutocompleteTagsAdminStub(),
-        # ),
+        # WIP: broken by Django 3.1.2 -> 4.0 migration
+        widget=AutocompleteSelectMultiple(
+            AutocompleteTags(),
+            AutocompleteTagsAdminStub(),
+        ),
     )
 
     # TODO: allow selecting actions for specific extractors? is this useful?
diff --git a/archivebox/core/apps.py b/archivebox/core/apps.py
index 21b95877..b1150eb9 100644
--- a/archivebox/core/apps.py
+++ b/archivebox/core/apps.py
@@ -3,4 +3,5 @@ from django.apps import AppConfig
 
 class CoreConfig(AppConfig):
     name = 'core'
-    # default_auto_field = 'django.db.models.UUIDField'
+    # WIP: broken by Django 3.1.2 -> 4.0 migration
+    default_auto_field = 'django.db.models.UUIDField'
diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py
index 6a52641d..0485c3c4 100644
--- a/archivebox/core/settings.py
+++ b/archivebox/core/settings.py
@@ -268,8 +268,8 @@ AUTH_PASSWORD_VALIDATORS = [
     {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
 ]
 
-# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-# DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
+# WIP: broken by Django 3.1.2 -> 4.0 migration
+DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
 
 ################################################################################
 ### Shell Settings

From 5b07a1126cfed92dae1b6e8297c5897b6e113ae5 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 19:00:19 -0800
Subject: [PATCH 086/126] add comment about why DOM is preferred over
 singlefile for readability parsing

---
 archivebox/extractors/readability.py | 2 ++
 archivebox/templates/admin/base.html | 1 +
 2 files changed, 3 insertions(+)

diff --git a/archivebox/extractors/readability.py b/archivebox/extractors/readability.py
index f849d909..574dc09c 100644
--- a/archivebox/extractors/readability.py
+++ b/archivebox/extractors/readability.py
@@ -99,6 +99,8 @@ def save_readability(link: Link, out_dir: Optional[str]=None, timeout: int=TIMEO
     except (Exception, OSError) as err:
         status = 'failed'
         output = err
+
+        # prefer Chrome dom output to singlefile because singlefile often contains huge url(data:image/...base64) strings that make the html too long to parse with readability
         cmd = [cmd[0], './{dom,singlefile}.html']
     finally:
         timer.end()
diff --git a/archivebox/templates/admin/base.html b/archivebox/templates/admin/base.html
index a29df4f5..5d4d4cc5 100644
--- a/archivebox/templates/admin/base.html
+++ b/archivebox/templates/admin/base.html
@@ -177,6 +177,7 @@
                 }
             </script>
         {% endif %}
+        
         <script>
             $ = django.jQuery;
             $.fn.reverse = [].reverse;

From ceabc4e12ed104a4898b0766ae423083a97da67d Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:08:39 -0800
Subject: [PATCH 087/126] fix CHROME_USER_AGENT not interpolating inline config
 variables

---
 archivebox/config.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index f32034ce..5a8b2295 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -238,7 +238,7 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = {
         'POCKET_CONSUMER_KEY':      {'type': str,   'default': None},
         'POCKET_ACCESS_TOKENS':     {'type': dict,  'default': {}},
 
-        'READWISE_READER_TOKENS':     {'type': dict,  'default': {}},
+        'READWISE_READER_TOKENS':   {'type': dict,  'default': {}},
     },
 }
 
@@ -554,6 +554,7 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
     'CHROME_BINARY':            {'default': lambda c: c['CHROME_BINARY'] or find_chrome_binary()},
     'USE_CHROME':               {'default': lambda c: c['USE_CHROME'] and c['CHROME_BINARY'] and (c['SAVE_PDF'] or c['SAVE_SCREENSHOT'] or c['SAVE_DOM'] or c['SAVE_SINGLEFILE'])},
     'CHROME_VERSION':           {'default': lambda c: bin_version(c['CHROME_BINARY']) if c['USE_CHROME'] else None},
+    'CHROME_USER_AGENT':        {'default': lambda c: c['CHROME_USER_AGENT'].format(**c)},
 
     'SAVE_PDF':                 {'default': lambda c: c['USE_CHROME'] and c['SAVE_PDF']},
     'SAVE_SCREENSHOT':          {'default': lambda c: c['USE_CHROME'] and c['SAVE_SCREENSHOT']},
@@ -571,7 +572,7 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
     'DATA_LOCATIONS':           {'default': lambda c: get_data_locations(c)},
     'CHROME_OPTIONS':           {'default': lambda c: get_chrome_info(c)},
     'SAVE_ALLOWLIST_PTN':       {'default': lambda c: c['SAVE_ALLOWLIST'] and {re.compile(k, ALLOWDENYLIST_REGEX_FLAGS): v for k, v in c['SAVE_ALLOWLIST'].items()}},
-    'SAVE_DENYLIST_PTN':       {'default': lambda c: c['SAVE_DENYLIST'] and {re.compile(k, ALLOWDENYLIST_REGEX_FLAGS): v for k, v in c['SAVE_DENYLIST'].items()}},
+    'SAVE_DENYLIST_PTN':        {'default': lambda c: c['SAVE_DENYLIST'] and {re.compile(k, ALLOWDENYLIST_REGEX_FLAGS): v for k, v in c['SAVE_DENYLIST'].items()}},
 }
 
 

From c26d9dc1bb7cf26b382461f4596dc9b0d7cea804 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:09:04 -0800
Subject: [PATCH 088/126] link to exact build commit hash in public index
 footer

---
 archivebox/core/views.py            | 2 ++
 archivebox/templates/core/base.html | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/archivebox/core/views.py b/archivebox/core/views.py
index 3f3fec12..24035628 100644
--- a/archivebox/core/views.py
+++ b/archivebox/core/views.py
@@ -23,6 +23,7 @@ from ..config import (
     PUBLIC_SNAPSHOTS,
     PUBLIC_ADD_VIEW,
     VERSION,
+    COMMIT_HASH,
     FOOTER_INFO,
     SNAPSHOTS_PER_PAGE,
 )
@@ -217,6 +218,7 @@ class PublicIndexView(ListView):
         return {
             **super().get_context_data(**kwargs),
             'VERSION': VERSION,
+            'COMMIT_HASH': COMMIT_HASH,
             'FOOTER_INFO': FOOTER_INFO,
         }
 
diff --git a/archivebox/templates/core/base.html b/archivebox/templates/core/base.html
index d2268fd0..bca3a11c 100644
--- a/archivebox/templates/core/base.html
+++ b/archivebox/templates/core/base.html
@@ -38,8 +38,11 @@
                     <br />
                     <center>
                         <small>
-                            Archive created using <a href="https://github.com/ArchiveBox/ArchiveBox" title="Github">ArchiveBox</a> version
-                            <a href="https://github.com/ArchiveBox/ArchiveBox/releases/tag/v{{VERSION}}" title="Releases">v{{VERSION}}</a>.
+                            Archive created using <a href="https://github.com/ArchiveBox/ArchiveBox" title="Github">ArchiveBox</a>
+                            <a href="https://github.com/ArchiveBox/ArchiveBox/releases/tag/v{{VERSION}}" title="Releases">v{{VERSION}}</a>
+                            {% if COMMIT_HASH %}
+                                (<a href="https://github.com/ArchiveBox/ArchiveBox/commit/{{COMMIT_HASH}}"><code>{{COMMIT_HASH|truncatechars:9}}</code></a>)
+                            {% endif %}.
                             <br/><br/>
                             {{FOOTER_INFO}}
                         </small>

From 78d942ac226a4dc2d447b391a74dffac7c77a7d1 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:09:31 -0800
Subject: [PATCH 089/126] show more detail in readabiliity error messages

---
 archivebox/extractors/readability.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/archivebox/extractors/readability.py b/archivebox/extractors/readability.py
index 574dc09c..13ee63af 100644
--- a/archivebox/extractors/readability.py
+++ b/archivebox/extractors/readability.py
@@ -73,7 +73,7 @@ def save_readability(link: Link, out_dir: Optional[str]=None, timeout: int=TIMEO
             result_json = json.loads(result.stdout)
             assert result_json and 'content' in result_json, 'Readability output is not valid JSON'
         except json.JSONDecodeError:
-            raise ArchiveError('Readability was not able to archive the page', result.stdout + result.stderr)
+            raise ArchiveError('Readability was not able to archive the page (invalid JSON)', result.stdout + result.stderr)
 
         output_folder.mkdir(exist_ok=True)
         readability_content = result_json.pop("textContent") 
@@ -81,8 +81,6 @@ def save_readability(link: Link, out_dir: Optional[str]=None, timeout: int=TIMEO
         atomic_write(str(output_folder / "content.txt"), readability_content)
         atomic_write(str(output_folder / "article.json"), result_json)
 
-        # parse out number of files downloaded from last line of stderr:
-        #  "Downloaded: 76 files, 4.0M in 1.6s (2.52 MB/s)"
         output_tail = [
             line.strip()
             for line in (result.stdout + result.stderr).decode().rsplit('\n', 5)[-5:]
@@ -95,7 +93,7 @@ def save_readability(link: Link, out_dir: Optional[str]=None, timeout: int=TIMEO
 
         # Check for common failure cases
         if (result.returncode > 0):
-            raise ArchiveError('Readability was not able to archive the page', hints)
+            raise ArchiveError(f'Readability was not able to archive the page (status={result.returncode})', hints)
     except (Exception, OSError) as err:
         status = 'failed'
         output = err

From db2984e47b2f2e4effeeeed0df583ada3292349e Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:11:06 -0800
Subject: [PATCH 090/126] prefer dom dump to singlefile for generating
 readability output

---
 archivebox/extractors/title.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/archivebox/extractors/title.py b/archivebox/extractors/title.py
index dc496c4e..3505e03f 100644
--- a/archivebox/extractors/title.py
+++ b/archivebox/extractors/title.py
@@ -66,7 +66,9 @@ def get_html(link: Link, path: Path, timeout: int=TIMEOUT) -> str:
     """
     canonical = link.canonical_outputs()
     abs_path = path.absolute()
-    sources = [canonical["singlefile_path"], canonical["wget_path"], canonical["dom_path"]]
+
+    # prefer chrome-generated DOM dump to singlefile as singlefile output often includes HUGE url(data:image/...base64) strings that crash parsers
+    sources = [canonical["dom_path"], canonical["singlefile_path"], canonical["wget_path"]]
     document = None
     for source in sources:
         try:

From b9e05b2abe290c457e635556652590ee8e45b9a9 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:11:30 -0800
Subject: [PATCH 091/126] quote URLs in failure message hint output to make
 copy-pasting easier

---
 archivebox/logging_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py
index af98c3fb..f0155702 100644
--- a/archivebox/logging_util.py
+++ b/archivebox/logging_util.py
@@ -413,7 +413,7 @@ def log_archive_method_finished(result: "ArchiveResult"):
     """
     # Prettify CMD string and make it safe to copy-paste by quoting arguments
     quoted_cmd = ' '.join(
-        '"{}"'.format(arg) if ' ' in arg else arg
+        '"{}"'.format(arg) if (' ' in arg) or (':' in arg) else arg
         for arg in result.cmd
     )
 

From f775da299a3e5611bfd18ad37416b2d86c108eb4 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:12:03 -0800
Subject: [PATCH 092/126] show command to enter docker container in failed
 command output hint when IN_DOCKER=True

---
 archivebox/logging_util.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py
index f0155702..3c688a3c 100644
--- a/archivebox/logging_util.py
+++ b/archivebox/logging_util.py
@@ -448,12 +448,18 @@ def log_archive_method_finished(result: "ArchiveResult"):
                 for line in list(hints)[:5] if line.strip()
             )
 
+        docker_hints = ()
+        if IN_DOCKER:
+            docker_hints = (
+                '  docker run -it -v $PWD/data:/data archivebox/archivebox /bin/bash',
+            )
 
         # Collect and prefix output lines with indentation
         output_lines = [
             *hint_header,
             *hints,
             '{}Run to see full output:{}'.format(ANSI['lightred'], ANSI['reset']),
+            *docker_hints,
             *(['    cd {};'.format(result.pwd)] if result.pwd else []),
             '    {}'.format(quoted_cmd),
         ]

From 8ab17f05614b045c5367c532cbb4c03925baafb8 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:31:14 -0800
Subject: [PATCH 093/126] add tag support to schedule command

---
 archivebox/cli/archivebox_schedule.py | 7 +++++++
 archivebox/main.py                    | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/archivebox/cli/archivebox_schedule.py b/archivebox/cli/archivebox_schedule.py
index d4747906..f606979b 100644
--- a/archivebox/cli/archivebox_schedule.py
+++ b/archivebox/cli/archivebox_schedule.py
@@ -39,6 +39,12 @@ def main(args: Optional[List[str]]=None, stdin: Optional[IO]=None, pwd: Optional
         default=None,
         help='Run ArchiveBox once every [timeperiod] (hour/day/month/year or cron format e.g. "0 0 * * *")',
     )
+    parser.add_argument(
+        '--tag', '-t',
+        type=str,
+        default='',
+        help="Tag the added URLs with the provided tags e.g. --tag=tag1,tag2,tag3",
+    )
     parser.add_argument(
         '--depth', # '-d',
         type=int,
@@ -97,6 +103,7 @@ def main(args: Optional[List[str]]=None, stdin: Optional[IO]=None, pwd: Optional
         run_all=command.run_all,
         quiet=command.quiet,
         every=command.every,
+        tag=command.tag,
         depth=command.depth,
         overwrite=command.overwrite,
         update=command.update,
diff --git a/archivebox/main.py b/archivebox/main.py
index d80203b2..0c98c991 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -1170,6 +1170,7 @@ def schedule(add: bool=False,
              run_all: bool=False,
              quiet: bool=False,
              every: Optional[str]=None,
+             tag: str='',
              depth: int=0,
              overwrite: bool=False,
              update: bool=not ONLY_NEW,
@@ -1203,6 +1204,7 @@ def schedule(add: bool=False,
                 'add',
                 *(['--overwrite'] if overwrite else []),
                 *(['--update'] if update else []),
+                *([f'--tag={tag}'] if tag else []),
                 f'--depth={depth}',
                 f'"{import_path}"',
             ] if import_path else ['update']),

From c1fd2cfa42f3c81d4c5a2a3c95733f4804fda938 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:31:46 -0800
Subject: [PATCH 094/126] tag URLs immediately once added instead of waiting
 until archival completes

---
 archivebox/extractors/readability.py |  1 -
 archivebox/index/sql.py              |  8 +++++---
 archivebox/main.py                   | 30 +++++++++++++---------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/archivebox/extractors/readability.py b/archivebox/extractors/readability.py
index 13ee63af..dc2a06b9 100644
--- a/archivebox/extractors/readability.py
+++ b/archivebox/extractors/readability.py
@@ -67,7 +67,6 @@ def save_readability(link: Link, out_dir: Optional[str]=None, timeout: int=TIMEO
             temp_doc.name,
             link.url,
         ]
-
         result = run(cmd, cwd=out_dir, timeout=timeout)
         try:
             result_json = json.loads(result.stdout)
diff --git a/archivebox/index/sql.py b/archivebox/index/sql.py
index 420b9de6..5081c275 100644
--- a/archivebox/index/sql.py
+++ b/archivebox/index/sql.py
@@ -109,11 +109,13 @@ def write_sql_link_details(link: Link, out_dir: Path=OUTPUT_DIR) -> None:
         snap = Snapshot.objects.get(url=link.url)
     except Snapshot.DoesNotExist:
         snap = write_link_to_sql_index(link)
+
     snap.title = link.title
 
-    tag_list = list(dict.fromkeys(
-        tag.strip() for tag in re.split(TAG_SEPARATOR_PATTERN, link.tags or '')
-    ))
+    tag_list = list(
+        {tag.strip() for tag in re.split(TAG_SEPARATOR_PATTERN, link.tags or '')}
+        | set(snap.tags.values_list('name', flat=True))
+    )
 
     snap.save()
     snap.save_tags(tag_list)
diff --git a/archivebox/main.py b/archivebox/main.py
index 0c98c991..76b204b8 100755
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -604,7 +604,7 @@ def add(urls: Union[str, List[str]],
         out_dir: Path=OUTPUT_DIR) -> List[Link]:
     """Add a new URL or list of URLs to your archive"""
 
-    from core.models import Tag
+    from core.models import Snapshot, Tag
 
     assert depth in (0, 1), 'Depth must be 0 or 1 (depth >1 is not supported yet)'
 
@@ -648,6 +648,19 @@ def add(urls: Union[str, List[str]],
     write_main_index(links=new_links, out_dir=out_dir)
     all_links = load_main_index(out_dir=out_dir)
 
+    tags = [
+        Tag.objects.get_or_create(name=name.strip())[0]
+        for name in tag.split(',')
+        if name.strip()
+    ]
+    if tags:
+        for link in imported_links:
+            snapshot = Snapshot.objects.get(url=link.url)
+            snapshot.tags.add(*tags)
+            snapshot.tags_str(nocache=True)
+            snapshot.save()
+        # print(f'    √ Tagged {len(imported_links)} Snapshots with {len(tags)} tags {tags_str}')
+
     if index_only:
         # mock archive all the links using the fake index_only extractor method in order to update their state
         if overwrite:
@@ -679,21 +692,6 @@ def add(urls: Union[str, List[str]],
             stderr(f'[*] [{ts}] Archiving {len(new_links)}/{len(all_links)} URLs from added set...', color='green')
             archive_links(new_links, overwrite=False, **archive_kwargs)
 
-
-    # add any tags to imported links
-    tags = [
-        Tag.objects.get_or_create(name=name.strip())[0]
-        for name in tag.split(',')
-        if name.strip()
-    ]
-    if tags:
-        for link in imported_links:
-            snapshot = link.as_snapshot()
-            snapshot.tags.add(*tags)
-            snapshot.tags_str(nocache=True)
-            snapshot.save()
-        # print(f'    √ Tagged {len(imported_links)} Snapshots with {len(tags)} tags {tags_str}')
-
     if CAN_UPGRADE:
         hint(f"There's a new version of ArchiveBox available! Your current version is {VERSION}. You can upgrade to {VERSIONS_AVAILABLE['recommended_version']['tag_name']} ({VERSIONS_AVAILABLE['recommended_version']['html_url']}). For more on how to upgrade: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives\n")
 

From 5df7b258bdb07166da722a630e1460990a120fe2 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 3 Jan 2024 20:37:00 -0800
Subject: [PATCH 095/126] bump version of dev build to 0.7.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 pyproject.toml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff0bfb07..83abdf53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "archivebox",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "archivebox",
-      "version": "0.7.1",
+      "version": "0.7.2",
       "license": "MIT",
       "dependencies": {
         "@postlight/parser": "^2.2.3",
diff --git a/package.json b/package.json
index caa99e79..362cfffe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "archivebox",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "ArchiveBox: The self-hosted internet archive",
   "author": "Nick Sweeting <archivebox-npm@sweeting.me>",
   "repository": "github:ArchiveBox/ArchiveBox",
diff --git a/pyproject.toml b/pyproject.toml
index 75227234..fb34095d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "archivebox"
-version = "0.7.1"
+version = "0.7.2"
 description = "Self-hosted internet archiving solution."
 authors = [
     {name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"},

From 94b132818dc770f009302d1343b3d397649a3a8c Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 11:41:12 -0800
Subject: [PATCH 096/126] fix lint errors

---
 archivebox/config.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/archivebox/config.py b/archivebox/config.py
index 5a8b2295..c4a3aef6 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -451,7 +451,7 @@ def get_versions_available_on_github(config):
             current_version = release
             break
 
-    current_version = current_version or releases[-1]
+    current_version = current_version or all_releases[-1]
     
     # recommended version is whatever comes after current_version in the release list
     # (perhaps too conservative to only recommend upgrading one version at a time, but it's safest)
@@ -786,7 +786,7 @@ def load_config(defaults: ConfigDefaultDict,
 
 def parse_version_string(version: str) -> Tuple[int, int, int]:
     """parses a version tag string formatted like 'vx.x.x' into (major, minor, patch) ints"""
-    base = v.split('+')[0].split('v')[-1] # remove 'v' prefix and '+editable' suffix
+    base = version.split('+')[0].split('v')[-1] # remove 'v' prefix and '+editable' suffix
     return tuple(int(part) for part in base.split('.'))[:3]
 
 
@@ -1167,9 +1167,9 @@ globals().update(CONFIG)
 
 
 # Set timezone to UTC and umask to OUTPUT_PERMISSIONS
-assert TIMEZONE == 'UTC', 'The server timezone should always be set to UTC'  # we may allow this to change later
-os.environ["TZ"] = TIMEZONE
-os.umask(0o777 - int(DIR_OUTPUT_PERMISSIONS, base=8))  # noqa: F821
+assert TIMEZONE == 'UTC', 'The server timezone should always be set to UTC'  # noqa: F821
+os.environ["TZ"] = TIMEZONE                                                  # noqa: F821
+os.umask(0o777 - int(DIR_OUTPUT_PERMISSIONS, base=8))                        # noqa: F821
 
 # add ./node_modules/.bin to $PATH so we can use node scripts in extractors
 NODE_BIN_PATH = str((Path(CONFIG["OUTPUT_DIR"]).absolute() / 'node_modules' / '.bin'))
@@ -1186,7 +1186,6 @@ sys.path.append(NODE_BIN_PATH)
 # disable stderr "you really shouldnt disable ssl" warnings with library config
 if not CONFIG['CHECK_SSL_VALIDITY']:
     import urllib3
-    import requests
     requests.packages.urllib3.disable_warnings(requests.packages.urllib3.exceptions.InsecureRequestWarning)
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
@@ -1213,10 +1212,10 @@ def check_system_config(config: ConfigDict=CONFIG) -> None:
             stderr('')
             stderr('    {lightred}Hint{reset}: When using Docker, you must run commands with {green}docker run{reset} instead of {lightyellow}docker exec{reset}, e.g.:'.format(**config['ANSI']))
             stderr(f'        docker compose run archivebox {attempted_command}')
-            stderr(f'        docker compose exec --user=archivebox archivebox {attempted_command}')
-            stderr('        or')
-            stderr(f'        docker run -it -v ... -p ... archivebox/archivebox {attempted_command}')
-            stderr(f'        docker exec -it --user=archivebox <container id> /bin/bash')
+            stderr(f'        docker run -it -v $PWD/data:/data archivebox/archivebox {attempted_command}')
+            stderr('        or:')
+            stderr(f'        docker compose exec --user=archivebox archivebox /bin/bash -c "archivebox {attempted_command}"')
+            stderr(f'        docker exec -it --user=archivebox <container id> /bin/bash -c "archivebox {attempted_command}"')
         
         raise SystemExit(2)
 

From a215b3868104229b811330bc9138021c2a2e6436 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 11:41:49 -0800
Subject: [PATCH 097/126] update dompurify version

---
 archivebox/package.json | 6 +++---
 package-lock.json       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/archivebox/package.json b/archivebox/package.json
index 9f903598..362cfffe 100644
--- a/archivebox/package.json
+++ b/archivebox/package.json
@@ -1,13 +1,13 @@
 {
   "name": "archivebox",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "ArchiveBox: The self-hosted internet archive",
   "author": "Nick Sweeting <archivebox-npm@sweeting.me>",
   "repository": "github:ArchiveBox/ArchiveBox",
   "license": "MIT",
   "dependencies": {
     "@postlight/parser": "^2.2.3",
-    "readability-extractor": "git+https://github.com/ArchiveBox/readability-extractor.git",
-    "single-file-cli": "^1.1.12"
+    "readability-extractor": "github:ArchiveBox/readability-extractor",
+    "single-file-cli": "^1.1.46"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 83abdf53..bf8bc592 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -696,9 +696,9 @@
       "integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="
     },
     "node_modules/dompurify": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz",
-      "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.7.tgz",
+      "integrity": "sha512-BViYTZoqP3ak/ULKOc101y+CtHDUvBsVgSxIF1ku0HmK6BRf+C03MC+tArMvOPtVtZp83DDh5puywKDu4sbVjQ=="
     },
     "node_modules/domutils": {
       "version": "1.5.1",

From 6f1d4e477b0b41f6e6521b600a21f699a839c029 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 12:29:38 -0800
Subject: [PATCH 098/126] move README images from imgur to Github assets
 hosting

---
 README.md | 71 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index df8aa0b6..72cf202a 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ The goal is to sleep soundly knowing the part of the internet you care about wil
 
 <div align="center">
 <br/><br/>
-<img src="https://i.imgur.com/PAzXZE8.png" height="70px" alt="bookshelf graphic"> &nbsp; <img src="https://i.imgur.com/asPNk8n.png" height="75px" alt="logo" align="top"/> &nbsp; <img src="https://i.imgur.com/PAzXZE8.png" height="70px" alt="bookshelf graphic">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/5a7d95f2-6977-4de6-9f08-42851a1fe1d2" height="70px" alt="bookshelf graphic"> &nbsp; <img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/b2765a33-0d1e-4019-a1db-920c7e00e20e" height="75px" alt="logo" align="top"/> &nbsp; <img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/5a7d95f2-6977-4de6-9f08-42851a1fe1d2" height="70px" alt="bookshelf graphic">
 <br/><br/>
 <small><a href="https://demo.archivebox.io">Demo</a> | <a href="#screenshots">Screenshots</a> | <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Usage">Usage</a></small>
 <br/>
@@ -110,10 +110,10 @@ ls ./archive/*/index.json                 # or browse directly via the filesyste
 
 <div align="center">
 <br/><br/>
-<img src="https://i.imgur.com/njxgSbl.png" width="22%" alt="cli init screenshot" align="top">
-<img src="https://i.imgur.com/lUuicew.png" width="22%" alt="cli init screenshot" align="top">
-<img src="https://i.imgur.com/p6wK6KM.png" width="22%" alt="server snapshot admin screenshot" align="top">
-<img src="https://i.imgur.com/xHvQfon.png" width="28.6%" alt="server snapshot details page screenshot" align="top"/>
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/8d67382c-e0ce-4286-89f7-7915f09b930c" width="22%" alt="cli init screenshot" align="top">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/dad2bc51-e7e5-484e-bb26-f956ed692d16" width="22%" alt="cli init screenshot" align="top">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/e8e0b6f8-8fdf-4b7f-8124-c10d8699bdb2" width="22%" alt="server snapshot admin screenshot" align="top">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ace0954a-ddac-4520-9d18-1c77b1ec50b2" width="28.6%" alt="server snapshot details page screenshot" align="top"/>
 <br/><br/>
 </div>
 
@@ -146,7 +146,7 @@ ls ./archive/*/index.json                 # or browse directly via the filesyste
 
 <div align="center">
 <br/>
-<img src="https://i.imgur.com/T2UAGUD.png" width="49%" alt="grass"/><img src="https://i.imgur.com/T2UAGUD.png" width="49%" alt="grass"/>
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/0db52ea7-4a2c-441d-b47f-5553a5d8fe96" width="49%" alt="grass"/><img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/0db52ea7-4a2c-441d-b47f-5553a5d8fe96" width="49%" alt="grass"/>
 </div>
 
 # Quickstart
@@ -351,7 +351,7 @@ See <a href="#%EF%B8%8F-cli-usage">below</a> for usage examples using the CLI, W
 </ul>
 </li>
 </ol>
-<img src="https://i.imgur.com/QPHUS5C.png" width="320px">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/575ef92f-bb3e-4a7c-a4ba-986c1fd76ecf" width="320px">
 <br/>
 <i>✨ Alpha (contributors wanted!)</i>: for more info, see the: <a href="https://github.com/ArchiveBox/electron-archivebox">Electron ArchiveBox</a> repo.
   <br/>
@@ -443,7 +443,7 @@ ls ./archive/*/index.html  # or inspect snapshots on the filesystem
 
 <br/>
 <div align="center">
-<img src="https://i.imgur.com/6AmOGJT.png" width="49%" alt="grass"/><img src="https://i.imgur.com/6AmOGJT.png" width="49%" alt="grass"/>
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/65f82532-18dd-49c5-86f1-02b1f3100e1e" width="49%" alt="grass"/><img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/65f82532-18dd-49c5-86f1-02b1f3100e1e" width="49%" alt="grass"/>
 </div>
 <br/>
 
@@ -460,7 +460,7 @@ ls ./archive/*/index.html  # or inspect snapshots on the filesystem
 ---
 
 <div align="center">
-<img src="https://i.imgur.com/OUmgdlH.png" width="96%" alt="lego">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ac1f897a-8baa-4f8b-8ee8-7443611f258b" width="96%" alt="lego">
 </div>
 
 <br/>
@@ -474,12 +474,12 @@ ArchiveBox supports many input formats for URLs, including Pocket & Pinboard exp
 
 *Click these links for instructions on how to prepare your links from these sources:*
 
-- <img src="https://nicksweeting.com/images/rss.svg" height="22px"/> TXT, RSS, XML, JSON, CSV, SQL, HTML, Markdown, or [any other text-based format...](https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#Import-a-list-of-URLs-from-a-text-file)
-- <img src="https://nicksweeting.com/images/bookmarks.png" height="22px"/> [Browser history](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart#2-get-your-list-of-urls-to-archive) or [browser bookmarks](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart#2-get-your-list-of-urls-to-archive) (see instructions for: [Chrome](https://support.google.com/chrome/answer/96816?hl=en), [Firefox](https://support.mozilla.org/en-US/kb/export-firefox-bookmarks-to-backup-or-transfer), [Safari](http://i.imgur.com/AtcvUZA.png), [IE](https://support.microsoft.com/en-us/help/211089/how-to-import-and-export-the-internet-explorer-favorites-folder-to-a-32-bit-version-of-windows), [Opera](http://help.opera.com/Windows/12.10/en/importexport.html), [and more...](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart#2-get-your-list-of-urls-to-archive))
-- <img src="https://i.imgur.com/AQyHbu8.png" height="22px"/> Browser extension [`archivebox-exporter`](https://github.com/tjhorner/archivebox-exporter) (realtime archiving from Chrome/Chromium/Firefox)
+- <img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/64078483-21d7-4eb1-aa6e-9ad55afe45b8" height="22px"/> TXT, RSS, XML, JSON, CSV, SQL, HTML, Markdown, or [any other text-based format...](https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#Import-a-list-of-URLs-from-a-text-file)
+- <img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/32b494e6-4de1-4984-8d88-dc02f18e5c34" height="22px"/> [Browser history](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart#2-get-your-list-of-urls-to-archive) or [browser bookmarks](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart#2-get-your-list-of-urls-to-archive) (see instructions for: [Chrome](https://support.google.com/chrome/answer/96816?hl=en), [Firefox](https://support.mozilla.org/en-US/kb/export-firefox-bookmarks-to-backup-or-transfer), [Safari](https://github.com/ArchiveBox/ArchiveBox/assets/511499/24ad068e-0fa6-41f4-a7ff-4c26fc91f71a), [IE](https://support.microsoft.com/en-us/help/211089/how-to-import-and-export-the-internet-explorer-favorites-folder-to-a-32-bit-version-of-windows), [Opera](https://help.opera.com/en/latest/features/#bookmarks:~:text=Click%20the%20import/-,export%20button,-on%20the%20bottom), [and more...](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart#2-get-your-list-of-urls-to-archive))
+- <img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ff20d251-5347-4b85-ae9b-83037d0ac01e" height="22px"/> Browser extension [`archivebox-exporter`](https://github.com/tjhorner/archivebox-exporter) (realtime archiving from Chrome/Chromium/Firefox)
 - <img src="https://getpocket.com/favicon.ico" height="22px"/> [Pocket](https://getpocket.com/export), [Pinboard](https://pinboard.in/export/), [Instapaper](https://www.instapaper.com/user), [Shaarli](https://shaarli.readthedocs.io/en/master/Usage/#importexport), [Delicious](https://www.groovypost.com/howto/howto/export-delicious-bookmarks-xml/), [Reddit Saved](https://github.com/csu/export-saved-reddit), [Wallabag](https://doc.wallabag.org/en/user/import/wallabagv2.html), [Unmark.it](http://help.unmark.it/import-export), [OneTab](https://www.addictivetips.com/web/onetab-save-close-all-chrome-tabs-to-restore-export-or-import/), [and more...](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart#2-get-your-list-of-urls-to-archive)
 
-<img src="https://i.imgur.com/zM4z1aU.png" width="330px" align="right">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/e1e5bd78-b0b6-45dc-914c-e1046fee4bc4" width="330px" align="right">
 
 
 ```bash
@@ -506,7 +506,7 @@ It also includes a built-in scheduled import feature with `archivebox schedule`
 
 Inside each Snapshot folder, ArchiveBox saves these different types of extractor outputs as plain files:
 
-<img src="https://i.imgur.com/xHvQfon.png" width="330px" align="right">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ace0954a-ddac-4520-9d18-1c77b1ec50b2" width="330px" align="right">
 
 `./archive/<timestamp>/*`
 
@@ -530,7 +530,7 @@ It does everything out-of-the-box by default, but you can disable or tweak [indi
 
 ## Configuration
 
-<img src="https://i.imgur.com/H08eaia.png" width="330px" align="right">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ea672e6b-4df5-49d8-b550-7f450951fd27" width="330px" align="right">
 
 ArchiveBox can be configured via environment variables, by using the `archivebox config` CLI, or by editing the `ArchiveBox.conf` config file directly.
 
@@ -572,9 +572,10 @@ PUBLIC_ADD_VIEW=False      # default: False whether anon users can add new URLs
 
 For better security, easier updating, and to avoid polluting your host system with extra dependencies, **it is strongly recommended to use the official [Docker image](https://github.com/ArchiveBox/ArchiveBox/wiki/Docker)** with everything pre-installed for the best experience.
 
-To achieve high-fidelity archives in as many situations as possible, ArchiveBox depends on a variety of 3rd-party tools and libraries that specialize in extracting different types of content. These optional dependencies used for archiving sites include:
+These optional dependencies used for archiving sites include:
+
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/62a02155-05d7-4f3e-8de5-75a50a145c4f" alt="archivebox --version CLI output screenshot showing dependencies installed" width="330px" align="right">
 
-<img src="https://i.imgur.com/5vSBO2R.png" width="330px" align="right">
 
 - `chromium` / `chrome` (for screenshots, PDF, DOM HTML, and headless JS scripts)
 - `node` & `npm` (for readability, mercury, and singlefile)
@@ -731,36 +732,36 @@ Disk usage can be reduced by using a compressed/deduplicated filesystem like ZFS
 ## Screenshots
 
 <div align="center" width="80%">
-<img src="https://i.imgur.com/PVO88AZ.png" width="80%"/>
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/0362bcd1-1dfd-43c6-b4ec-db5e78da07b2" width="80%"/>
 <table>
 <tbody>
 <tr>
 <td>
-<img src="https://i.imgur.com/npareKG.png" alt="brew install archivebox"><br/>
-<img src="https://i.imgur.com/5vSBO2R.png" alt="archivebox version">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/e9fdcb16-344e-48c8-8be0-efa48ec155d5" alt="brew install archivebox"><br/>
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/e235c9d8-fda9-499d-a6a5-59b0e6a0efce" alt="archivebox version">
 </td>
 <td>
-<img src="https://i.imgur.com/JXXxFzB.png" alt="archivebox init"><br/>
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/0e3da0c7-d2c2-4a71-b096-6caedafd6ef7" alt="archivebox init"><br/>
 </td>
 <td>
-<img src="https://i.imgur.com/wNYtV3v.jpg" alt="archivebox add">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/31c47440-ec14-4a02-99a3-aae8a9078d46" alt="archivebox add">
 </td>
 <td>
-<img src="https://i.imgur.com/uZcIOn9.png" alt="archivebox data dir">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ebcdc21d-e2af-4bf8-ad4b-bc4f3151bbef" alt="archivebox data dir">
 </td>
 </tr>
 <tr>
 <td>
-<img src="https://i.imgur.com/H08eaia.png" alt="archivebox server">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ea672e6b-4df5-49d8-b550-7f450951fd27" alt="archivebox server">
 </td>
 <td>
-<img src="https://i.imgur.com/zM4z1aU.png" alt="archivebox server add">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/e1e5bd78-b0b6-45dc-914c-e1046fee4bc4" alt="archivebox server add">
 </td>
 <td>
-<img src="https://i.imgur.com/p6wK6KM.png" alt="archivebox server list">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/e8e0b6f8-8fdf-4b7f-8124-c10d8699bdb2" alt="archivebox server list">
 </td>
 <td>
-<img src="https://i.imgur.com/xHvQfon.png" alt="archivebox server detail">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ace0954a-ddac-4520-9d18-1c77b1ec50b2" alt="archivebox server detail">
 </td>
 </tr>
 </tbody>
@@ -773,7 +774,7 @@ Disk usage can be reduced by using a compressed/deduplicated filesystem like ZFS
 <br/>
 
 <div align="center">
-<img src="https://i.imgur.com/ZSUm9mr.png" width="100%" alt="paisley graphic">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/ca85432e-a2df-40c6-968f-51a1ef99b24e" width="100%" alt="paisley graphic">
 </div>
 
 # Background & Motivation
@@ -785,8 +786,8 @@ Vast treasure troves of knowledge are lost every day on the internet to link rot
 Whether it's to resist censorship by saving articles before they get taken down or edited, or just to save a collection of early 2010's flash games you love to play, having the tools to archive internet content enables to you save the stuff you care most about before it disappears.
 
 <div align="center">
-<img src="https://i.imgur.com/bC6eZcV.png" width="40%"/><br/>
- <sup><i>Image from <a href="https://digiday.com/media/wtf-link-rot/">WTF is Link Rot?</a>...</i><br/></sup>
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/71e36bc5-1c94-44e2-92b6-405fa898c734" width="40%"/><br/>
+ <sup><i>Image from <a href="https://perma.cc/">Perma.cc</a>...</i><br/></sup>
 </div>
 
 The balance between the permanence and ephemeral nature of content on the internet is part of what makes it beautiful. I don't think everything should be preserved in an automated fashion--making all content permanent and never removable, but I do think people should be able to decide for themselves and effectively archive specific content that they care about.
@@ -796,7 +797,7 @@ ArchiveBox archives the sites in **several different formats** beyond what publi
 
 ## Comparison to Other Projects
 
-<img src="https://i.imgur.com/4nkFjdv.png" width="5%" align="right" alt="comparison"/> 
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/4cac62a9-e8fb-425b-85a3-ca644aa6dd42" width="5%" align="right" alt="comparison"/> 
 
 ▶ **Check out our [community page](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community) for an index of web archiving initiatives and projects.**
 
@@ -826,14 +827,14 @@ For more alternatives, see our [list here](https://github.com/ArchiveBox/Archive
 
 <div align="center">
 <br/>
-<img src="https://i.imgur.com/q0Oe36M.png" width="100%" alt="dependencies graphic">
+<img src="ttps://github.com/ArchiveBox/ArchiveBox/assets/511499/04808ac2-3133-44fd-8703-3387e06dc851" width="100%" alt="dependencies graphic">
 </div>
 
 ## Internet Archiving Ecosystem
 
 Whether you want to learn which organizations are the big players in the web archiving space, want to find a specific open-source tool for your web archiving need, or just want to see where archivists hang out online, our Community Wiki page serves as an index of the broader web archiving community. Check it out to learn about some of the coolest web archiving projects and communities on the web!
 
-<img src="https://i.imgur.com/0ZOmOvN.png" width="14%" align="right"/>
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/78d8a725-97f4-47f5-b983-1f62843ddc51" width="14%" align="right"/>
 
 - [Community Wiki](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community)
   - [The Master Lists](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community#the-master-lists)  
@@ -861,7 +862,7 @@ Whether you want to learn which organizations are the big players in the web arc
 ---
 
 <div align="center">
-<img src="https://i.imgur.com/SMkGW0L.png" width="100%" alt="documentation graphic">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/897f7a88-1265-4aab-b80c-b1640afaad1f" width="100%" alt="documentation graphic">
 </div>
 
 # Documentation
@@ -907,7 +908,7 @@ You can also access the docs locally by looking in the [`ArchiveBox/docs/`](http
 ---
 
 <div align="center">
-<img src="https://i.imgur.com/EGWjbD4.png" width="100%" alt="development">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/e895e79f-5c7d-429b-ad8a-7df2cc183ca3" width="100%" alt="development">
 </div>
 
 # ArchiveBox Development

From 64bfd7667effedd7591ca261dea89de7f2831f51 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 12:30:21 -0800
Subject: [PATCH 099/126] collapse README sections to reduce length and link to
 PUID PGID and root_squash info

---
 README.md | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 72cf202a..067facda 100644
--- a/README.md
+++ b/README.md
@@ -564,12 +564,22 @@ MAX_MEDIA_SIZE=1500m       # default: 750m  raise/lower youtubedl output size
 PUBLIC_INDEX=True          # default: True  whether anon users can view index
 PUBLIC_SNAPSHOTS=True      # default: True  whether anon users can view pages
 PUBLIC_ADD_VIEW=False      # default: False whether anon users can add new URLs
+
+CHROME_USER_AGENT="Mozilla/5.0 ..."  # change these to get around bot blocking
+WGET_USER_AGENT="Mozilla/5.0 ..."
+CURL_USER_AGENT="Mozilla/5.0 ..."
 ```
 
 <br/>
 
 ## Dependencies
 
+To achieve high-fidelity archives in as many situations as possible, ArchiveBox depends on a variety of high-quality 3rd-party tools and libraries that specialize in extracting different types of content.
+
+<br/>
+<details>
+<summary><i>Expand to learn more about ArchiveBox's dependencies...</i></summary>
+
 For better security, easier updating, and to avoid polluting your host system with extra dependencies, **it is strongly recommended to use the official [Docker image](https://github.com/ArchiveBox/ArchiveBox/wiki/Docker)** with everything pre-installed for the best experience.
 
 These optional dependencies used for archiving sites include:
@@ -601,12 +611,18 @@ Installing directly on **Windows without Docker or WSL/WSL2/Cygwin is not offici
 
 For detailed information about upgrading ArchiveBox and its dependencies, see: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives
 
+</details>
+
 <br/>
 
 ## Archive Layout
 
 All of ArchiveBox's state (including the index, snapshot data, and config file) is stored in a single folder called the "ArchiveBox data folder". All `archivebox` CLI commands must be run from inside this folder, and you first create it by running `archivebox init`.
 
+<br/>
+<details>
+<summary><i>Expand to learn more about the layout of Archivebox's data on-disk...</i></summary>
+
 The on-disk layout is optimized to be easy to browse by hand and durable long-term. The main index is a standard `index.sqlite3` database in the root of the data folder (it can also be exported as static JSON/HTML), and the archive snapshots are organized by date-added timestamp in the `./archive/` subfolder.
 
 <img src="https://user-images.githubusercontent.com/511499/117453293-c7b91600-af12-11eb-8a3f-aa48b0f9da3c.png" width="400px" align="right">
@@ -630,12 +646,17 @@ The on-disk layout is optimized to be easy to browse by hand and durable long-te
 
 Each snapshot subfolder `./archive/<timestamp>/` includes a static `index.json` and `index.html` describing its contents, and the snapshot extractor outputs are plain files within the folder.
 
+</details>
 
 <br/>
 
 ## Static Archive Exporting
 
-You can export the main index to browse it statically without needing to run a server.
+You can export the main index to browse it statically as plain HTML files in a folder (without needing to run a server).
+
+<br/>
+<details>
+<summary><i>Expand to learn how to export your ArchiveBox collection...</i></summary>
 
 > **Note**
 > These exports are not paginated, exporting many URLs or the entire archive at once may be slow. Use the filtering CLI flags on the `archivebox list` command to export specific Snapshots or ranges.
@@ -652,6 +673,7 @@ archivebox list --csv=timestamp,url,title > index.csv  # export to csv spreadshe
 
 The paths in the static exports are relative, make sure to keep them next to your `./archive` folder when backing them up or viewing them.
 
+</details>
 
 <br/>
 
@@ -667,6 +689,10 @@ The paths in the static exports are relative, make sure to keep them next to you
 
 <a id="archiving-private-urls"></a>
 
+<br/>
+<details>
+<summary><i>Click to expand...</i></summary>
+
 If you're importing pages with private content or URLs containing secret tokens you don't want public (e.g Google Docs, paywalled content, unlisted videos, etc.), **you may want to disable some of the extractor methods to avoid leaking that content to 3rd party APIs or the public**.
 
 ```bash
@@ -687,8 +713,16 @@ archivebox config --set SAVE_FAVICON=False          # disable favicon fetching (
 archivebox config --set CHROME_BINARY=chromium      # ensure it's using Chromium instead of Chrome
 ```
 
+</details>
+<br/>
+
+
 ### Security Risks of Viewing Archived JS
 
+<br/>
+<details>
+<summary><i>Click to expand...</i></summary>
+
 Be aware that malicious archived JS can access the contents of other pages in your archive when viewed. Because the Web UI serves all viewed snapshots from a single domain, they share a request context and **typical CSRF/CORS/XSS/CSP protections do not work to prevent cross-site request attacks**. See the [Security Overview](https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#stealth-mode) page and [Issue #239](https://github.com/ArchiveBox/ArchiveBox/issues/239) for more details.
 
 ```bash
@@ -705,8 +739,15 @@ The admin UI is also served from the same origin as replayed JS, so malicious pa
 
 *Note: Only the `wget` & `dom` extractor methods execute archived JS when viewing snapshots, all other archive methods produce static output that does not execute JS on viewing. If you are worried about these issues ^ you should disable these extractors using `archivebox config --set SAVE_WGET=False SAVE_DOM=False`.*
 
+</details>
+<br/>
+
 ### Saving Multiple Snapshots of a Single URL
 
+<br/>
+<details>
+<summary><i>Click to expand...</i></summary>
+
 First-class support for saving multiple snapshots of each site over time will be [added eventually](https://github.com/ArchiveBox/ArchiveBox/issues/179) (along with the ability to view diffs of the changes between runs). For now **ArchiveBox is designed to only archive each unique URL with each extractor type once**. The workaround to take multiple snapshots of the same URL is to make them slightly different by adding a hash:
 
 ```bash
@@ -717,12 +758,22 @@ archivebox add 'https://example.com#2020-10-25'
 
 The <img src="https://user-images.githubusercontent.com/511499/115942091-73c02300-a476-11eb-958e-5c1fc04da488.png" alt="Re-Snapshot Button" height="24px"/> button in the Admin UI is a shortcut for this hash-date workaround.
 
+</details>
+<br/>
+
 ### Storage Requirements
 
+<br/>
+<details>
+<summary><i>Click to expand...</i></summary>
+
 Because ArchiveBox is designed to ingest a firehose of browser history and bookmark feeds to a local disk, it can be much more disk-space intensive than a centralized service like the Internet Archive or Archive.today. **ArchiveBox can use anywhere from ~1gb per 1000 articles, to ~50gb per 1000 articles**, mostly dependent on whether you're saving audio & video using `SAVE_MEDIA=True` and whether you lower `MEDIA_MAX_SIZE=750mb`.
 
 Disk usage can be reduced by using a compressed/deduplicated filesystem like ZFS/BTRFS, or by turning off extractors methods you don't need. You can also deduplicate content with a tool like [fdupes](https://github.com/adrianlopezroche/fdupes) or [rdfind](https://github.com/pauldreik/rdfind). **Don't store large collections on older filesystems like EXT3/FAT** as they may not be able to handle more than 50k directory entries in the `archive/` folder. **Try to keep the `index.sqlite3` file on local drive (not a network mount)** or SSD for maximum performance, however the `archive/` folder can be on a network mount or slower HDD.
 
+If using Docker or NFS/SMB/FUSE for the `data/archive/` folder, you may need to set [`PUID` & `PGID`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#puid--pgid) and [disable `root_squash`](https://github.com/ArchiveBox/ArchiveBox/issues/1304) on your fileshare server.
+
+</details>
 <br/>
 
 ---

From 64ddab3750b7d425553b9db1f7d9967bc545d0ba Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 12:44:27 -0800
Subject: [PATCH 100/126] add more data to archive layout section

---
 README.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3b0a89cb..35d78404 100644
--- a/README.md
+++ b/README.md
@@ -579,6 +579,7 @@ To achieve high-fidelity archives in as many situations as possible, ArchiveBox
 <br/>
 <details>
 <summary><i>Expand to learn more about ArchiveBox's dependencies...</i></summary>
+<br/>
 
 For better security, easier updating, and to avoid polluting your host system with extra dependencies, **it is strongly recommended to use the official [Docker image](https://github.com/ArchiveBox/ArchiveBox/wiki/Docker)** with everything pre-installed for the best experience.
 
@@ -617,19 +618,27 @@ For detailed information about upgrading ArchiveBox and its dependencies, see: h
 
 ## Archive Layout
 
-All of ArchiveBox's state (including the index, snapshot data, and config file) is stored in a single folder called the "ArchiveBox data folder". All `archivebox` CLI commands must be run from inside this folder, and you first create it by running `archivebox init`.
+All of ArchiveBox's state (including the SQLite DB, archived assets, config, logs, etc.) is stored in a single folder called the "ArchiveBox Data Folder". Data folders can be created anywhere (`~/archivebox` or `$PWD/data` as seen in our examples), and you can create more than one for different collections.
 
 <br/>
 <details>
 <summary><i>Expand to learn more about the layout of Archivebox's data on-disk...</i></summary>
+<br/>
 
-The on-disk layout is optimized to be easy to browse by hand and durable long-term. The main index is a standard `index.sqlite3` database in the root of the data folder (it can also be exported as static JSON/HTML), and the archive snapshots are organized by date-added timestamp in the `./archive/` subfolder.
+All `archivebox` CLI commands are designed to be run from inside an ArchiveBox data folder, starting with `archivebox init` to initialize a new collection inside an empty directory.
+
+```bash
+mkdir ~/archivebox && cd ~/archivebox
+archivebox init
+```
+
+The on-disk layout is optimized to be easy to browse by hand and durable long-term. The main index is a standard `index.sqlite3` database in the root of the data folder (it can also be [exported as static JSON/HTML](https://github.com/ArchiveBox/ArchiveBox/wiki/Publishing-Your-Archive#2-export-and-host-it-as-static-html)), and the archive snapshots are organized by date-added timestamp in the `./archive/` subfolder.
 
 <img src="https://user-images.githubusercontent.com/511499/117453293-c7b91600-af12-11eb-8a3f-aa48b0f9da3c.png" width="400px" align="right">
 
 
 ```bash
-./
+/data/
     index.sqlite3
     ArchiveBox.conf
     archive/
@@ -657,6 +666,7 @@ You can export the main index to browse it statically as plain HTML files in a f
 <br/>
 <details>
 <summary><i>Expand to learn how to export your ArchiveBox collection...</i></summary>
+<br/>
 
 > **Note**
 > These exports are not paginated, exporting many URLs or the entire archive at once may be slow. Use the filtering CLI flags on the `archivebox list` command to export specific Snapshots or ranges.
@@ -673,6 +683,8 @@ archivebox list --csv=timestamp,url,title > index.csv  # export to csv spreadshe
 
 The paths in the static exports are relative, make sure to keep them next to your `./archive` folder when backing them up or viewing them.
 
+**Learn More Here:** [Publishing Your Archive: Export & Host as Static HTML](https://github.com/ArchiveBox/ArchiveBox/wiki/Publishing-Your-Archive#2-export-and-host-it-as-static-html)
+
 </details>
 
 <br/>

From 4479d3fb17bae67bcd06abcb28a7f4bc8a7cf969 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 13:32:08 -0800
Subject: [PATCH 101/126] add Learn More sections to README

---
 README.md | 128 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 118 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 35d78404..dfde64fb 100644
--- a/README.md
+++ b/README.md
@@ -610,7 +610,12 @@ archivebox --version   # see info and check validity of installed dependencies
 
 Installing directly on **Windows without Docker or WSL/WSL2/Cygwin is not officially supported** (I cannot respond to Windows support tickets), but some advanced users have reported getting it working.
 
-For detailed information about upgrading ArchiveBox and its dependencies, see: https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives
+#### Learn More
+
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Install#dependencies
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Chromium-Install
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Troubleshooting#installing
 
 </details>
 
@@ -655,6 +660,14 @@ The on-disk layout is optimized to be easy to browse by hand and durable long-te
 
 Each snapshot subfolder `./archive/<timestamp>/` includes a static `index.json` and `index.html` describing its contents, and the snapshot extractor outputs are plain files within the folder.
 
+#### Learn More
+
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#Disk-Layout
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#large-archives
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#output-folder
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Publishing-Your-Archive
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives
+
 </details>
 
 <br/>
@@ -683,7 +696,12 @@ archivebox list --csv=timestamp,url,title > index.csv  # export to csv spreadshe
 
 The paths in the static exports are relative, make sure to keep them next to your `./archive` folder when backing them up or viewing them.
 
-**Learn More Here:** [Publishing Your Archive: Export & Host as Static HTML](https://github.com/ArchiveBox/ArchiveBox/wiki/Publishing-Your-Archive#2-export-and-host-it-as-static-html)
+#### Learn More
+
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Publishing-Your-Archive#2-export-and-host-it-as-static-html
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#publishing
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#public_index--public_snapshots--public_add_view
+
 
 </details>
 
@@ -725,6 +743,14 @@ archivebox config --set SAVE_FAVICON=False          # disable favicon fetching (
 archivebox config --set CHROME_BINARY=chromium      # ensure it's using Chromium instead of Chrome
 ```
 
+#### Learn More
+
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Publishing-Your-Archive
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Chromium-Install#setting-up-a-chromium-user-profile
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#chrome_user_data_dir
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#cookies_file
+
 </details>
 <br/>
 
@@ -751,9 +777,37 @@ The admin UI is also served from the same origin as replayed JS, so malicious pa
 
 *Note: Only the `wget` & `dom` extractor methods execute archived JS when viewing snapshots, all other archive methods produce static output that does not execute JS on viewing. If you are worried about these issues ^ you should disable these extractors using `archivebox config --set SAVE_WGET=False SAVE_DOM=False`.*
 
+#### Learn More
+
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview
+- https://github.com/ArchiveBox/ArchiveBox/issues/239
+- https://github.com/ArchiveBox/ArchiveBox/security/advisories/GHSA-cr45-98w9-gwqx (`CVE-2023-45815`)
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#publishing
+
+
 </details>
 <br/>
 
+### Working Around Sites that Block Archiving
+
+<br/>
+<details>
+<summary><i>Click to expand...</i></summary>
+
+For various reasons, many large sites (Reddit, Twitter, Cloudflare, etc.) actively block archiving or bots in general. There are a number of approaches to work around this.
+
+- Set [`CHROME_USER_AGENT`, `WGET_USER_AGENT`, `CURL_USER_AGENT`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#curl_user_agent) to impersonate a real browser (instead of an ArchiveBox bot)
+- Set up a logged-in browser session for archiving using [`CHROME_DATA_DIR` & `COOKIES_FILE`](https://github.com/ArchiveBox/ArchiveBox/wiki/Chromium-Install#setting-up-a-chromium-user-profile)
+- Rewrite your URLs before archiving to swap in an alternative frontend thats more bot-friendly e.g.  
+  `reddit.com/some/url` -> `teddit.net/some/url`: https://github.com/mendel5/alternative-front-ends
+
+
+In the future we plan on adding support for running JS scripts during archiving to block ads, cookie popups, modals, and fix other issues. Follow here for progress: [Issue #51](https://github.com/ArchiveBox/ArchiveBox/issues/51).
+
+</details>
+<br/>
+
+
 ### Saving Multiple Snapshots of a Single URL
 
 <br/>
@@ -770,6 +824,12 @@ archivebox add 'https://example.com#2020-10-25'
 
 The <img src="https://user-images.githubusercontent.com/511499/115942091-73c02300-a476-11eb-958e-5c1fc04da488.png" alt="Re-Snapshot Button" height="24px"/> button in the Admin UI is a shortcut for this hash-date workaround.
 
+#### Learn More
+
+- https://github.com/ArchiveBox/ArchiveBox/issues/179
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#explanation-of-buttons-in-the-web-ui---admin-snapshots-list
+
+
 </details>
 <br/>
 
@@ -785,6 +845,17 @@ Disk usage can be reduced by using a compressed/deduplicated filesystem like ZFS
 
 If using Docker or NFS/SMB/FUSE for the `data/archive/` folder, you may need to set [`PUID` & `PGID`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#puid--pgid) and [disable `root_squash`](https://github.com/ArchiveBox/ArchiveBox/issues/1304) on your fileshare server.
 
+
+#### Learn More
+
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#Disk-Layout
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#output-folder
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#large-archives
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#puid--pgid
+- https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#do-not-run-as-root
+
+
+
 </details>
 <br/>
 
@@ -844,6 +915,11 @@ If using Docker or NFS/SMB/FUSE for the `data/archive/` folder, you may need to
 
 ArchiveBox aims to enable more of the internet to be saved from deterioration by empowering people to self-host their own archives. The intent is for all the web content you care about to be viewable with common software in 50 - 100 years without needing to run ArchiveBox or other specialized software to replay it.
 
+<br/>
+<details>
+<summary><i>Click to expand...</i></summary>
+
+
 Vast treasure troves of knowledge are lost every day on the internet to link rot. As a society, we have an imperative to preserve some important parts of that treasure, just like we preserve our books, paintings, and music in physical libraries long after the originals go out of print or fade into obscurity.
 
 Whether it's to resist censorship by saving articles before they get taken down or edited, or just to save a collection of early 2010's flash games you love to play, having the tools to archive internet content enables to you save the stuff you care most about before it disappears.
@@ -858,6 +934,9 @@ The balance between the permanence and ephemeral nature of content on the intern
 Because modern websites are complicated and often rely on dynamic content,
 ArchiveBox archives the sites in **several different formats** beyond what public archiving services like Archive.org/Archive.is save. Using multiple methods and the market-dominant browser to execute JS ensures we can save even the most complex, finicky websites in at least a few high-quality, long-term data formats.
 
+</details>
+<br/>
+
 ## Comparison to Other Projects
 
 <img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/4cac62a9-e8fb-425b-85a3-ca644aa6dd42" width="5%" align="right" alt="comparison"/> 
@@ -878,6 +957,10 @@ By having each user store their own content locally, we can save much larger por
 
 ArchiveBox differentiates itself from [similar self-hosted projects](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community#Web-Archiving-Projects) by providing both a comprehensive CLI interface for managing your archive, a Web UI that can be used either independently or together with the CLI, and a simple on-disk data format that can be used without either.
 
+<br/>
+<details>
+<summary><i>Click to expand...</i></summary>
+
 ArchiveBox is neither the highest fidelity nor the simplest tool available for self-hosted archiving, rather it's a jack-of-all-trades that tries to do most things well by default. It can be as simple or advanced as you want, and is designed to do everything out-of-the-box but be tuned to suit your needs.
 
 *If you want better fidelity for very complex interactive pages with heavy JS/streams/API requests, check out [ArchiveWeb.page](https://archiveweb.page) and [ReplayWeb.page](https://replayweb.page).*
@@ -888,6 +971,10 @@ ArchiveBox is neither the highest fidelity nor the simplest tool available for s
 
 For more alternatives, see our [list here](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community#Web-Archiving-Projects)...
 
+</details>
+
+<br/>
+
 <div align="center">
 <br/>
 <img src="ttps://github.com/ArchiveBox/ArchiveBox/assets/511499/04808ac2-3133-44fd-8703-3387e06dc851" width="100%" alt="dependencies graphic">
@@ -897,6 +984,7 @@ For more alternatives, see our [list here](https://github.com/ArchiveBox/Archive
 
 Whether you want to learn which organizations are the big players in the web archiving space, want to find a specific open-source tool for your web archiving need, or just want to see where archivists hang out online, our Community Wiki page serves as an index of the broader web archiving community. Check it out to learn about some of the coolest web archiving projects and communities on the web!
 
+
 <img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/78d8a725-97f4-47f5-b983-1f62843ddc51" width="14%" align="right"/>
 
 - [Community Wiki](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community)
@@ -912,6 +1000,7 @@ Whether you want to learn which organizations are the big players in the web arc
 - Learn why archiving the internet is important by reading the "[On the Importance of Web Archiving](https://items.ssrc.org/parameters/on-the-importance-of-web-archiving/)" blog post.
 - Reach out to me for questions and comments via [@ArchiveBoxApp](https://twitter.com/ArchiveBoxApp) or [@theSquashSH](https://twitter.com/thesquashSH) on Twitter
 
+
 <br/>
 
 **Need help building a custom archiving solution?**
@@ -941,27 +1030,32 @@ You can also access the docs locally by looking in the [`ArchiveBox/docs/`](http
 - [Quickstart](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart)
 - [Install](https://github.com/ArchiveBox/ArchiveBox/wiki/Install)
 - [Docker](https://github.com/ArchiveBox/ArchiveBox/wiki/Docker)
-
-## Reference
-
 - [Usage](https://github.com/ArchiveBox/ArchiveBox/wiki/Usage)
 - [Configuration](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration)
 - [Supported Sources](https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart#2-get-your-list-of-urls-to-archive)
 - [Supported Outputs](https://github.com/ArchiveBox/ArchiveBox/wiki#can-save-these-things-for-each-site)
+
+## Advanced
+
+- [Troubleshooting](https://github.com/ArchiveBox/ArchiveBox/wiki/Troubleshooting)
 - [Scheduled Archiving](https://github.com/ArchiveBox/ArchiveBox/wiki/Scheduled-Archiving)
 - [Publishing Your Archive](https://github.com/ArchiveBox/ArchiveBox/wiki/Publishing-Your-Archive)
 - [Chromium Install](https://github.com/ArchiveBox/ArchiveBox/wiki/Chromium-Install)
+- [Cookies & Sessions Setup](https://github.com/ArchiveBox/ArchiveBox/wiki/Chromium-Install#setting-up-a-chromium-user-profile)
 - [Security Overview](https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview)
-- [Troubleshooting](https://github.com/ArchiveBox/ArchiveBox/wiki/Troubleshooting)
 - [Upgrading or Merging Archives](https://github.com/ArchiveBox/ArchiveBox/wiki/Upgrading-or-Merging-Archives)
+
+## Developers
+
+- [Developer Documentation](https://github.com/ArchiveBox/ArchiveBox#archivebox-development)
 - [Python API](https://docs.archivebox.io/en/latest/modules.html) (alpha)
 - [REST API](https://github.com/ArchiveBox/ArchiveBox/issues/496) (alpha)
 
 ## More Info
 
-- [Tickets](https://github.com/ArchiveBox/ArchiveBox/issues)
+- [Bug Tracker](https://github.com/ArchiveBox/ArchiveBox/issues)
 - [Roadmap](https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap)
-- [Changelog](https://github.com/ArchiveBox/ArchiveBox/wiki/Changelog)
+- [Changelog](https://github.com/ArchiveBox/ArchiveBox/releases)
 - [Donations](https://github.com/ArchiveBox/ArchiveBox/wiki/Donations)
 - [Background & Motivation](https://github.com/ArchiveBox/ArchiveBox#background--motivation)
 - [Web Archiving Community](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community)
@@ -1058,6 +1152,20 @@ https://stackoverflow.com/questions/1074212/how-can-i-see-the-raw-sql-queries-dj
 
 <details><summary><i>Click to expand...</i></summary>
 
+##### Use a Pre-Built Image
+
+If you're looking for the latest `dev` Docker image, it's often available pre-built on Docker Hub, simply pull and use `archivebox/archivebox:dev`.
+
+```bash
+docker pull archivebox/archivebox:dev
+docker run archivebox/archivebox:dev version
+# verify the BUILD_TIME and COMMIT_HASH in the output are recent
+```
+
+##### Build Branch from Source
+  
+You can also build and run any branch yourself from source, for example to build & use `dev` locally:
+
 ```bash
 # docker-compose.yml:
 services:
@@ -1066,11 +1174,11 @@ services:
         build: 'https://github.com/ArchiveBox/ArchiveBox.git#dev'
         ...
 
-# docker:
+# or with plain Docker:
 docker build -t archivebox:dev https://github.com/ArchiveBox/ArchiveBox.git#dev
 docker run -it -v $PWD:/data archivebox:dev init --setup
 
-# bare metal:
+# or with pip:
 pip install 'git+https://github.com/pirate/ArchiveBox@dev'
 npm install 'git+https://github.com/ArchiveBox/ArchiveBox.git#dev'
 archivebox init --setup

From 71ca0b27a86b9c2c8ba6807aba274a3f3d166f3d Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 13:47:21 -0800
Subject: [PATCH 102/126] minor formatting and wording improvements to README

---
 README.md | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index dfde64fb..596abfff 100644
--- a/README.md
+++ b/README.md
@@ -623,7 +623,8 @@ Installing directly on **Windows without Docker or WSL/WSL2/Cygwin is not offici
 
 ## Archive Layout
 
-All of ArchiveBox's state (including the SQLite DB, archived assets, config, logs, etc.) is stored in a single folder called the "ArchiveBox Data Folder". Data folders can be created anywhere (`~/archivebox` or `$PWD/data` as seen in our examples), and you can create more than one for different collections.
+All of ArchiveBox's state (including the SQLite DB, archived assets, config, logs, etc.) is stored in a single folder called the "ArchiveBox Data Folder".  
+Data folders can be created anywhere (`~/archivebox` or `$PWD/data` as seen in our examples), and you can create more than one for different collections.
 
 <br/>
 <details>
@@ -633,7 +634,7 @@ All of ArchiveBox's state (including the SQLite DB, archived assets, config, log
 All `archivebox` CLI commands are designed to be run from inside an ArchiveBox data folder, starting with `archivebox init` to initialize a new collection inside an empty directory.
 
 ```bash
-mkdir ~/archivebox && cd ~/archivebox
+mkdir ~/archivebox && cd ~/archivebox   # just an example, can be anywhere
 archivebox init
 ```
 
@@ -719,11 +720,12 @@ The paths in the static exports are relative, make sure to keep them next to you
 
 <a id="archiving-private-urls"></a>
 
+If you're importing pages with private content or URLs containing secret tokens you don't want public (e.g Google Docs, paywalled content, unlisted videos, etc.), **you may want to disable some of the extractor methods to avoid leaking that content to 3rd party APIs or the public**.
+
 <br/>
 <details>
 <summary><i>Click to expand...</i></summary>
 
-If you're importing pages with private content or URLs containing secret tokens you don't want public (e.g Google Docs, paywalled content, unlisted videos, etc.), **you may want to disable some of the extractor methods to avoid leaking that content to 3rd party APIs or the public**.
 
 ```bash
 # don't save private content to ArchiveBox, e.g.:
@@ -757,11 +759,12 @@ archivebox config --set CHROME_BINARY=chromium      # ensure it's using Chromium
 
 ### Security Risks of Viewing Archived JS
 
+Be aware that malicious archived JS can access the contents of other pages in your archive when viewed. Because the Web UI serves all viewed snapshots from a single domain, they share a request context and **typical CSRF/CORS/XSS/CSP protections do not work to prevent cross-site request attacks**. See the [Security Overview](https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#stealth-mode) page and [Issue #239](https://github.com/ArchiveBox/ArchiveBox/issues/239) for more details.
+
 <br/>
 <details>
 <summary><i>Click to expand...</i></summary>
 
-Be aware that malicious archived JS can access the contents of other pages in your archive when viewed. Because the Web UI serves all viewed snapshots from a single domain, they share a request context and **typical CSRF/CORS/XSS/CSP protections do not work to prevent cross-site request attacks**. See the [Security Overview](https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview#stealth-mode) page and [Issue #239](https://github.com/ArchiveBox/ArchiveBox/issues/239) for more details.
 
 ```bash
 # visiting an archived page with malicious JS:
@@ -790,12 +793,12 @@ The admin UI is also served from the same origin as replayed JS, so malicious pa
 
 ### Working Around Sites that Block Archiving
 
+For various reasons, many large sites (Reddit, Twitter, Cloudflare, etc.) actively block archiving or bots in general. There are a number of approaches to work around this.
+
 <br/>
 <details>
 <summary><i>Click to expand...</i></summary>
 
-For various reasons, many large sites (Reddit, Twitter, Cloudflare, etc.) actively block archiving or bots in general. There are a number of approaches to work around this.
-
 - Set [`CHROME_USER_AGENT`, `WGET_USER_AGENT`, `CURL_USER_AGENT`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#curl_user_agent) to impersonate a real browser (instead of an ArchiveBox bot)
 - Set up a logged-in browser session for archiving using [`CHROME_DATA_DIR` & `COOKIES_FILE`](https://github.com/ArchiveBox/ArchiveBox/wiki/Chromium-Install#setting-up-a-chromium-user-profile)
 - Rewrite your URLs before archiving to swap in an alternative frontend thats more bot-friendly e.g.  
@@ -810,11 +813,13 @@ In the future we plan on adding support for running JS scripts during archiving
 
 ### Saving Multiple Snapshots of a Single URL
 
+ArchiveBox appends a hash with the current date `https://example.com#2020-10-24` to differentiate when a single URL is archived multiple times.
+
 <br/>
 <details>
 <summary><i>Click to expand...</i></summary>
 
-First-class support for saving multiple snapshots of each site over time will be [added eventually](https://github.com/ArchiveBox/ArchiveBox/issues/179) (along with the ability to view diffs of the changes between runs). For now **ArchiveBox is designed to only archive each unique URL with each extractor type once**. The workaround to take multiple snapshots of the same URL is to make them slightly different by adding a hash:
+Because ArchiveBox uniquely identifies snapshots by URL, it must use a workaround to take multiple snapshots of the same URL (otherwise they would show up as a single Snapshot entry). It makes the URLs of repeated snapshots unique by adding a hash with the archive date at the end:
 
 ```bash
 archivebox add 'https://example.com#2020-10-24'
@@ -822,7 +827,9 @@ archivebox add 'https://example.com#2020-10-24'
 archivebox add 'https://example.com#2020-10-25'
 ```
 
-The <img src="https://user-images.githubusercontent.com/511499/115942091-73c02300-a476-11eb-958e-5c1fc04da488.png" alt="Re-Snapshot Button" height="24px"/> button in the Admin UI is a shortcut for this hash-date workaround.
+The <img src="https://user-images.githubusercontent.com/511499/115942091-73c02300-a476-11eb-958e-5c1fc04da488.png" alt="Re-Snapshot Button" height="24px"/> button in the Admin UI is a shortcut for this hash-date multi-snapshotting workaround.
+
+Improved support for saving multiple snapshots of a single URL without this hash-date workaround will be [added eventually](https://github.com/ArchiveBox/ArchiveBox/issues/179) (along with the ability to view diffs of the changes between runs).
 
 #### Learn More
 
@@ -835,11 +842,13 @@ The <img src="https://user-images.githubusercontent.com/511499/115942091-73c0230
 
 ### Storage Requirements
 
+Because ArchiveBox is designed to ingest a large volume of URLs with multiple copies of each URL stored by different 3rd-party tools, it can be quite disk-space intensive. There also also some special requirements when using filesystems like NFS/SMB/FUSE.
+
 <br/>
 <details>
 <summary><i>Click to expand...</i></summary>
 
-Because ArchiveBox is designed to ingest a firehose of browser history and bookmark feeds to a local disk, it can be much more disk-space intensive than a centralized service like the Internet Archive or Archive.today. **ArchiveBox can use anywhere from ~1gb per 1000 articles, to ~50gb per 1000 articles**, mostly dependent on whether you're saving audio & video using `SAVE_MEDIA=True` and whether you lower `MEDIA_MAX_SIZE=750mb`.
+**ArchiveBox can use anywhere from ~1gb per 1000 articles, to ~50gb per 1000 articles**, mostly dependent on whether you're saving audio & video using `SAVE_MEDIA=True` and whether you lower `MEDIA_MAX_SIZE=750mb`.
 
 Disk usage can be reduced by using a compressed/deduplicated filesystem like ZFS/BTRFS, or by turning off extractors methods you don't need. You can also deduplicate content with a tool like [fdupes](https://github.com/adrianlopezroche/fdupes) or [rdfind](https://github.com/pauldreik/rdfind). **Don't store large collections on older filesystems like EXT3/FAT** as they may not be able to handle more than 50k directory entries in the `archive/` folder. **Try to keep the `index.sqlite3` file on local drive (not a network mount)** or SSD for maximum performance, however the `archive/` folder can be on a network mount or slower HDD.
 

From 30fd005605821ff6e9a75e1653a1f28cd4484c84 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 13:58:33 -0800
Subject: [PATCH 103/126] more minor README tweaks

---
 README.md | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 596abfff..35f75f30 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,7 @@
 <a href="https://github.com/ArchiveBox/ArchiveBox">GitHub</a> |
 <a href="https://github.com/ArchiveBox/ArchiveBox/wiki">Documentation</a> |
 <a href="#background--motivation">Info & Motivation</a> |
-<a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community">Community</a> |
-<a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Roadmap">Roadmap</a>
+<a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community">Community</a>
 
 <br/>
 
@@ -18,7 +17,7 @@
 
 <a href="https://github.com/ArchiveBox/ArchiveBox/blob/dev/LICENSE"><img src="https://img.shields.io/badge/Open_source-MIT-green.svg?logo=git&logoColor=green"/></a>
 <a href="https://github.com/ArchiveBox/ArchiveBox"><img src="https://img.shields.io/github/stars/ArchiveBox/ArchiveBox.svg?logo=github&label=Stars&logoColor=blue"/></a>
-<a href="https://github.com/ArchiveBox/ArchiveBox/commits/dev"><img src="https://img.shields.io/github/last-commit/ArchiveBox/ArchiveBox.svg?logo=Sublime+Text&logoColor=green&label=active"/></a> &nbsp;
+<a href="https://github.com/ArchiveBox/ArchiveBox/commits/dev"><img src="https://img.shields.io/github/last-commit/ArchiveBox/ArchiveBox.svg?logo=Sublime+Text&logoColor=green&label=Active"/></a> &nbsp;
 <a href="https://pypi.org/project/archivebox/"><img src="https://img.shields.io/badge/Python-yellow.svg?logo=python&logoColor=yellow"/></a>
 <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Install#dependencies"><img src="https://img.shields.io/badge/Chromium-orange.svg?logo=Google+Chrome&logoColor=orange"/></a>
 <a href="https://hub.docker.com/r/archivebox/archivebox"><img src="https://img.shields.io/badge/Docker-lightblue.svg?logo=docker&logoColor=lightblue"/></a>
@@ -798,6 +797,7 @@ For various reasons, many large sites (Reddit, Twitter, Cloudflare, etc.) active
 <br/>
 <details>
 <summary><i>Click to expand...</i></summary>
+<br/>
 
 - Set [`CHROME_USER_AGENT`, `WGET_USER_AGENT`, `CURL_USER_AGENT`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#curl_user_agent) to impersonate a real browser (instead of an ArchiveBox bot)
 - Set up a logged-in browser session for archiving using [`CHROME_DATA_DIR` & `COOKIES_FILE`](https://github.com/ArchiveBox/ArchiveBox/wiki/Chromium-Install#setting-up-a-chromium-user-profile)
@@ -818,6 +818,7 @@ ArchiveBox appends a hash with the current date `https://example.com#2020-10-24`
 <br/>
 <details>
 <summary><i>Click to expand...</i></summary>
+<br/>
 
 Because ArchiveBox uniquely identifies snapshots by URL, it must use a workaround to take multiple snapshots of the same URL (otherwise they would show up as a single Snapshot entry). It makes the URLs of repeated snapshots unique by adding a hash with the archive date at the end:
 
@@ -842,11 +843,13 @@ Improved support for saving multiple snapshots of a single URL without this hash
 
 ### Storage Requirements
 
-Because ArchiveBox is designed to ingest a large volume of URLs with multiple copies of each URL stored by different 3rd-party tools, it can be quite disk-space intensive. There also also some special requirements when using filesystems like NFS/SMB/FUSE.
+Because ArchiveBox is designed to ingest a large volume of URLs with multiple copies of each URL stored by different 3rd-party tools, it can be quite disk-space intensive.  
+There also also some special requirements when using filesystems like NFS/SMB/FUSE.
 
 <br/>
 <details>
 <summary><i>Click to expand...</i></summary>
+<br/>
 
 **ArchiveBox can use anywhere from ~1gb per 1000 articles, to ~50gb per 1000 articles**, mostly dependent on whether you're saving audio & video using `SAVE_MEDIA=True` and whether you lower `MEDIA_MAX_SIZE=750mb`.
 
@@ -926,8 +929,8 @@ ArchiveBox aims to enable more of the internet to be saved from deterioration by
 
 <br/>
 <details>
-<summary><i>Click to expand...</i></summary>
-
+<summary><i>Click to read more...</i></summary>
+<br/>
 
 Vast treasure troves of knowledge are lost every day on the internet to link rot. As a society, we have an imperative to preserve some important parts of that treasure, just like we preserve our books, paintings, and music in physical libraries long after the originals go out of print or fade into obscurity.
 
@@ -950,7 +953,9 @@ ArchiveBox archives the sites in **several different formats** beyond what publi
 
 <img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/4cac62a9-e8fb-425b-85a3-ca644aa6dd42" width="5%" align="right" alt="comparison"/> 
 
-▶ **Check out our [community page](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community) for an index of web archiving initiatives and projects.**
+
+> [!TIP]
+> **Check out our [community page](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community) for an index of web archiving initiatives and projects.**
 
 A variety of open and closed-source archiving projects exist, but few provide a nice UI and CLI to manage a large, high-fidelity archive collection over time.
 
@@ -966,9 +971,8 @@ By having each user store their own content locally, we can save much larger por
 
 ArchiveBox differentiates itself from [similar self-hosted projects](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community#Web-Archiving-Projects) by providing both a comprehensive CLI interface for managing your archive, a Web UI that can be used either independently or together with the CLI, and a simple on-disk data format that can be used without either.
 
-<br/>
 <details>
-<summary><i>Click to expand...</i></summary>
+<summary><i>Click to see the <b>officially recommended</b> alternatives to ArchiveBox...</i></summary>
 
 ArchiveBox is neither the highest fidelity nor the simplest tool available for self-hosted archiving, rather it's a jack-of-all-trades that tries to do most things well by default. It can be as simple or advanced as you want, and is designed to do everything out-of-the-box but be tuned to suit your needs.
 
@@ -986,7 +990,7 @@ For more alternatives, see our [list here](https://github.com/ArchiveBox/Archive
 
 <div align="center">
 <br/>
-<img src="ttps://github.com/ArchiveBox/ArchiveBox/assets/511499/04808ac2-3133-44fd-8703-3387e06dc851" width="100%" alt="dependencies graphic">
+<img src="https://github.com/ArchiveBox/ArchiveBox/assets/511499/04808ac2-3133-44fd-8703-3387e06dc851" width="100%" alt="dependencies graphic">
 </div>
 
 ## Internet Archiving Ecosystem

From a0f01a543db3d4c552dd41b4e3caa510b5b39df0 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 14:58:41 -0800
Subject: [PATCH 104/126] minor readme tweaks

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 35f75f30..91b56c22 100644
--- a/README.md
+++ b/README.md
@@ -972,9 +972,9 @@ By having each user store their own content locally, we can save much larger por
 ArchiveBox differentiates itself from [similar self-hosted projects](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community#Web-Archiving-Projects) by providing both a comprehensive CLI interface for managing your archive, a Web UI that can be used either independently or together with the CLI, and a simple on-disk data format that can be used without either.
 
 <details>
-<summary><i>Click to see the <b>officially recommended</b> alternatives to ArchiveBox...</i></summary>
+<summary><i>Click to see the <b>⭐️ officially recommended</b> alternatives to ArchiveBox...</i></summary>
+<br/>
 
-ArchiveBox is neither the highest fidelity nor the simplest tool available for self-hosted archiving, rather it's a jack-of-all-trades that tries to do most things well by default. It can be as simple or advanced as you want, and is designed to do everything out-of-the-box but be tuned to suit your needs.
 
 *If you want better fidelity for very complex interactive pages with heavy JS/streams/API requests, check out [ArchiveWeb.page](https://archiveweb.page) and [ReplayWeb.page](https://replayweb.page).*
 
@@ -984,6 +984,8 @@ ArchiveBox is neither the highest fidelity nor the simplest tool available for s
 
 For more alternatives, see our [list here](https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community#Web-Archiving-Projects)...
 
+ArchiveBox is neither the highest fidelity nor the simplest tool available for self-hosted archiving, rather it's a jack-of-all-trades that tries to do most things well by default. We encourage you to try these other tools made by our friends if ArchiveBox isn't suited to your needs.
+
 </details>
 
 <br/>

From 83eede54da3c52c2916a10d7eee70ece2978cc38 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 14:59:08 -0800
Subject: [PATCH 105/126] fix docker image in compose file

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c2d3d0a7..d8342216 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ version: '3.9'
 services:
     archivebox:
         #image: ${DOCKER_IMAGE:-archivebox/archivebox:dev}
-        image: archivebox:dev
+        image: archivebox/archivebox:dev
         command: server --quick-init 0.0.0.0:8000
         ports:
             - 8000:8000

From 48c9a49d56438988e0c8c39041a60dfa5827f5fb Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 15:10:10 -0800
Subject: [PATCH 106/126] fix shell re-quoting in docker_entrypoint.sh so that
 quoted subcommands can be passed in

---
 bin/docker_entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index 5a80012b..0bb38f40 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -107,12 +107,12 @@ if [[ "$1" == /* || "$1" == "bash" || "$1" == "sh" || "$1" == "echo" || "$1" ==
     #      "docker run archivebox /venv/bin/ipython3"
     #      "docker run archivebox /bin/bash -c '...'"
     #      "docker run archivebox cat /VERSION.txt"
-    exec gosu "$PUID" bash -c "$*"
+    exec gosu "$PUID" bash -c "$(printf ' %q' "$@")"
 else
     # handle "docker run archivebox add some subcommand --with=args abc" by calling archivebox to run as args as CLI subcommand
     # e.g. "docker run archivebox help"
     #      "docker run archivebox add --depth=1 https://example.com"
     #      "docker run archivebox manage createsupseruser"
     #      "docker run archivebox server 0.0.0.0:8000"
-    exec gosu "$PUID" bash -c "archivebox $*"
+    exec gosu "$PUID" bash -c "archivebox $(printf ' %q' "$@")"
 fi

From 2bb6dca294698650b95a95398014435b37a6313d Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 15:58:45 -0800
Subject: [PATCH 107/126] check for available disk space on docker root fs and
 data volume and improve shell requoting

---
 bin/docker_entrypoint.sh | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index 0bb38f40..723b4ab2 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -99,20 +99,54 @@ if [[ "$IN_QEMU" == "True" ]]; then
     echo -e "    See here for more info: https://github.com/microsoft/playwright/issues/17395#issuecomment-1250830493\n" > /dev/stderr
 fi
 
+# check disk space free on / and /data, warn on >95% use, error on >99% use
+ROOT_USED_PCT="$(df --output=pcent / | tail -n 1 | xargs)"
+if [[ "${ROOT_USED_PCT//%/}" -ge 99 ]]; then
+    df -kh / > /dev/stderr
+    echo -e "\n[!] Warning: Docker root filesystem is completely out of space! ($ROOT_USED_PCT used on /)" > /dev/stderr
+    echo -e "    you need to free up space in your Docker VM to continue:" > /dev/stderr
+    echo -e "    \$ docker system prune\n" > /dev/stderr
+    exit 3
+elif [[ "${ROOT_USED_PCT//%/}" -gt 97 ]]; then
+    df -kh / > /dev/stderr
+    echo -e "\n[!] Warning: Docker root filesystem is running out of space! ($ROOT_USED_PCT used on /)" > /dev/stderr
+    echo -e "    you may need to free up space in your Docker VM soon:" > /dev/stderr
+    echo -e "    \$ docker system prune\n" > /dev/stderr
+fi
+
+DATA_USED_PCT="$(df --output=pcent /data | tail -n 1 | xargs)"
+if [[ "${DATA_USED_PCT//%/}" -ge 99 ]]; then
+    df -kh /data > /dev/stderr
+    echo -e "\n[!] Warning: Docker data volume is completely out of space! ($DATA_USED_PCT used on /data)" > /dev/stderr
+    echo -e "    you need to free up space on the drive holding your data directory" > /dev/stderr
+    echo -e "    \$ ncdu -x data\n" > /dev/stderr
+    sleep 5
+elif [[ "${DATA_USED_PCT//%/}" -gt 95 ]]; then
+    df -kh /data > /dev/stderr
+    echo -e "\n[!] Warning: Docker data volume is running out of space! ($DATA_USED_PCT used on /data)" > /dev/stderr
+    echo -e "    you may need to free up space on the drive holding your data directory soon" > /dev/stderr
+    echo -e "    \$ ncdu -x data\n" > /dev/stderr
+fi
+
+
+ARCHIVEBOX_BIN_PATH="$(which archivebox)"
 
 # Drop permissions to run commands as the archivebox user
-if [[ "$1" == /* || "$1" == "bash" || "$1" == "sh" || "$1" == "echo" || "$1" == "cat" || "$1" == "archivebox" ]]; then
+if [[ "$1" == /* || "$1" == "bash" || "$1" == "sh" || "$1" == "echo" || "$1" == "cat" || "$1" == "whoami" || "$1" == "archivebox" ]]; then
     # handle "docker run archivebox /bin/somecommand --with=some args" by passing args directly to bash -c
     # e.g. "docker run archivebox archivebox init:
     #      "docker run archivebox /venv/bin/ipython3"
     #      "docker run archivebox /bin/bash -c '...'"
     #      "docker run archivebox cat /VERSION.txt"
-    exec gosu "$PUID" bash -c "$(printf ' %q' "$@")"
+    exec gosu "$PUID" /bin/bash -c "exec $(printf ' %q' "$@")"
+    # printf requotes shell parameters properly https://stackoverflow.com/a/39463371/2156113
+    # gosu spawns an ephemeral bash process owned by archivebox user (bash wrapper is needed to load env vars, PATH, and setup terminal TTY)
+    # outermost exec hands over current process ID to inner bash process, inner exec hands over inner bash PID to user's command
 else
     # handle "docker run archivebox add some subcommand --with=args abc" by calling archivebox to run as args as CLI subcommand
     # e.g. "docker run archivebox help"
     #      "docker run archivebox add --depth=1 https://example.com"
     #      "docker run archivebox manage createsupseruser"
     #      "docker run archivebox server 0.0.0.0:8000"
-    exec gosu "$PUID" bash -c "archivebox $(printf ' %q' "$@")"
+    exec gosu "$PUID" "$ARCHIVEBOX_BIN_PATH" "$@"
 fi

From 3ee3916b2935571ff43f2765be61381dfa737430 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 17:24:10 -0800
Subject: [PATCH 108/126] Update test.yml to fix python builds

---
 .github/workflows/test.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a30133a..d66fab4b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,11 +13,11 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
-        python: [3.9]
+        os: [ubuntu-22.04, macos-latest, windows-latest]
+        python: [3.11]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 1
@@ -29,10 +29,10 @@ jobs:
           python-version: ${{ matrix.python }}
           architecture: x64
 
-      - name: Set up Node JS 14.7.0
-        uses: actions/setup-node@v3
+      - name: Set up Node JS
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.12.0
+          node-version: 20.10.0
 
       - name: Setup PDM
         uses: pdm-project/setup-pdm@v3
@@ -44,7 +44,7 @@ jobs:
           echo "::set-output name=dir::$(pip cache dir)"
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache-pip
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
@@ -56,7 +56,8 @@ jobs:
         run: |
           python -m pip install --upgrade pip setuptools wheel pytest bottle build
           ./bin/build_pip.sh
-          pdm install
+          pdm lock --group=':all'
+          pdm install --group=':all' --dev
 
       - name: Get npm cache dir
         id: npm-cache
@@ -64,7 +65,7 @@ jobs:
           echo "::set-output name=dir::$GITHUB_WORKSPACE/node_modules"
 
       - name: Cache npm
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache-npm
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
@@ -99,7 +100,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 1

From 3ddc0c7f7a7117b9e936e6f70e15fe9e1867a2f0 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 16:46:04 -0800
Subject: [PATCH 109/126] fix free space calculation and make it based on
 absolute values instead of pcts

---
 bin/docker_entrypoint.sh | 43 ++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index 723b4ab2..b288b817 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -10,6 +10,7 @@
 # - Create a new /data dir if necessary and set the correct ownership on it
 # - Create a new /browsers dir if necessary and set the correct ownership on it
 # - Check whether we're running inside QEMU emulation and show a warning if so.
+# - Check that enough free space is available on / and /data
 # - Drop down to archivebox user permisisons and execute passed CMD command.
 
 # Bash Environment Setup
@@ -84,7 +85,7 @@ chown $PUID:$PGID "$DATA_DIR"
 chown $PUID:$PGID "$DATA_DIR"/*
 
 # also chown BROWSERS_DIR because otherwise 'archivebox setup' wont be able to install chrome at runtime
-PLAYWRIGHT_BROWSERS_PATH="${PLAYWRIGHT_BROWSERS_PATH:-/browsers}"
+export PLAYWRIGHT_BROWSERS_PATH="${PLAYWRIGHT_BROWSERS_PATH:-/browsers}"
 mkdir -p "$PLAYWRIGHT_BROWSERS_PATH/permissions_test_safe_to_delete"
 chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"
 chown $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/*
@@ -99,37 +100,41 @@ if [[ "$IN_QEMU" == "True" ]]; then
     echo -e "    See here for more info: https://github.com/microsoft/playwright/issues/17395#issuecomment-1250830493\n" > /dev/stderr
 fi
 
-# check disk space free on / and /data, warn on >95% use, error on >99% use
-ROOT_USED_PCT="$(df --output=pcent / | tail -n 1 | xargs)"
-if [[ "${ROOT_USED_PCT//%/}" -ge 99 ]]; then
-    df -kh / > /dev/stderr
-    echo -e "\n[!] Warning: Docker root filesystem is completely out of space! ($ROOT_USED_PCT used on /)" > /dev/stderr
-    echo -e "    you need to free up space in your Docker VM to continue:" > /dev/stderr
+# check disk space free on / and /data, warn on <500Mb free, error on <100Mb free
+export ROOT_USAGE="$(df --output=pcent,avail / | tail -n 1 | xargs)"
+export ROOT_USED_PCT="${ROOT_USAGE%%%*}"
+export ROOT_AVAIL_KB="$(echo "$ROOT_USAGE" | awk '{print $2}')"
+if [[ "$ROOT_AVAIL_KB" -lt 100000 ]]; then
+    echo -e "\n[!] Warning: Docker root filesystem is completely out of space! (${ROOT_USED_PCT}% used on /)" > /dev/stderr
+    echo -e "    you need to free up at least 100Mb in your Docker VM to continue:" > /dev/stderr
     echo -e "    \$ docker system prune\n" > /dev/stderr
-    exit 3
-elif [[ "${ROOT_USED_PCT//%/}" -gt 97 ]]; then
     df -kh / > /dev/stderr
-    echo -e "\n[!] Warning: Docker root filesystem is running out of space! ($ROOT_USED_PCT used on /)" > /dev/stderr
+    exit 3
+elif [[ "$ROOT_USED_PCT" -ge 99 ]] || [[ "$ROOT_AVAIL_KB" -lt 500000 ]]; then
+    echo -e "\n[!] Warning: Docker root filesystem is running out of space! (${ROOT_USED_PCT}% used on /)" > /dev/stderr
     echo -e "    you may need to free up space in your Docker VM soon:" > /dev/stderr
     echo -e "    \$ docker system prune\n" > /dev/stderr
+    df -kh / > /dev/stderr
 fi
 
-DATA_USED_PCT="$(df --output=pcent /data | tail -n 1 | xargs)"
-if [[ "${DATA_USED_PCT//%/}" -ge 99 ]]; then
-    df -kh /data > /dev/stderr
-    echo -e "\n[!] Warning: Docker data volume is completely out of space! ($DATA_USED_PCT used on /data)" > /dev/stderr
-    echo -e "    you need to free up space on the drive holding your data directory" > /dev/stderr
+export DATA_USAGE="$(df --output=pcent,avail /data | tail -n 1 | xargs)"
+export DATA_USED_PCT="${DATA_USAGE%%%*}"
+export DATA_AVAIL_KB="$(echo "$DATA_USAGE" | awk '{print $2}')"
+if [[ "$DATA_AVAIL_KB" -lt 100000 ]]; then
+    echo -e "\n[!] Warning: Docker data volume is completely out of space! (${DATA_USED_PCT}% used on /data)" > /dev/stderr
+    echo -e "    you need to free up at least 100Mb on the drive holding your data directory" > /dev/stderr
     echo -e "    \$ ncdu -x data\n" > /dev/stderr
-    sleep 5
-elif [[ "${DATA_USED_PCT//%/}" -gt 95 ]]; then
     df -kh /data > /dev/stderr
-    echo -e "\n[!] Warning: Docker data volume is running out of space! ($DATA_USED_PCT used on /data)" > /dev/stderr
+    sleep 5
+elif [[ "$DATA_USED_PCT" -ge 99 ]] || [[ "$ROOT_AVAIL_KB" -lt 500000 ]]; then
+    echo -e "\n[!] Warning: Docker data volume is running out of space! (${DATA_USED_PCT}% used on /data)" > /dev/stderr
     echo -e "    you may need to free up space on the drive holding your data directory soon" > /dev/stderr
     echo -e "    \$ ncdu -x data\n" > /dev/stderr
+    df -kh /data > /dev/stderr
 fi
 
 
-ARCHIVEBOX_BIN_PATH="$(which archivebox)"
+export ARCHIVEBOX_BIN_PATH="$(which archivebox)"
 
 # Drop permissions to run commands as the archivebox user
 if [[ "$1" == /* || "$1" == "bash" || "$1" == "sh" || "$1" == "echo" || "$1" == "cat" || "$1" == "whoami" || "$1" == "archivebox" ]]; then

From 490b765d5ba492b1da7e94a01f289c404fbd4ef0 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 17:24:29 -0800
Subject: [PATCH 110/126] add dev deps to lockfile

---
 pdm.lock | 882 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 881 insertions(+), 1 deletion(-)

diff --git a/pdm.lock b/pdm.lock
index c39fcfab..b3aad2a0 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -2,11 +2,21 @@
 # It is not intended for manual editing.
 
 [metadata]
-groups = ["default", "ldap", "sonic"]
+groups = ["default", "dev", "ldap", "sonic"]
 strategy = ["cross_platform"]
 lock_version = "4.4.1"
 content_hash = "sha256:37a19e5e34763f5ea329b87a911d2422a097c3b655d07c321820f4fdd680c3b2"
 
+[[package]]
+name = "alabaster"
+version = "0.7.13"
+requires_python = ">=3.6"
+summary = "A configurable sidebar-enabled Sphinx theme"
+files = [
+    {file = "alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
+    {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
+]
+
 [[package]]
 name = "asgiref"
 version = "3.7.2"
@@ -32,6 +42,26 @@ files = [
     {file = "asttokens-2.4.1.tar.gz", hash = "sha256:b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0"},
 ]
 
+[[package]]
+name = "babel"
+version = "2.14.0"
+requires_python = ">=3.7"
+summary = "Internationalization utilities"
+files = [
+    {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"},
+    {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"},
+]
+
+[[package]]
+name = "blinker"
+version = "1.7.0"
+requires_python = ">=3.8"
+summary = "Fast, simple object-to-object and broadcast signaling"
+files = [
+    {file = "blinker-1.7.0-py3-none-any.whl", hash = "sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9"},
+    {file = "blinker-1.7.0.tar.gz", hash = "sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182"},
+]
+
 [[package]]
 name = "brotli"
 version = "1.1.0"
@@ -126,6 +156,35 @@ files = [
     {file = "brotlicffi-1.1.0.0.tar.gz", hash = "sha256:b77827a689905143f87915310b93b273ab17888fd43ef350d4832c4a71083c13"},
 ]
 
+[[package]]
+name = "cachecontrol"
+version = "0.13.1"
+requires_python = ">=3.7"
+summary = "httplib2 caching for requests"
+dependencies = [
+    "msgpack>=0.5.2",
+    "requests>=2.16.0",
+]
+files = [
+    {file = "cachecontrol-0.13.1-py3-none-any.whl", hash = "sha256:95dedbec849f46dda3137866dc28b9d133fc9af55f5b805ab1291833e4457aa4"},
+    {file = "cachecontrol-0.13.1.tar.gz", hash = "sha256:f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b"},
+]
+
+[[package]]
+name = "cachecontrol"
+version = "0.13.1"
+extras = ["filecache"]
+requires_python = ">=3.7"
+summary = "httplib2 caching for requests"
+dependencies = [
+    "cachecontrol==0.13.1",
+    "filelock>=3.8.0",
+]
+files = [
+    {file = "cachecontrol-0.13.1-py3-none-any.whl", hash = "sha256:95dedbec849f46dda3137866dc28b9d133fc9af55f5b805ab1291833e4457aa4"},
+    {file = "cachecontrol-0.13.1.tar.gz", hash = "sha256:f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b"},
+]
+
 [[package]]
 name = "certifi"
 version = "2023.11.17"
@@ -271,6 +330,15 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
+[[package]]
+name = "commonmark"
+version = "0.9.1"
+summary = "Python parser for the CommonMark Markdown spec"
+files = [
+    {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"},
+    {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"},
+]
+
 [[package]]
 name = "croniter"
 version = "2.0.1"
@@ -311,6 +379,28 @@ files = [
     {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"},
 ]
 
+[[package]]
+name = "dep-logic"
+version = "0.0.4"
+requires_python = ">=3.8"
+summary = "Python dependency specifications supporting logical operations"
+dependencies = [
+    "packaging>=22",
+]
+files = [
+    {file = "dep_logic-0.0.4-py3-none-any.whl", hash = "sha256:65ab4122d5aaf4ec188dafc4cfdce55064929cf9e83d1aedcd57d6f586833b34"},
+    {file = "dep_logic-0.0.4.tar.gz", hash = "sha256:1830e784e0d58fc93511e77da164887629641b65b38876b274db974ec5f3889f"},
+]
+
+[[package]]
+name = "distlib"
+version = "0.3.8"
+summary = "Distribution utilities"
+files = [
+    {file = "distlib-0.3.8-py2.py3-none-any.whl", hash = "sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784"},
+    {file = "distlib-0.3.8.tar.gz", hash = "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64"},
+]
+
 [[package]]
 name = "django"
 version = "3.1.14"
@@ -340,6 +430,20 @@ files = [
     {file = "django_auth_ldap-4.1.0-py3-none-any.whl", hash = "sha256:68870e7921e84b1a9867e268a9c8a3e573e8a0d95ea08bcf31be178f5826ff36"},
 ]
 
+[[package]]
+name = "django-debug-toolbar"
+version = "3.2.4"
+requires_python = ">=3.6"
+summary = "A configurable set of panels that display various debug information about the current request/response."
+dependencies = [
+    "Django>=2.2",
+    "sqlparse>=0.2.0",
+]
+files = [
+    {file = "django-debug-toolbar-3.2.4.tar.gz", hash = "sha256:644bbd5c428d3283aa9115722471769cac1bec189edf3a0c855fd8ff870375a9"},
+    {file = "django_debug_toolbar-3.2.4-py3-none-any.whl", hash = "sha256:6b633b6cfee24f232d73569870f19aa86c819d750e7f3e833f2344a9eb4b4409"},
+]
+
 [[package]]
 name = "django-extensions"
 version = "3.1.5"
@@ -353,6 +457,57 @@ files = [
     {file = "django_extensions-3.1.5-py3-none-any.whl", hash = "sha256:9238b9e016bb0009d621e05cf56ea8ce5cce9b32e91ad2026996a7377ca28069"},
 ]
 
+[[package]]
+name = "django-stubs"
+version = "4.2.7"
+requires_python = ">=3.8"
+summary = "Mypy stubs for Django"
+dependencies = [
+    "django",
+    "django-stubs-ext>=4.2.7",
+    "tomli; python_version < \"3.11\"",
+    "types-PyYAML",
+    "types-pytz",
+    "typing-extensions",
+]
+files = [
+    {file = "django-stubs-4.2.7.tar.gz", hash = "sha256:8ccd2ff4ee5adf22b9e3b7b1a516d2e1c2191e9d94e672c35cc2bc3dd61e0f6b"},
+    {file = "django_stubs-4.2.7-py3-none-any.whl", hash = "sha256:4cf4de258fa71adc6f2799e983091b9d46cfc67c6eebc68fe111218c9a62b3b8"},
+]
+
+[[package]]
+name = "django-stubs-ext"
+version = "4.2.7"
+requires_python = ">=3.8"
+summary = "Monkey-patching and extensions for django-stubs"
+dependencies = [
+    "django",
+    "typing-extensions",
+]
+files = [
+    {file = "django-stubs-ext-4.2.7.tar.gz", hash = "sha256:519342ac0849cda1559746c9a563f03ff99f636b0ebe7c14b75e816a00dfddc3"},
+    {file = "django_stubs_ext-4.2.7-py3-none-any.whl", hash = "sha256:45a5d102417a412e3606e3c358adb4744988a92b7b58ccf3fd64bddd5d04d14c"},
+]
+
+[[package]]
+name = "djdt-flamegraph"
+version = "0.2.13"
+summary = "Flamegraphs for Django Debug Toolbar"
+files = [
+    {file = "djdt_flamegraph-0.2.13-py2.py3-none-any.whl", hash = "sha256:b3252b8cc9b586829166cc158b26952626cd6f41a3ffa92dceef2f5dbe5b99a0"},
+    {file = "djdt_flamegraph-0.2.13.tar.gz", hash = "sha256:c07a71be58484636e021d4c49b129fd819f24c9128849cb59558e5141192dbf3"},
+]
+
+[[package]]
+name = "docutils"
+version = "0.20.1"
+requires_python = ">=3.7"
+summary = "Docutils -- Python Documentation Utilities"
+files = [
+    {file = "docutils-0.20.1-py3-none-any.whl", hash = "sha256:96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6"},
+    {file = "docutils-0.20.1.tar.gz", hash = "sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b"},
+]
+
 [[package]]
 name = "exceptiongroup"
 version = "1.2.0"
@@ -373,6 +528,57 @@ files = [
     {file = "executing-2.0.1.tar.gz", hash = "sha256:35afe2ce3affba8ee97f2d69927fa823b08b472b7b994e36a52a964b93d16147"},
 ]
 
+[[package]]
+name = "filelock"
+version = "3.13.1"
+requires_python = ">=3.8"
+summary = "A platform independent file lock."
+files = [
+    {file = "filelock-3.13.1-py3-none-any.whl", hash = "sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c"},
+    {file = "filelock-3.13.1.tar.gz", hash = "sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e"},
+]
+
+[[package]]
+name = "findpython"
+version = "0.4.1"
+requires_python = ">=3.7"
+summary = "A utility to find python versions on your system"
+dependencies = [
+    "packaging>=20",
+]
+files = [
+    {file = "findpython-0.4.1-py3-none-any.whl", hash = "sha256:ca3a5272704b0b8a2f5e8d03d816701ec99f13eafee9bb2a316cbf099c937ede"},
+    {file = "findpython-0.4.1.tar.gz", hash = "sha256:d7d014558681b3761d57a5b2342a713a8bf302f6c1fc9d99f81b9d8bd1681b04"},
+]
+
+[[package]]
+name = "flake8"
+version = "7.0.0"
+requires_python = ">=3.8.1"
+summary = "the modular source code checker: pep8 pyflakes and co"
+dependencies = [
+    "mccabe<0.8.0,>=0.7.0",
+    "pycodestyle<2.12.0,>=2.11.0",
+    "pyflakes<3.3.0,>=3.2.0",
+]
+files = [
+    {file = "flake8-7.0.0-py2.py3-none-any.whl", hash = "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"},
+    {file = "flake8-7.0.0.tar.gz", hash = "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132"},
+]
+
+[[package]]
+name = "homebrew-pypi-poet"
+version = "0.10.0"
+summary = "Writes Homebrew stanzas for pypi packages"
+dependencies = [
+    "jinja2",
+    "setuptools",
+]
+files = [
+    {file = "homebrew-pypi-poet-0.10.0.tar.gz", hash = "sha256:e09e997e35a98f66445f9a39ccb33d6d93c5cd090302a59f231707eac0bf378e"},
+    {file = "homebrew_pypi_poet-0.10.0-py2.py3-none-any.whl", hash = "sha256:65824f97aea0e713c4ac18aa2ef4477aca69426554eac842eeaaddf97df3fc47"},
+]
+
 [[package]]
 name = "idna"
 version = "3.6"
@@ -383,6 +589,66 @@ files = [
     {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"},
 ]
 
+[[package]]
+name = "imagesize"
+version = "1.4.1"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "Getting image size from png/jpeg/jpeg2000/gif file"
+files = [
+    {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"},
+    {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"},
+]
+
+[[package]]
+name = "importlib-metadata"
+version = "7.0.1"
+requires_python = ">=3.8"
+summary = "Read metadata from Python packages"
+dependencies = [
+    "zipp>=0.5",
+]
+files = [
+    {file = "importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"},
+    {file = "importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"},
+]
+
+[[package]]
+name = "iniconfig"
+version = "2.0.0"
+requires_python = ">=3.7"
+summary = "brain-dead simple config-ini parsing"
+files = [
+    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
+    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
+]
+
+[[package]]
+name = "installer"
+version = "0.7.0"
+requires_python = ">=3.7"
+summary = "A library for installing Python wheels."
+files = [
+    {file = "installer-0.7.0-py3-none-any.whl", hash = "sha256:05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53"},
+    {file = "installer-0.7.0.tar.gz", hash = "sha256:a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631"},
+]
+
+[[package]]
+name = "ipdb"
+version = "0.13.13"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "IPython-enabled pdb"
+dependencies = [
+    "decorator; python_version > \"3.6\" and python_version < \"3.11\"",
+    "decorator; python_version >= \"3.11\"",
+    "ipython>=7.31.1; python_version > \"3.6\" and python_version < \"3.11\"",
+    "ipython>=7.31.1; python_version >= \"3.11\"",
+    "tomli; python_version > \"3.6\" and python_version < \"3.11\"",
+]
+files = [
+    {file = "ipdb-0.13.13-py3-none-any.whl", hash = "sha256:45529994741c4ab6d2388bfa5d7b725c2cf7fe9deffabdb8a6113aa5ed449ed4"},
+    {file = "ipdb-0.13.13.tar.gz", hash = "sha256:e3ac6018ef05126d442af680aad863006ec19d02290561ac88b8b1c0b0cfc726"},
+]
+
 [[package]]
 name = "ipython"
 version = "8.18.1"
@@ -419,6 +685,81 @@ files = [
     {file = "jedi-0.19.1.tar.gz", hash = "sha256:cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd"},
 ]
 
+[[package]]
+name = "jinja2"
+version = "3.1.2"
+requires_python = ">=3.7"
+summary = "A very fast and expressive template engine."
+dependencies = [
+    "MarkupSafe>=2.0",
+]
+files = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
+
+[[package]]
+name = "markdown-it-py"
+version = "3.0.0"
+requires_python = ">=3.8"
+summary = "Python port of markdown-it. Markdown parsing, done right!"
+dependencies = [
+    "mdurl~=0.1",
+]
+files = [
+    {file = "markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"},
+    {file = "markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1"},
+]
+
+[[package]]
+name = "markupsafe"
+version = "2.1.3"
+requires_python = ">=3.7"
+summary = "Safely add untrusted strings to HTML/XML markup."
+files = [
+    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"},
+    {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
+]
+
 [[package]]
 name = "matplotlib-inline"
 version = "0.1.6"
@@ -432,6 +773,79 @@ files = [
     {file = "matplotlib_inline-0.1.6-py3-none-any.whl", hash = "sha256:f1f41aab5328aa5aaea9b16d083b128102f8712542f819fe7e6a420ff581b311"},
 ]
 
+[[package]]
+name = "mccabe"
+version = "0.7.0"
+requires_python = ">=3.6"
+summary = "McCabe checker, plugin for flake8"
+files = [
+    {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
+    {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
+]
+
+[[package]]
+name = "mdurl"
+version = "0.1.2"
+requires_python = ">=3.7"
+summary = "Markdown URL utilities"
+files = [
+    {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"},
+    {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"},
+]
+
+[[package]]
+name = "msgpack"
+version = "1.0.7"
+requires_python = ">=3.8"
+summary = "MessagePack serializer"
+files = [
+    {file = "msgpack-1.0.7-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:04ad6069c86e531682f9e1e71b71c1c3937d6014a7c3e9edd2aa81ad58842862"},
+    {file = "msgpack-1.0.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cca1b62fe70d761a282496b96a5e51c44c213e410a964bdffe0928e611368329"},
+    {file = "msgpack-1.0.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e50ebce52f41370707f1e21a59514e3375e3edd6e1832f5e5235237db933c98b"},
+    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a7b4f35de6a304b5533c238bee86b670b75b03d31b7797929caa7a624b5dda6"},
+    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28efb066cde83c479dfe5a48141a53bc7e5f13f785b92ddde336c716663039ee"},
+    {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4cb14ce54d9b857be9591ac364cb08dc2d6a5c4318c1182cb1d02274029d590d"},
+    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b573a43ef7c368ba4ea06050a957c2a7550f729c31f11dd616d2ac4aba99888d"},
+    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ccf9a39706b604d884d2cb1e27fe973bc55f2890c52f38df742bc1d79ab9f5e1"},
+    {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cb70766519500281815dfd7a87d3a178acf7ce95390544b8c90587d76b227681"},
+    {file = "msgpack-1.0.7-cp310-cp310-win32.whl", hash = "sha256:b610ff0f24e9f11c9ae653c67ff8cc03c075131401b3e5ef4b82570d1728f8a9"},
+    {file = "msgpack-1.0.7-cp310-cp310-win_amd64.whl", hash = "sha256:a40821a89dc373d6427e2b44b572efc36a2778d3f543299e2f24eb1a5de65415"},
+    {file = "msgpack-1.0.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:576eb384292b139821c41995523654ad82d1916da6a60cff129c715a6223ea84"},
+    {file = "msgpack-1.0.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:730076207cb816138cf1af7f7237b208340a2c5e749707457d70705715c93b93"},
+    {file = "msgpack-1.0.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:85765fdf4b27eb5086f05ac0491090fc76f4f2b28e09d9350c31aac25a5aaff8"},
+    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3476fae43db72bd11f29a5147ae2f3cb22e2f1a91d575ef130d2bf49afd21c46"},
+    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d4c80667de2e36970ebf74f42d1088cc9ee7ef5f4e8c35eee1b40eafd33ca5b"},
+    {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5b0bf0effb196ed76b7ad883848143427a73c355ae8e569fa538365064188b8e"},
+    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f9a7c509542db4eceed3dcf21ee5267ab565a83555c9b88a8109dcecc4709002"},
+    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:84b0daf226913133f899ea9b30618722d45feffa67e4fe867b0b5ae83a34060c"},
+    {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ec79ff6159dffcc30853b2ad612ed572af86c92b5168aa3fc01a67b0fa40665e"},
+    {file = "msgpack-1.0.7-cp311-cp311-win32.whl", hash = "sha256:3e7bf4442b310ff154b7bb9d81eb2c016b7d597e364f97d72b1acc3817a0fdc1"},
+    {file = "msgpack-1.0.7-cp311-cp311-win_amd64.whl", hash = "sha256:3f0c8c6dfa6605ab8ff0611995ee30d4f9fcff89966cf562733b4008a3d60d82"},
+    {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f0936e08e0003f66bfd97e74ee530427707297b0d0361247e9b4f59ab78ddc8b"},
+    {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:98bbd754a422a0b123c66a4c341de0474cad4a5c10c164ceed6ea090f3563db4"},
+    {file = "msgpack-1.0.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b291f0ee7961a597cbbcc77709374087fa2a9afe7bdb6a40dbbd9b127e79afee"},
+    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebbbba226f0a108a7366bf4b59bf0f30a12fd5e75100c630267d94d7f0ad20e5"},
+    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e2d69948e4132813b8d1131f29f9101bc2c915f26089a6d632001a5c1349672"},
+    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bdf38ba2d393c7911ae989c3bbba510ebbcdf4ecbdbfec36272abe350c454075"},
+    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:993584fc821c58d5993521bfdcd31a4adf025c7d745bbd4d12ccfecf695af5ba"},
+    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:52700dc63a4676669b341ba33520f4d6e43d3ca58d422e22ba66d1736b0a6e4c"},
+    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e45ae4927759289c30ccba8d9fdce62bb414977ba158286b5ddaf8df2cddb5c5"},
+    {file = "msgpack-1.0.7-cp312-cp312-win32.whl", hash = "sha256:27dcd6f46a21c18fa5e5deed92a43d4554e3df8d8ca5a47bf0615d6a5f39dbc9"},
+    {file = "msgpack-1.0.7-cp312-cp312-win_amd64.whl", hash = "sha256:7687e22a31e976a0e7fc99c2f4d11ca45eff652a81eb8c8085e9609298916dcf"},
+    {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bfef2bb6ef068827bbd021017a107194956918ab43ce4d6dc945ffa13efbc25f"},
+    {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:484ae3240666ad34cfa31eea7b8c6cd2f1fdaae21d73ce2974211df099a95d81"},
+    {file = "msgpack-1.0.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3967e4ad1aa9da62fd53e346ed17d7b2e922cba5ab93bdd46febcac39be636fc"},
+    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8dd178c4c80706546702c59529ffc005681bd6dc2ea234c450661b205445a34d"},
+    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6ffbc252eb0d229aeb2f9ad051200668fc3a9aaa8994e49f0cb2ffe2b7867e7"},
+    {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:822ea70dc4018c7e6223f13affd1c5c30c0f5c12ac1f96cd8e9949acddb48a61"},
+    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:384d779f0d6f1b110eae74cb0659d9aa6ff35aaf547b3955abf2ab4c901c4819"},
+    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f64e376cd20d3f030190e8c32e1c64582eba56ac6dc7d5b0b49a9d44021b52fd"},
+    {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ed82f5a7af3697b1c4786053736f24a0efd0a1b8a130d4c7bfee4b9ded0f08f"},
+    {file = "msgpack-1.0.7-cp39-cp39-win32.whl", hash = "sha256:f26a07a6e877c76a88e3cecac8531908d980d3d5067ff69213653649ec0f60ad"},
+    {file = "msgpack-1.0.7-cp39-cp39-win_amd64.whl", hash = "sha256:1dc93e8e4653bdb5910aed79f11e165c85732067614f180f70534f056da97db3"},
+    {file = "msgpack-1.0.7.tar.gz", hash = "sha256:572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87"},
+]
+
 [[package]]
 name = "mutagen"
 version = "1.47.0"
@@ -442,6 +856,41 @@ files = [
     {file = "mutagen-1.47.0.tar.gz", hash = "sha256:719fadef0a978c31b4cf3c956261b3c58b6948b32023078a2117b1de09f0fc99"},
 ]
 
+[[package]]
+name = "mypy"
+version = "1.8.0"
+requires_python = ">=3.8"
+summary = "Optional static typing for Python"
+dependencies = [
+    "mypy-extensions>=1.0.0",
+    "tomli>=1.1.0; python_version < \"3.11\"",
+    "typing-extensions>=4.1.0",
+]
+files = [
+    {file = "mypy-1.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:485a8942f671120f76afffff70f259e1cd0f0cfe08f81c05d8816d958d4577d3"},
+    {file = "mypy-1.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:df9824ac11deaf007443e7ed2a4a26bebff98d2bc43c6da21b2b64185da011c4"},
+    {file = "mypy-1.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2afecd6354bbfb6e0160f4e4ad9ba6e4e003b767dd80d85516e71f2e955ab50d"},
+    {file = "mypy-1.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8963b83d53ee733a6e4196954502b33567ad07dfd74851f32be18eb932fb1cb9"},
+    {file = "mypy-1.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:e46f44b54ebddbeedbd3d5b289a893219065ef805d95094d16a0af6630f5d410"},
+    {file = "mypy-1.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:855fe27b80375e5c5878492f0729540db47b186509c98dae341254c8f45f42ae"},
+    {file = "mypy-1.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4c886c6cce2d070bd7df4ec4a05a13ee20c0aa60cb587e8d1265b6c03cf91da3"},
+    {file = "mypy-1.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d19c413b3c07cbecf1f991e2221746b0d2a9410b59cb3f4fb9557f0365a1a817"},
+    {file = "mypy-1.8.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9261ed810972061388918c83c3f5cd46079d875026ba97380f3e3978a72f503d"},
+    {file = "mypy-1.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:51720c776d148bad2372ca21ca29256ed483aa9a4cdefefcef49006dff2a6835"},
+    {file = "mypy-1.8.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:52825b01f5c4c1c4eb0db253ec09c7aa17e1a7304d247c48b6f3599ef40db8bd"},
+    {file = "mypy-1.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f5ac9a4eeb1ec0f1ccdc6f326bcdb464de5f80eb07fb38b5ddd7b0de6bc61e55"},
+    {file = "mypy-1.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afe3fe972c645b4632c563d3f3eff1cdca2fa058f730df2b93a35e3b0c538218"},
+    {file = "mypy-1.8.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:42c6680d256ab35637ef88891c6bd02514ccb7e1122133ac96055ff458f93fc3"},
+    {file = "mypy-1.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:720a5ca70e136b675af3af63db533c1c8c9181314d207568bbe79051f122669e"},
+    {file = "mypy-1.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5c1538c38584029352878a0466f03a8ee7547d7bd9f641f57a0f3017a7c905b8"},
+    {file = "mypy-1.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4ef4be7baf08a203170f29e89d79064463b7fc7a0908b9d0d5114e8009c3a259"},
+    {file = "mypy-1.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7178def594014aa6c35a8ff411cf37d682f428b3b5617ca79029d8ae72f5402b"},
+    {file = "mypy-1.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ab3c84fa13c04aeeeabb2a7f67a25ef5d77ac9d6486ff33ded762ef353aa5592"},
+    {file = "mypy-1.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:99b00bc72855812a60d253420d8a2eae839b0afa4938f09f4d2aa9bb4654263a"},
+    {file = "mypy-1.8.0-py3-none-any.whl", hash = "sha256:538fd81bb5e430cc1381a443971c0475582ff9f434c16cd46d2c66763ce85d9d"},
+    {file = "mypy-1.8.0.tar.gz", hash = "sha256:6ff8b244d7085a0b425b56d327b480c3b29cafbd2eff27316a004f9a7391ae07"},
+]
+
 [[package]]
 name = "mypy-extensions"
 version = "1.0.0"
@@ -452,6 +901,16 @@ files = [
     {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
 ]
 
+[[package]]
+name = "packaging"
+version = "23.2"
+requires_python = ">=3.7"
+summary = "Core utilities for Python packages"
+files = [
+    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
+    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
+]
+
 [[package]]
 name = "parso"
 version = "0.8.3"
@@ -462,6 +921,38 @@ files = [
     {file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"},
 ]
 
+[[package]]
+name = "pdm"
+version = "2.11.2"
+requires_python = ">=3.8"
+summary = "A modern Python package and dependency manager supporting the latest PEP standards"
+dependencies = [
+    "blinker",
+    "cachecontrol[filecache]>=0.13.0",
+    "certifi",
+    "dep-logic<1.0,>=0.0.2",
+    "findpython<1.0.0a0,>=0.4.0",
+    "importlib-metadata>=3.6; python_version < \"3.10\"",
+    "installer<0.8,>=0.7",
+    "packaging!=22.0,>=20.9",
+    "platformdirs",
+    "pyproject-hooks",
+    "python-dotenv>=0.15",
+    "requests-toolbelt",
+    "resolvelib>=1.0.1",
+    "rich>=12.3.0",
+    "shellingham>=1.3.2",
+    "tomli>=1.1.0; python_version < \"3.11\"",
+    "tomlkit<1,>=0.11.1",
+    "truststore; python_version >= \"3.10\"",
+    "unearth>=0.12.1",
+    "virtualenv>=20",
+]
+files = [
+    {file = "pdm-2.11.2-py3-none-any.whl", hash = "sha256:54d70b985f545ef6bab633ea78a2dfe1f967b94c02296097c0d8482aa4e7f819"},
+    {file = "pdm-2.11.2.tar.gz", hash = "sha256:5b31255c48d4aca596c73fb872a82848cbe8ff92f008712a9a264455247063ee"},
+]
+
 [[package]]
 name = "pexpect"
 version = "4.9.0"
@@ -474,6 +965,26 @@ files = [
     {file = "pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"},
 ]
 
+[[package]]
+name = "platformdirs"
+version = "4.1.0"
+requires_python = ">=3.8"
+summary = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+files = [
+    {file = "platformdirs-4.1.0-py3-none-any.whl", hash = "sha256:11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380"},
+    {file = "platformdirs-4.1.0.tar.gz", hash = "sha256:906d548203468492d432bcb294d4bc2fff751bf84971fbb2c10918cc206ee420"},
+]
+
+[[package]]
+name = "pluggy"
+version = "1.3.0"
+requires_python = ">=3.8"
+summary = "plugin and hook calling mechanisms for python"
+files = [
+    {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"},
+    {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"},
+]
+
 [[package]]
 name = "prompt-toolkit"
 version = "3.0.43"
@@ -528,6 +1039,16 @@ files = [
     {file = "pyasn1_modules-0.3.0.tar.gz", hash = "sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c"},
 ]
 
+[[package]]
+name = "pycodestyle"
+version = "2.11.1"
+requires_python = ">=3.8"
+summary = "Python style guide checker"
+files = [
+    {file = "pycodestyle-2.11.1-py2.py3-none-any.whl", hash = "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"},
+    {file = "pycodestyle-2.11.1.tar.gz", hash = "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f"},
+]
+
 [[package]]
 name = "pycparser"
 version = "2.21"
@@ -567,6 +1088,16 @@ files = [
     {file = "pycryptodomex-3.19.1.tar.gz", hash = "sha256:0b7154aff2272962355f8941fd514104a88cb29db2d8f43a29af900d6398eb1c"},
 ]
 
+[[package]]
+name = "pyflakes"
+version = "3.2.0"
+requires_python = ">=3.8"
+summary = "passive checker of Python programs"
+files = [
+    {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"},
+    {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"},
+]
+
 [[package]]
 name = "pygments"
 version = "2.17.2"
@@ -577,6 +1108,37 @@ files = [
     {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"},
 ]
 
+[[package]]
+name = "pyproject-hooks"
+version = "1.0.0"
+requires_python = ">=3.7"
+summary = "Wrappers to call pyproject.toml-based build backend hooks."
+dependencies = [
+    "tomli>=1.1.0; python_version < \"3.11\"",
+]
+files = [
+    {file = "pyproject_hooks-1.0.0-py3-none-any.whl", hash = "sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8"},
+    {file = "pyproject_hooks-1.0.0.tar.gz", hash = "sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5"},
+]
+
+[[package]]
+name = "pytest"
+version = "7.4.4"
+requires_python = ">=3.7"
+summary = "pytest: simple powerful testing with Python"
+dependencies = [
+    "colorama; sys_platform == \"win32\"",
+    "exceptiongroup>=1.0.0rc8; python_version < \"3.11\"",
+    "iniconfig",
+    "packaging",
+    "pluggy<2.0,>=0.12",
+    "tomli>=1.0.0; python_version < \"3.11\"",
+]
+files = [
+    {file = "pytest-7.4.4-py3-none-any.whl", hash = "sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8"},
+    {file = "pytest-7.4.4.tar.gz", hash = "sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280"},
+]
+
 [[package]]
 name = "python-crontab"
 version = "3.0.0"
@@ -602,6 +1164,16 @@ files = [
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
 
+[[package]]
+name = "python-dotenv"
+version = "1.0.0"
+requires_python = ">=3.8"
+summary = "Read key-value pairs from a .env file and set them as environment variables"
+files = [
+    {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"},
+    {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"},
+]
+
 [[package]]
 name = "python-ldap"
 version = "3.4.4"
@@ -624,6 +1196,20 @@ files = [
     {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"},
 ]
 
+[[package]]
+name = "recommonmark"
+version = "0.7.1"
+summary = "A docutils-compatibility bridge to CommonMark, enabling you to write CommonMark inside of Docutils & Sphinx projects."
+dependencies = [
+    "commonmark>=0.8.1",
+    "docutils>=0.11",
+    "sphinx>=1.3.1",
+]
+files = [
+    {file = "recommonmark-0.7.1-py2.py3-none-any.whl", hash = "sha256:1b1db69af0231efce3fa21b94ff627ea33dee7079a01dd0a7f8482c3da148b3f"},
+    {file = "recommonmark-0.7.1.tar.gz", hash = "sha256:bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67"},
+]
+
 [[package]]
 name = "regex"
 version = "2023.12.25"
@@ -711,6 +1297,62 @@ files = [
     {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
 ]
 
+[[package]]
+name = "requests-toolbelt"
+version = "1.0.0"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "A utility belt for advanced users of python-requests"
+dependencies = [
+    "requests<3.0.0,>=2.0.1",
+]
+files = [
+    {file = "requests-toolbelt-1.0.0.tar.gz", hash = "sha256:7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6"},
+    {file = "requests_toolbelt-1.0.0-py2.py3-none-any.whl", hash = "sha256:cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06"},
+]
+
+[[package]]
+name = "resolvelib"
+version = "1.0.1"
+summary = "Resolve abstract dependencies into concrete ones"
+files = [
+    {file = "resolvelib-1.0.1-py2.py3-none-any.whl", hash = "sha256:d2da45d1a8dfee81bdd591647783e340ef3bcb104b54c383f70d422ef5cc7dbf"},
+    {file = "resolvelib-1.0.1.tar.gz", hash = "sha256:04ce76cbd63fded2078ce224785da6ecd42b9564b1390793f64ddecbe997b309"},
+]
+
+[[package]]
+name = "rich"
+version = "13.7.0"
+requires_python = ">=3.7.0"
+summary = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
+dependencies = [
+    "markdown-it-py>=2.2.0",
+    "pygments<3.0.0,>=2.13.0",
+]
+files = [
+    {file = "rich-13.7.0-py3-none-any.whl", hash = "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"},
+    {file = "rich-13.7.0.tar.gz", hash = "sha256:5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf5403fa"},
+]
+
+[[package]]
+name = "setuptools"
+version = "69.0.3"
+requires_python = ">=3.8"
+summary = "Easily download, build, install, upgrade, and uninstall Python packages"
+files = [
+    {file = "setuptools-69.0.3-py3-none-any.whl", hash = "sha256:385eb4edd9c9d5c17540511303e39a147ce2fc04bc55289c322b9e5904fe2c05"},
+    {file = "setuptools-69.0.3.tar.gz", hash = "sha256:be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78"},
+]
+
+[[package]]
+name = "shellingham"
+version = "1.5.4"
+requires_python = ">=3.7"
+summary = "Tool to Detect Surrounding Shell"
+files = [
+    {file = "shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686"},
+    {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"},
+]
+
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -721,6 +1363,15 @@ files = [
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
 
+[[package]]
+name = "snowballstemmer"
+version = "2.2.0"
+summary = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms."
+files = [
+    {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"},
+    {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"},
+]
+
 [[package]]
 name = "sonic-client"
 version = "1.0.0"
@@ -730,6 +1381,138 @@ files = [
     {file = "sonic_client-1.0.0-py3-none-any.whl", hash = "sha256:291bf292861e97a2dd765ff0c8754ea9631383680d31a63ec3da6f5aa5f4beda"},
 ]
 
+[[package]]
+name = "sphinx"
+version = "7.2.6"
+requires_python = ">=3.9"
+summary = "Python documentation generator"
+dependencies = [
+    "Jinja2>=3.0",
+    "Pygments>=2.14",
+    "alabaster<0.8,>=0.7",
+    "babel>=2.9",
+    "colorama>=0.4.5; sys_platform == \"win32\"",
+    "docutils<0.21,>=0.18.1",
+    "imagesize>=1.3",
+    "importlib-metadata>=4.8; python_version < \"3.10\"",
+    "packaging>=21.0",
+    "requests>=2.25.0",
+    "snowballstemmer>=2.0",
+    "sphinxcontrib-applehelp",
+    "sphinxcontrib-devhelp",
+    "sphinxcontrib-htmlhelp>=2.0.0",
+    "sphinxcontrib-jsmath",
+    "sphinxcontrib-qthelp",
+    "sphinxcontrib-serializinghtml>=1.1.9",
+]
+files = [
+    {file = "sphinx-7.2.6-py3-none-any.whl", hash = "sha256:1e09160a40b956dc623c910118fa636da93bd3ca0b9876a7b3df90f07d691560"},
+    {file = "sphinx-7.2.6.tar.gz", hash = "sha256:9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5"},
+]
+
+[[package]]
+name = "sphinx-rtd-theme"
+version = "2.0.0"
+requires_python = ">=3.6"
+summary = "Read the Docs theme for Sphinx"
+dependencies = [
+    "docutils<0.21",
+    "sphinx<8,>=5",
+    "sphinxcontrib-jquery<5,>=4",
+]
+files = [
+    {file = "sphinx_rtd_theme-2.0.0-py2.py3-none-any.whl", hash = "sha256:ec93d0856dc280cf3aee9a4c9807c60e027c7f7b461b77aeffed682e68f0e586"},
+    {file = "sphinx_rtd_theme-2.0.0.tar.gz", hash = "sha256:bd5d7b80622406762073a04ef8fadc5f9151261563d47027de09910ce03afe6b"},
+]
+
+[[package]]
+name = "sphinxcontrib-applehelp"
+version = "1.0.7"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-applehelp is a Sphinx extension which outputs Apple help books"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_applehelp-1.0.7-py3-none-any.whl", hash = "sha256:094c4d56209d1734e7d252f6e0b3ccc090bd52ee56807a5d9315b19c122ab15d"},
+    {file = "sphinxcontrib_applehelp-1.0.7.tar.gz", hash = "sha256:39fdc8d762d33b01a7d8f026a3b7d71563ea3b72787d5f00ad8465bd9d6dfbfa"},
+]
+
+[[package]]
+name = "sphinxcontrib-devhelp"
+version = "1.0.5"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp documents"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_devhelp-1.0.5-py3-none-any.whl", hash = "sha256:fe8009aed765188f08fcaadbb3ea0d90ce8ae2d76710b7e29ea7d047177dae2f"},
+    {file = "sphinxcontrib_devhelp-1.0.5.tar.gz", hash = "sha256:63b41e0d38207ca40ebbeabcf4d8e51f76c03e78cd61abe118cf4435c73d4212"},
+]
+
+[[package]]
+name = "sphinxcontrib-htmlhelp"
+version = "2.0.4"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_htmlhelp-2.0.4-py3-none-any.whl", hash = "sha256:8001661c077a73c29beaf4a79968d0726103c5605e27db92b9ebed8bab1359e9"},
+    {file = "sphinxcontrib_htmlhelp-2.0.4.tar.gz", hash = "sha256:6c26a118a05b76000738429b724a0568dbde5b72391a688577da08f11891092a"},
+]
+
+[[package]]
+name = "sphinxcontrib-jquery"
+version = "4.1"
+requires_python = ">=2.7"
+summary = "Extension to include jQuery on newer Sphinx releases"
+dependencies = [
+    "Sphinx>=1.8",
+]
+files = [
+    {file = "sphinxcontrib-jquery-4.1.tar.gz", hash = "sha256:1620739f04e36a2c779f1a131a2dfd49b2fd07351bf1968ced074365933abc7a"},
+    {file = "sphinxcontrib_jquery-4.1-py2.py3-none-any.whl", hash = "sha256:f936030d7d0147dd026a4f2b5a57343d233f1fc7b363f68b3d4f1cb0993878ae"},
+]
+
+[[package]]
+name = "sphinxcontrib-jsmath"
+version = "1.0.1"
+requires_python = ">=3.5"
+summary = "A sphinx extension which renders display math in HTML via JavaScript"
+files = [
+    {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"},
+    {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"},
+]
+
+[[package]]
+name = "sphinxcontrib-qthelp"
+version = "1.0.6"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp documents"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_qthelp-1.0.6-py3-none-any.whl", hash = "sha256:bf76886ee7470b934e363da7a954ea2825650013d367728588732c7350f49ea4"},
+    {file = "sphinxcontrib_qthelp-1.0.6.tar.gz", hash = "sha256:62b9d1a186ab7f5ee3356d906f648cacb7a6bdb94d201ee7adf26db55092982d"},
+]
+
+[[package]]
+name = "sphinxcontrib-serializinghtml"
+version = "1.1.9"
+requires_python = ">=3.9"
+summary = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)"
+dependencies = [
+    "Sphinx>=5",
+]
+files = [
+    {file = "sphinxcontrib_serializinghtml-1.1.9-py3-none-any.whl", hash = "sha256:9b36e503703ff04f20e9675771df105e58aa029cfcbc23b8ed716019b7416ae1"},
+    {file = "sphinxcontrib_serializinghtml-1.1.9.tar.gz", hash = "sha256:0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54"},
+]
+
 [[package]]
 name = "sqlparse"
 version = "0.4.4"
@@ -754,6 +1537,26 @@ files = [
     {file = "stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9"},
 ]
 
+[[package]]
+name = "tomli"
+version = "2.0.1"
+requires_python = ">=3.7"
+summary = "A lil' TOML parser"
+files = [
+    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+]
+
+[[package]]
+name = "tomlkit"
+version = "0.12.3"
+requires_python = ">=3.7"
+summary = "Style preserving TOML library"
+files = [
+    {file = "tomlkit-0.12.3-py3-none-any.whl", hash = "sha256:b0a645a9156dc7cb5d3a1f0d4bab66db287fcb8e0430bdd4664a095ea16414ba"},
+    {file = "tomlkit-0.12.3.tar.gz", hash = "sha256:75baf5012d06501f07bee5bf8e801b9f343e7aac5a92581f20f80ce632e6b5a4"},
+]
+
 [[package]]
 name = "traitlets"
 version = "5.14.1"
@@ -764,6 +1567,34 @@ files = [
     {file = "traitlets-5.14.1.tar.gz", hash = "sha256:8585105b371a04b8316a43d5ce29c098575c2e477850b62b848b964f1444527e"},
 ]
 
+[[package]]
+name = "truststore"
+version = "0.8.0"
+requires_python = ">= 3.10"
+summary = "Verify certificates using native system trust stores"
+files = [
+    {file = "truststore-0.8.0-py3-none-any.whl", hash = "sha256:e37a5642ae9fc48caa8f120b6283d77225d600d224965a672c9e8ef49ce4bb4c"},
+    {file = "truststore-0.8.0.tar.gz", hash = "sha256:dc70da89634944a579bfeec70a7a4523c53ffdb3cf52d1bb4a431fda278ddb96"},
+]
+
+[[package]]
+name = "types-pytz"
+version = "2023.3.1.1"
+summary = "Typing stubs for pytz"
+files = [
+    {file = "types-pytz-2023.3.1.1.tar.gz", hash = "sha256:cc23d0192cd49c8f6bba44ee0c81e4586a8f30204970fc0894d209a6b08dab9a"},
+    {file = "types_pytz-2023.3.1.1-py3-none-any.whl", hash = "sha256:1999a123a3dc0e39a2ef6d19f3f8584211de9e6a77fe7a0259f04a524e90a5cf"},
+]
+
+[[package]]
+name = "types-pyyaml"
+version = "6.0.12.12"
+summary = "Typing stubs for PyYAML"
+files = [
+    {file = "types-PyYAML-6.0.12.12.tar.gz", hash = "sha256:334373d392fde0fdf95af5c3f1661885fa10c52167b14593eb856289e1855062"},
+    {file = "types_PyYAML-6.0.12.12-py3-none-any.whl", hash = "sha256:c05bc6c158facb0676674b7f11fe3960db4f389718e19e62bd2b84d6205cfd24"},
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.9.0"
@@ -797,6 +1628,20 @@ files = [
     {file = "tzlocal-5.2.tar.gz", hash = "sha256:8d399205578f1a9342816409cc1e46a93ebd5755e39ea2d85334bea911bf0e6e"},
 ]
 
+[[package]]
+name = "unearth"
+version = "0.12.1"
+requires_python = ">=3.7"
+summary = "A utility to fetch and download python packages"
+dependencies = [
+    "packaging>=20",
+    "requests>=2.25",
+]
+files = [
+    {file = "unearth-0.12.1-py3-none-any.whl", hash = "sha256:a5a5c51ca44965cbe3618116bd592bb0bbe3705af5fe14e5792660d904aad7c8"},
+    {file = "unearth-0.12.1.tar.gz", hash = "sha256:4caad941b60f51e50fdc109866234d407910aef77f1233aa1b6b5d168c7427ee"},
+]
+
 [[package]]
 name = "urllib3"
 version = "2.1.0"
@@ -807,6 +1652,21 @@ files = [
     {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"},
 ]
 
+[[package]]
+name = "virtualenv"
+version = "20.25.0"
+requires_python = ">=3.7"
+summary = "Virtual Python Environment builder"
+dependencies = [
+    "distlib<1,>=0.3.7",
+    "filelock<4,>=3.12.2",
+    "platformdirs<5,>=3.9.1",
+]
+files = [
+    {file = "virtualenv-20.25.0-py3-none-any.whl", hash = "sha256:4238949c5ffe6876362d9c0180fc6c3a824a7b12b80604eeb8085f2ed7460de3"},
+    {file = "virtualenv-20.25.0.tar.gz", hash = "sha256:bf51c0d9c7dd63ea8e44086fa1e4fb1093a31e963b86959257378aef020e1f1b"},
+]
+
 [[package]]
 name = "w3lib"
 version = "2.1.2"
@@ -895,6 +1755,16 @@ files = [
     {file = "websockets-12.0.tar.gz", hash = "sha256:81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b"},
 ]
 
+[[package]]
+name = "wheel"
+version = "0.42.0"
+requires_python = ">=3.7"
+summary = "A built-package format for Python"
+files = [
+    {file = "wheel-0.42.0-py3-none-any.whl", hash = "sha256:177f9c9b0d45c47873b619f5b650346d632cdc35fb5e4d25058e09c9e581433d"},
+    {file = "wheel-0.42.0.tar.gz", hash = "sha256:c45be39f7882c9d34243236f2d63cbd58039e360f85d0913425fbd7ceea617a8"},
+]
+
 [[package]]
 name = "yt-dlp"
 version = "2023.12.30"
@@ -914,3 +1784,13 @@ files = [
     {file = "yt-dlp-2023.12.30.tar.gz", hash = "sha256:a11862e57721b0a0f0883dfeb5a4d79ba213a2d4c45e1880e9fd70f8e6570c38"},
     {file = "yt_dlp-2023.12.30-py2.py3-none-any.whl", hash = "sha256:c00d9a71d64472ad441bcaa1ec0c3797d6e60c9f934f270096a96fe51657e7b3"},
 ]
+
+[[package]]
+name = "zipp"
+version = "3.17.0"
+requires_python = ">=3.8"
+summary = "Backport of pathlib-compatible object wrapper for zip files"
+files = [
+    {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"},
+    {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"},
+]

From 3247866d3af4b5bd3620b34bf19b1e08576a34d5 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 17:30:59 -0800
Subject: [PATCH 111/126] Update test.yml to install packages needed by ldap

---
 .github/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d66fab4b..0f961f18 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,6 +52,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ matrix.python }}-venv-
 
+      - uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: libldap2-dev libsasl2-dev ripgrep
+          version: 1.0
+
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel pytest bottle build

From ffcd1640da38e95643ee980c803b86ab8cdbd9b3 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 17:34:37 -0800
Subject: [PATCH 112/126] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0f961f18..f6215b36 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,7 +54,7 @@ jobs:
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: libldap2-dev libsasl2-dev ripgrep
+          packages: libldap2-dev libsasl2-dev ripgrep build-essential libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
           version: 1.0
 
       - name: Install pip dependencies

From 10dc9922de18b9eb1a15c413cd4e243ce708bdc1 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 17:39:45 -0800
Subject: [PATCH 113/126] Update test.yml

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f6215b36..de166bd7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,8 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-latest, windows-latest]
+        os: [ubuntu-22.04]
+        # os: [ubuntu-22.04, macos-latest, windows-latest]
         python: [3.11]
 
     steps:

From c43f861f6f888330a554b4cd1527b3e14f5a8889 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 17:55:52 -0800
Subject: [PATCH 114/126] Update test.yml

---
 .github/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de166bd7..94fecbcf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,7 +55,7 @@ jobs:
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: libldap2-dev libsasl2-dev ripgrep build-essential libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
+          packages: ripgrep build-essential python3-dev libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
           version: 1.0
 
       - name: Install pip dependencies
@@ -63,7 +63,8 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel pytest bottle build
           ./bin/build_pip.sh
           pdm lock --group=':all'
-          pdm install --group=':all' --dev
+          pdm install --dev
+          pdm install --group=':all'
 
       - name: Get npm cache dir
         id: npm-cache

From 7842ca49d111cced05137cf5ec60b46538af36d7 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 17:59:18 -0800
Subject: [PATCH 115/126] Update test.yml

---
 .github/workflows/test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 94fecbcf..065af2ad 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -61,8 +61,6 @@ jobs:
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel pytest bottle build
-          ./bin/build_pip.sh
-          pdm lock --group=':all'
           pdm install --dev
           pdm install --group=':all'
 

From 3840265cefb18cc28841ee29ecea1b5773136df4 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 18:21:27 -0800
Subject: [PATCH 116/126] Update test.yml

---
 .github/workflows/test.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 065af2ad..c74fe677 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,14 +55,13 @@ jobs:
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: ripgrep build-essential python3-dev libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
+          packages: ripgrep build-essential python3-dev python3-setuptools libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
           version: 1.0
 
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel pytest bottle build
-          pdm install --dev
-          pdm install --group=':all'
+          python -m pip install -r requirements.txt
 
       - name: Get npm cache dir
         id: npm-cache

From d23fe6a594d49511a20f471b3cb41c2a8ffd5f64 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 18:28:03 -0800
Subject: [PATCH 117/126] Update test.yml

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c74fe677..db145205 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,13 +55,15 @@ jobs:
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: ripgrep build-essential python3-dev python3-setuptools libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
+          # packages: ripgrep build-essential python3-dev python3-setuptools libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
+          packages: ripgrep curl wget
           version: 1.0
 
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel pytest bottle build
           python -m pip install -r requirements.txt
+          python -m pip install -e .
 
       - name: Get npm cache dir
         id: npm-cache

From e4f1503965c499f459dcebc9de7ff2b644256b1e Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 18:34:00 -0800
Subject: [PATCH 118/126] Update test.yml

---
 .github/workflows/test.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index db145205..e11e25c8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,15 +55,14 @@ jobs:
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          # packages: ripgrep build-essential python3-dev python3-setuptools libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
-          packages: ripgrep curl wget
+          packages: ripgrep build-essential python3-dev python3-setuptools libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
           version: 1.0
 
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel pytest bottle build
           python -m pip install -r requirements.txt
-          python -m pip install -e .
+          python -m pip install -e .[sonic,ldap]
 
       - name: Get npm cache dir
         id: npm-cache

From 41e6a0f215ce1f2b2f8b1a5361413b1a8a1668fc Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 18:50:41 -0800
Subject: [PATCH 119/126] Update debian.yml

---
 .github/workflows/debian.yml | 43 +++++++++++++-----------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 7ed9d40d..9b95071e 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -25,36 +25,23 @@ jobs:
             dh-python debhelper devscripts dput software-properties-common \
             python3-distutils python3-setuptools python3-wheel python3-stdeb
 
-      - name: Build Debian/Apt sdist_dsc
-        run: |
-          rm -Rf deb_dist/*
-          python3 setup.py --command-packages=stdeb.command sdist_dsc
+      # - name: Build Debian/Apt sdist_dsc
+      #   run: |
+      #     ./bin/build_pip.sh
 
-      - name: Build Debian/Apt bdist_deb
-        run: |
-          python3 setup.py --command-packages=stdeb.command bdist_deb
+      # - name: Check ArchiveBox version
+      #   run: |
+      #     # must create dir needed for snaps to run as non-root on github actions
+      #     sudo mkdir -p /run/user/1001 && sudo chmod -R 777 /run/user/1001
+      #     mkdir "${{ github.workspace }}/data" && cd "${{ github.workspace }}/data"
+      #     archivebox --version
+      #     archivebox init --setup
 
-      - name: Install archivebox from deb
-        run: |
-          cd deb_dist/
-          sudo apt-get install ./archivebox*.deb
-          cd ..
-          python3 -c 'from distutils.core import run_setup; result = run_setup("./setup.py", stop_after="init"); print("\n".join(result.install_requires + result.extras_require["sonic"]))' > ./requirements.txt
-          python3 -m pip install -r ./requirements.txt
-
-      - name: Check ArchiveBox version
-        run: |
-          # must create dir needed for snaps to run as non-root on github actions
-          sudo mkdir -p /run/user/1001 && sudo chmod -R 777 /run/user/1001
-          mkdir "${{ github.workspace }}/data" && cd "${{ github.workspace }}/data"
-          archivebox --version
-          archivebox init --setup
-
-      - name: Add some links to test
-        run: |
-          cd "${{ github.workspace }}/data"
-          archivebox add 'https://example.com'
-          archivebox status
+      # - name: Add some links to test
+      #   run: |
+      #     cd "${{ github.workspace }}/data"
+      #     archivebox add 'https://example.com'
+      #     archivebox status
 
       # - name: Commit built package
       #   run: |

From df56e993f26a3ee88eeb3389305e20d298f1de2a Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 18:51:59 -0800
Subject: [PATCH 120/126] Update pip.yml

---
 .github/workflows/pip.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
index bfd16bcc..394a37bb 100644
--- a/.github/workflows/pip.yml
+++ b/.github/workflows/pip.yml
@@ -24,6 +24,11 @@ jobs:
           python-version: 3.11
           architecture: x64
 
+      - uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: ripgrep build-essential python3-dev python3-setuptools libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
+          version: 1.0
+
       - uses: pdm-project/setup-pdm@v3
 
       - name: Install dependencies

From f695b30d36833b445ece6a7a40d6e69676bdb8c8 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 18:59:34 -0800
Subject: [PATCH 121/126] Update pip.yml

---
 .github/workflows/pip.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
index 394a37bb..301e760f 100644
--- a/.github/workflows/pip.yml
+++ b/.github/workflows/pip.yml
@@ -36,7 +36,6 @@ jobs:
 
       - name: Build package
         run: |
-          rm ./dist/archivebox-*.whl
           pdm build
 
       - name: Install from build

From 0353d6b316287f8ab4968171b23092b6b0c02682 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 19:02:46 -0800
Subject: [PATCH 122/126] Update pip.yml

---
 .github/workflows/pip.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
index 301e760f..cfe97e8d 100644
--- a/.github/workflows/pip.yml
+++ b/.github/workflows/pip.yml
@@ -19,14 +19,14 @@ jobs:
           fetch-depth: 1
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: '3.11'
           architecture: x64
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: ripgrep build-essential python3-dev python3-setuptools libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 python3-minimal gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
+          packages: ripgrep build-essential python3-dev python3-setuptools libssl-dev libldap2-dev libsasl2-dev zlib1g-dev libatomic1 gnupg2 curl wget python3-ldap python3-msgpack python3-mutagen python3-regex python3-pycryptodome procps
           version: 1.0
 
       - uses: pdm-project/setup-pdm@v3

From 310dede9779d79d2e4af44c035d12b12ca3d8de6 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 19:18:44 -0800
Subject: [PATCH 123/126] limit python version upper bound to 3.11

---
 pdm.lock       | 91 +-------------------------------------------------
 pyproject.toml |  4 +--
 2 files changed, 3 insertions(+), 92 deletions(-)

diff --git a/pdm.lock b/pdm.lock
index b3aad2a0..3ee03646 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -5,7 +5,7 @@
 groups = ["default", "dev", "ldap", "sonic"]
 strategy = ["cross_platform"]
 lock_version = "4.4.1"
-content_hash = "sha256:37a19e5e34763f5ea329b87a911d2422a097c3b655d07c321820f4fdd680c3b2"
+content_hash = "sha256:4ba1c25daa30a36c5b3ffdb563d5024c2ab15042758f4fbc3f375dedb35d1bdf"
 
 [[package]]
 name = "alabaster"
@@ -91,18 +91,6 @@ files = [
     {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a1fd8a29719ccce974d523580987b7f8229aeace506952fa9ce1d53a033873c8"},
     {file = "Brotli-1.1.0-cp311-cp311-win32.whl", hash = "sha256:39da8adedf6942d76dc3e46653e52df937a3c4d6d18fdc94a7c29d263b1f5b50"},
     {file = "Brotli-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:aac0411d20e345dc0920bdec5548e438e999ff68d77564d5e9463a7ca9d3e7b1"},
-    {file = "Brotli-1.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:316cc9b17edf613ac76b1f1f305d2a748f1b976b033b049a6ecdfd5612c70409"},
-    {file = "Brotli-1.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:caf9ee9a5775f3111642d33b86237b05808dafcd6268faa492250e9b78046eb2"},
-    {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:70051525001750221daa10907c77830bc889cb6d865cc0b813d9db7fefc21451"},
-    {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f4bf76817c14aa98cc6697ac02f3972cb8c3da93e9ef16b9c66573a68014f91"},
-    {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0c5516f0aed654134a2fc936325cc2e642f8a0e096d075209672eb321cff408"},
-    {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c3020404e0b5eefd7c9485ccf8393cfb75ec38ce75586e046573c9dc29967a0"},
-    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4ed11165dd45ce798d99a136808a794a748d5dc38511303239d4e2363c0695dc"},
-    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:4093c631e96fdd49e0377a9c167bfd75b6d0bad2ace734c6eb20b348bc3ea180"},
-    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7e4c4629ddad63006efa0ef968c8e4751c5868ff0b1c5c40f76524e894c50248"},
-    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:861bf317735688269936f755fa136a99d1ed526883859f86e41a5d43c61d8966"},
-    {file = "Brotli-1.1.0-cp312-cp312-win32.whl", hash = "sha256:5f4d5ea15c9382135076d2fb28dde923352fe02951e66935a9efaac8f10e81b0"},
-    {file = "Brotli-1.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:906bc3a79de8c4ae5b86d3d75a8b77e44404b0f4261714306e3ad248d8ab0951"},
     {file = "Brotli-1.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5fb2ce4b8045c78ebbc7b8f3c15062e435d47e7393cc57c25115cfd49883747a"},
     {file = "Brotli-1.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7905193081db9bfa73b1219140b3d315831cbff0d8941f22da695832f0dd188f"},
     {file = "Brotli-1.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a77def80806c421b4b0af06f45d65a136e7ac0bdca3c09d9e2ea4e515367c7e9"},
@@ -226,16 +214,6 @@ files = [
     {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb"},
     {file = "cffi-1.16.0-cp311-cp311-win32.whl", hash = "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab"},
     {file = "cffi-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba"},
-    {file = "cffi-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956"},
-    {file = "cffi-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969"},
-    {file = "cffi-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520"},
-    {file = "cffi-1.16.0-cp312-cp312-win32.whl", hash = "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b"},
-    {file = "cffi-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235"},
     {file = "cffi-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed"},
     {file = "cffi-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2"},
     {file = "cffi-1.16.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872"},
@@ -287,21 +265,6 @@ files = [
     {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"},
     {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"},
     {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"},
-    {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"},
     {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"},
     {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"},
     {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"},
@@ -737,16 +700,6 @@ files = [
     {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
     {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"},
     {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"},
     {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"},
@@ -821,17 +774,6 @@ files = [
     {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ec79ff6159dffcc30853b2ad612ed572af86c92b5168aa3fc01a67b0fa40665e"},
     {file = "msgpack-1.0.7-cp311-cp311-win32.whl", hash = "sha256:3e7bf4442b310ff154b7bb9d81eb2c016b7d597e364f97d72b1acc3817a0fdc1"},
     {file = "msgpack-1.0.7-cp311-cp311-win_amd64.whl", hash = "sha256:3f0c8c6dfa6605ab8ff0611995ee30d4f9fcff89966cf562733b4008a3d60d82"},
-    {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f0936e08e0003f66bfd97e74ee530427707297b0d0361247e9b4f59ab78ddc8b"},
-    {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:98bbd754a422a0b123c66a4c341de0474cad4a5c10c164ceed6ea090f3563db4"},
-    {file = "msgpack-1.0.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b291f0ee7961a597cbbcc77709374087fa2a9afe7bdb6a40dbbd9b127e79afee"},
-    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebbbba226f0a108a7366bf4b59bf0f30a12fd5e75100c630267d94d7f0ad20e5"},
-    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e2d69948e4132813b8d1131f29f9101bc2c915f26089a6d632001a5c1349672"},
-    {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bdf38ba2d393c7911ae989c3bbba510ebbcdf4ecbdbfec36272abe350c454075"},
-    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:993584fc821c58d5993521bfdcd31a4adf025c7d745bbd4d12ccfecf695af5ba"},
-    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:52700dc63a4676669b341ba33520f4d6e43d3ca58d422e22ba66d1736b0a6e4c"},
-    {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e45ae4927759289c30ccba8d9fdce62bb414977ba158286b5ddaf8df2cddb5c5"},
-    {file = "msgpack-1.0.7-cp312-cp312-win32.whl", hash = "sha256:27dcd6f46a21c18fa5e5deed92a43d4554e3df8d8ca5a47bf0615d6a5f39dbc9"},
-    {file = "msgpack-1.0.7-cp312-cp312-win_amd64.whl", hash = "sha256:7687e22a31e976a0e7fc99c2f4d11ca45eff652a81eb8c8085e9609298916dcf"},
     {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bfef2bb6ef068827bbd021017a107194956918ab43ce4d6dc945ffa13efbc25f"},
     {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:484ae3240666ad34cfa31eea7b8c6cd2f1fdaae21d73ce2974211df099a95d81"},
     {file = "msgpack-1.0.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3967e4ad1aa9da62fd53e346ed17d7b2e922cba5ab93bdd46febcac39be636fc"},
@@ -877,11 +819,6 @@ files = [
     {file = "mypy-1.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d19c413b3c07cbecf1f991e2221746b0d2a9410b59cb3f4fb9557f0365a1a817"},
     {file = "mypy-1.8.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9261ed810972061388918c83c3f5cd46079d875026ba97380f3e3978a72f503d"},
     {file = "mypy-1.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:51720c776d148bad2372ca21ca29256ed483aa9a4cdefefcef49006dff2a6835"},
-    {file = "mypy-1.8.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:52825b01f5c4c1c4eb0db253ec09c7aa17e1a7304d247c48b6f3599ef40db8bd"},
-    {file = "mypy-1.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f5ac9a4eeb1ec0f1ccdc6f326bcdb464de5f80eb07fb38b5ddd7b0de6bc61e55"},
-    {file = "mypy-1.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afe3fe972c645b4632c563d3f3eff1cdca2fa058f730df2b93a35e3b0c538218"},
-    {file = "mypy-1.8.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:42c6680d256ab35637ef88891c6bd02514ccb7e1122133ac96055ff458f93fc3"},
-    {file = "mypy-1.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:720a5ca70e136b675af3af63db533c1c8c9181314d207568bbe79051f122669e"},
     {file = "mypy-1.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5c1538c38584029352878a0466f03a8ee7547d7bd9f641f57a0f3017a7c905b8"},
     {file = "mypy-1.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4ef4be7baf08a203170f29e89d79064463b7fc7a0908b9d0d5114e8009c3a259"},
     {file = "mypy-1.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7178def594014aa6c35a8ff411cf37d682f428b3b5617ca79029d8ae72f5402b"},
@@ -1247,21 +1184,6 @@ files = [
     {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:67d3ccfc590e5e7197750fcb3a2915b416a53e2de847a728cfa60141054123d4"},
     {file = "regex-2023.12.25-cp311-cp311-win32.whl", hash = "sha256:68191f80a9bad283432385961d9efe09d783bcd36ed35a60fb1ff3f1ec2efe87"},
     {file = "regex-2023.12.25-cp311-cp311-win_amd64.whl", hash = "sha256:7d2af3f6b8419661a0c421584cfe8aaec1c0e435ce7e47ee2a97e344b98f794f"},
-    {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8a0ccf52bb37d1a700375a6b395bff5dd15c50acb745f7db30415bae3c2b0715"},
-    {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c3c4a78615b7762740531c27cf46e2f388d8d727d0c0c739e72048beb26c8a9d"},
-    {file = "regex-2023.12.25-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ad83e7545b4ab69216cef4cc47e344d19622e28aabec61574b20257c65466d6a"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7a635871143661feccce3979e1727c4e094f2bdfd3ec4b90dfd4f16f571a87a"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d498eea3f581fbe1b34b59c697512a8baef88212f92e4c7830fcc1499f5b45a5"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:43f7cd5754d02a56ae4ebb91b33461dc67be8e3e0153f593c509e21d219c5060"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51f4b32f793812714fd5307222a7f77e739b9bc566dc94a18126aba3b92b98a3"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba99d8077424501b9616b43a2d208095746fb1284fc5ba490139651f971d39d9"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4bfc2b16e3ba8850e0e262467275dd4d62f0d045e0e9eda2bc65078c0110a11f"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8c2c19dae8a3eb0ea45a8448356ed561be843b13cbc34b840922ddf565498c1c"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:60080bb3d8617d96f0fb7e19796384cc2467447ef1c491694850ebd3670bc457"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b77e27b79448e34c2c51c09836033056a0547aa360c45eeeb67803da7b0eedaf"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:518440c991f514331f4850a63560321f833979d145d7d81186dbe2f19e27ae3d"},
-    {file = "regex-2023.12.25-cp312-cp312-win32.whl", hash = "sha256:e2610e9406d3b0073636a3a2e80db05a02f0c3169b5632022b4e81c0364bcda5"},
-    {file = "regex-2023.12.25-cp312-cp312-win_amd64.whl", hash = "sha256:cc37b9aeebab425f11f27e5e9e6cf580be7206c6582a64467a14dda211abc232"},
     {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f7bc09bc9c29ebead055bcba136a67378f03d66bf359e87d0f7c759d6d4ffa31"},
     {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e14b73607d6231f3cc4622809c196b540a6a44e903bcfad940779c80dffa7be7"},
     {file = "regex-2023.12.25-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9eda5f7a50141291beda3edd00abc2d4a5b16c29c92daf8d5bd76934150f3edc"},
@@ -1714,17 +1636,6 @@ files = [
     {file = "websockets-12.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:dff6cdf35e31d1315790149fee351f9e52978130cef6c87c4b6c9b3baf78bc53"},
     {file = "websockets-12.0-cp311-cp311-win32.whl", hash = "sha256:3e3aa8c468af01d70332a382350ee95f6986db479ce7af14d5e81ec52aa2b402"},
     {file = "websockets-12.0-cp311-cp311-win_amd64.whl", hash = "sha256:25eb766c8ad27da0f79420b2af4b85d29914ba0edf69f547cc4f06ca6f1d403b"},
-    {file = "websockets-12.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0e6e2711d5a8e6e482cacb927a49a3d432345dfe7dea8ace7b5790df5932e4df"},
-    {file = "websockets-12.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:dbcf72a37f0b3316e993e13ecf32f10c0e1259c28ffd0a85cee26e8549595fbc"},
-    {file = "websockets-12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12743ab88ab2af1d17dd4acb4645677cb7063ef4db93abffbf164218a5d54c6b"},
-    {file = "websockets-12.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7b645f491f3c48d3f8a00d1fce07445fab7347fec54a3e65f0725d730d5b99cb"},
-    {file = "websockets-12.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9893d1aa45a7f8b3bc4510f6ccf8db8c3b62120917af15e3de247f0780294b92"},
-    {file = "websockets-12.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f38a7b376117ef7aff996e737583172bdf535932c9ca021746573bce40165ed"},
-    {file = "websockets-12.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:f764ba54e33daf20e167915edc443b6f88956f37fb606449b4a5b10ba42235a5"},
-    {file = "websockets-12.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:1e4b3f8ea6a9cfa8be8484c9221ec0257508e3a1ec43c36acdefb2a9c3b00aa2"},
-    {file = "websockets-12.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9fdf06fd06c32205a07e47328ab49c40fc1407cdec801d698a7c41167ea45113"},
-    {file = "websockets-12.0-cp312-cp312-win32.whl", hash = "sha256:baa386875b70cbd81798fa9f71be689c1bf484f65fd6fb08d051a0ee4e79924d"},
-    {file = "websockets-12.0-cp312-cp312-win_amd64.whl", hash = "sha256:ae0a5da8f35a5be197f328d4727dbcfafa53d1824fac3d96cdd3a642fe09394f"},
     {file = "websockets-12.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:ab3d732ad50a4fbd04a4490ef08acd0517b6ae6b77eb967251f4c263011a990d"},
     {file = "websockets-12.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a1d9697f3337a89691e3bd8dc56dea45a6f6d975f92e7d5f773bc715c15dde28"},
     {file = "websockets-12.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1df2fbd2c8a98d38a66f5238484405b8d1d16f929bb7a33ed73e4801222a6f53"},
diff --git a/pyproject.toml b/pyproject.toml
index fb34095d..ea0156b3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ dependencies = [
     "yt-dlp>=2023.10.13",
     # "playwright>=1.39.0; platform_machine != 'armv7l'",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.9,<3.12"
 readme = "README.md"
 license = {text = "MIT"}
 classifiers = [
@@ -59,7 +59,7 @@ classifiers = [
 [tool.pdm.dev-dependencies]
 dev = [
     # build
-    "setuptools>=68.2.2",
+    "setuptools>=69.0.3",
     "wheel",
     "pdm",
     "homebrew-pypi-poet>=0.10.0",

From 79979d4d05db6d95f7b0f02e5b5beba5aa178abf Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 19:20:03 -0800
Subject: [PATCH 124/126] Update pip.yml

---
 .github/workflows/pip.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
index cfe97e8d..ad22ce78 100644
--- a/.github/workflows/pip.yml
+++ b/.github/workflows/pip.yml
@@ -30,6 +30,9 @@ jobs:
           version: 1.0
 
       - uses: pdm-project/setup-pdm@v3
+        with:
+          python-version: '3.11'
+          cache: true
 
       - name: Install dependencies
         run: pdm install --fail-fast --no-lock --group :all --no-self

From fc2bd4a2d54b50a55403e2490aa89251b1eedbde Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 19:23:26 -0800
Subject: [PATCH 125/126] Update pip.yml

---
 .github/workflows/pip.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
index ad22ce78..0c6aadfb 100644
--- a/.github/workflows/pip.yml
+++ b/.github/workflows/pip.yml
@@ -52,8 +52,8 @@ jobs:
           archivebox version
           archivebox status
 
-      - name: Publish package distributions to PyPI
-        run: pdm publish --no-build
+      #- name: Publish package distributions to PyPI
+      #  run: pdm publish --no-build
 
       # - name: Push build to PyPI
       #   run: |

From 2ef3655d21a10ae3acaf9ef874c4b2d8bc042ef8 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 4 Jan 2024 19:26:54 -0800
Subject: [PATCH 126/126] fix python version in build tests

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e11e25c8..79cc28e7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,6 +37,9 @@ jobs:
 
       - name: Setup PDM
         uses: pdm-project/setup-pdm@v3
+        with:
+          python-version: '3.11'
+          cache: true
 
       ### Install Python & JS Dependencies
       - name: Get pip cache dir